Changeset 11672

Timestamp:

2006-04-21T12:22:46+12:00 (18 years ago)

Author:

mdewsnip

Message:

Changed the makefile to match the setup.exe/gssetup.exe structure better.

File:

• trunk/gsinstaller/win32.mak (modified) (1 diff)

trunk/gsinstaller/win32.mak

@@ -44 +44 @@
   bmpUtil.cpp configFile.cpp configurable.cpp copyProgress.cpp dirent.cpp dirSelector.cpp DiskSpace.cpp file.cpp fileCopier.cpp FilePath.cpp gs16bit.cpp gsConfig.cpp gsinstall.cpp gsManifest.cpp gsPlatform.cpp gsProfile.cpp gsProgman.cpp gsRegistry.cpp launchApp.cpp registry.cpp splash.cpp stringArray.cpp unInstall.cpp
 
-COMMON_OBJECTS = \
-  bmpUtil.obj configFile.obj configurable.obj copyProgress.obj dirent.obj dirSelector.obj DiskSpace.obj file.obj fileCopier.obj FilePath.obj gsConfig.obj gsManifest.obj gsPlatform.obj gsProfile.obj gsProgman.obj gsRegistry.obj launchApp.obj registry.obj stringArray.obj unInstall.obj
+GSSETUP_OBJECTS = \
+  bmpUtil.obj configFile.obj configurable.obj copyProgress.obj dirent.obj dirSelector.obj DiskSpace.obj file.obj fileCopier.obj FilePath.obj gsConfig.obj gsinstall.obj gsManifest.obj gsPlatform.obj gsProfile.obj gsProgman.obj gsRegistry.obj launchApp.obj registry.obj stringArray.obj unInstall.obj
 
-GS16BIT_OBJECTS = gs16bit.obj splash.obj
+SETUP_OBJECTS = gs16bit.obj
 
-GS32BIT_OBJECTS = gsinstall.obj
+all: gssetup.exe setup.exe
 
-all: gsinstall.exe
+setup.exe : $(SETUP_OBJECTS)
+    if EXIST setup.exe del setup.exe
+    $(LINK) -o setup.exe $(SETUP_OBJECTS)
 
-gs16bit.exe : $(GS16BIT_OBJECTS) $(COMMON_OBJECTS)
-    if EXIST gs16bit.exe del gs16bit.exe
-    $(LINK) $(GS16BIT_OBJECTS) $(COMMON_OBJECTS) $(WINLIBS)
-
-gsinstall.exe : $(GS32BIT_OBJECTS) $(COMMON_OBJECTS)
-    if EXIST gsinstall.exe del gsinstall.exe
-    $(LINK) $(GS32BIT_OBJECTS) $(COMMON_OBJECTS) $(WINLIBS)
+gssetup.exe : $(GSSETUP_OBJECTS)
+    if EXIST gssetup.exe del gssetup.exe
+    $(LINK) -o gssetup.exe $(GSSETUP_OBJECTS) $(WINLIBS)
 
 clean: