--- a/ApplicationDefinition.st	Tue Mar 05 18:10:13 2013 +0000
+++ b/ApplicationDefinition.st	Wed Mar 13 00:42:41 2013 +0000
@@ -98,7 +98,7 @@
 appSourcesProjects
     "Returns only the application projects (which are included in the application module)"
 
-    ^self preRequisites select:[:each | 
+    ^ self effectivePreRequisites select:[:each | 
         (self moduleFor: each) = self module
     ].
 
@@ -128,8 +128,8 @@
 stxSourcesProjects
     "Returns only the required STX projects (which are included in the STX module)"
 
-    ^self effectivePreRequisites select:[:each | 
-        (self moduleFor: each) = (self moduleFor: #'stx')
+    ^ self effectivePreRequisites select:[:each | 
+        (self moduleFor: each) = (self moduleFor: #stx)
     ].
 
     "
@@ -764,7 +764,7 @@
 !
 
 resourceFilename
-    ^ (self rcFilename asFilename withSuffix:'res') name
+    ^ (self rcFilename asFilename withSuffix:'$(RES)') name
 
     "Created: / 07-09-2006 / 17:12:53 / cg"
 ! !
@@ -1341,11 +1341,6 @@
             ].
             s nextPutLine:(self libraryNameFor:projectID).
         ].
-        self isGUIApplication ifTrue:[
-            self guiClassFileNames_win32 do:[:eachFilename |
-                s nextPutLine:(eachFilename asFilename withoutSuffix baseName)
-            ].
-        ].
     ].
 
     "
@@ -1657,14 +1652,18 @@
 ALLLIB=$(LIBFILES) $(APP_IMPORTLIBS) $(APP_RT_LIB)
 
 REQUIRED_LIBS=librun.dll %(REQUIRED_LIBS)
-REQUIRED_FILES=cs3245.dll X11.dll Xext.dll symbols.stc $(REQUIRED_LIBS)
+# REQUIRED_FILES=cs3245.dll X11.dll Xext.dll symbols.stc $(REQUIRED_LIBS)
+REQUIRED_FILES=$(RT_DLL) $(X11_DLL) $(XEXT_DLL) symbols.stc $(REQUIRED_LIBS)
 
 REQUIRED_SUPPORT_DIRS=%(REQUIRED_SUPPORT_DIRS)
 
 target: %(BUILD_TARGET) postBuildCleanup 
 
 # the executable, all required files and a self-installing-installer-exe
-ALL:: prereq exe $(REQUIRED_SUPPORT_DIRS) %(ADDITIONAL_TARGETS) postBuildCleanup setup 
+ALL:: prereq ALL2 
+
+# all, but no prereqs
+ALL_NP:: exe $(REQUIRED_SUPPORT_DIRS) %(ADDITIONAL_TARGETS) postBuildCleanup setup 
 
 exe:  newBuildDate %(NOCONSOLE_APPLICATION_OR_EMPTY) %(CONSOLE_APPLICATION_OR_EMPTY) 
 
@@ -1795,7 +1794,7 @@
 #
 # additional rules
 #
-%(APPLICATION)Win.res: %(APPLICATION)Win.rc %(APPLICATION).ico
+%(APPLICATION)Win.$(RES): %(APPLICATION)Win.rc %(APPLICATION).ico
 
 main.$(O): buildDate.h main.c bc.mak
 
@@ -1838,7 +1837,7 @@
         -del $(REQUIRED_FILES)
         -del main.c
         -del *.log
-        -del *.res
+        -del *.$(RES)
         -rmdir /S /Q resources
         -rmdir /S /Q $(OBJDIR)
 
@@ -2222,6 +2221,9 @@
 %(APPLICATION): $(APP_DIRS_TO_MAKE) $(APP_LIBOBJS) $(OBJS)
         $(MAKE) link_%(APPLICATION)
 
+# like ALL, but not prereqs
+ALL_NP:: exe
+
 link_%(APPLICATION):
         $(MAKE) %(APPLICATION_TYPE) \
                     TARGET=%(APPLICATION) \
@@ -2475,7 +2477,7 @@
 # by the application at the very beginning.
 #
 # All classes loaded at startup time will be present as precompiled classes.
-# Others might be autoloaded.
+# Others might be autoloaded or loaded explicit using "Smalltalk loadPackage:xxx".
 #
 %(ALLPREREQUISITE_LIBS)
 %(SUBPROJECT_LIBS)
@@ -2919,11 +2921,11 @@
 !ApplicationDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.214 2013-03-01 19:54:26 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.218 2013-03-11 20:18:44 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.214 2013-03-01 19:54:26 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.218 2013-03-11 20:18:44 cg Exp $'
 !
 
 version_SVN