Changes in trunk/makefile [30:18]

File:

• trunk/makefile (modified) (6 diffs)

trunk/makefile

@@ -35 +35 @@
 GOTBUILDMACHINE = Zobopeep
 !endif
-!ifdef %_QUIET_
-GOTCHAEXE = gotchaq
-!else
-GOTCHAEXE = gotcha
-!endif
 
 CC = wpp386.exe
@@ -52 +47 @@
 SED = sed.exe
 
-!ifdef %_QUIET_
-CFLAGS = -D_QUIET_ -otexan -zp4 -6r
-!else
 CFLAGS = -otexan -zp4 -6r
-!endif 
-
 RFLAGS = -bt=os2 -zm
 
-LFLAGS = op map=$(GOTCHAEXE) 
+LFLAGS = op map=gotcha
 
 SRCDIR = U:\Gotcha_Workspace\trunk
@@ -68 +58 @@
 PMPRINTFPATH = U:\PMPrintf
 
-all:  dll resources $(GOTCHAEXE).exe
+all:  dll resources gotcha.exe
 
 dll:  .symbolic
@@ -88 +78 @@
     $(CHDIR) ..
     
-$(GOTCHAEXE).lnk: $(GOTCHAEXE).lnk.tpl  
+gotcha.lnk: gotcha.lnk.tpl  
   $(SED) -e "s;(GOTMAJOR);$(GOTMAJOR);g" &
     -e "s;(GOTMINOR);$(GOTMINOR);g"   &
@@ -96 +86 @@
     -e "s;Sun \|Mon \|Tue \|Wed \|Thu \|Fri \|Sat ;;g" &
     -e "s;(GOTBUILDMACHINE);$(GOTBUILDMACHINE);g"   &
-    $(GOTCHAEXE).lnk.tpl > $(GOTCHAEXE).lnk  
+    gotcha.lnk.tpl > gotcha.lnk  
 
-$(GOTCHAEXE).exe: $(GOTCHAEXE).lnk gotcha.obj about.obj helper.obj rstring.obj settings.obj gotcha.res 
-    $(LINK) $(LFLAGS) @$(GOTCHAEXE).lnk f &
+gotcha.exe: gotcha.lnk gotcha.obj about.obj helper.obj rstring.obj settings.obj gotcha.res 
+    $(LINK) $(LFLAGS) @gotcha.lnk f &
     gotcha.obj, &
     about.obj,  &
@@ -106 +96 @@
     settings.obj &
     lib dll\gotchdll.lib lib mmpm2.lib lib $(GBMPATH)\gbm.lib lib $(SRCDIR)\tools\gbmmemw.lib lib $(PMPRINTFPATH)\pmprintf.lib
-    $(RC) $(RFLAGS) $(SRCDIR)\gotcha.res $(GOTCHAEXE).exe
-    $(PERL) $(MAPSYMW) $(GOTCHAEXE).map 
-    mapxqs.exe $(GOTCHAEXE).map
-    lxlite $(GOTCHAEXE).exe /x- /b-
-    lxlite $(GOTCHAEXE).exe /c:minstub
+    $(RC) $(RFLAGS) $(SRCDIR)\gotcha.res gotcha.exe
+    $(PERL) $(MAPSYMW) gotcha.map 
+    mapxqs.exe gotcha.map
+    lxlite gotcha.exe /x- /b-
+    lxlite gotcha.exe /c:minstub
     $(COPY) *.exe *.sym *.xqs *.map* readme* bin