wwww

[16.git] / makefile

diff --git a/makefile b/makefile
index dd3c816e00ba217e8f2b74689c3762b35e2b1626..697f7707b518557029eaf1420e976543b1d56f0f 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -32,11 +32,13 @@
 !ifdef __LINUX__
 REMOVECOMMAND=rm -f
 COPYCOMMAND=cp -f
+MOVECOMMAND=mv
 DIRSEP=/
 OBJ=o
 !else
 REMOVECOMMAND=del
 COPYCOMMAND=copy /y
+MOVECOMMAND=move /y
 DIRSEP=\
 OBJ=obj
 !endif
@@ -48,6 +50,7 @@ OBJ=obj
 TARGET_OS = dos
 
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
+BIN=bin$(DIRSEP)
 SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
@@ -66,7 +69,7 @@ SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
 ZFLAGS=-zk0 -zq -zc -zp8# -zm
 CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo##wwww
-OFLAGS=-obmiler -out -oh -ei -zp8 -0 -fpi87  -onac -ol+ -ok####x
+OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok####x
 FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 
 
@@ -91,8 +94,8 @@ all: $(EXEC) comp
 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
        wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=16.map
 
-bakapi.exe: bakapi.$(OBJ) $(16LIBOBJS) gfx.lib c_utils.$(OBJ) modex.$(OBJ)
-       wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) $(16LIBOBJS) gfx.lib c_utils.$(OBJ) modex.$(OBJ) -fm=bakapi.map
+bakapi.exe: bakapi.$(OBJ) $(16LIBOBJS) gfx.lib modex.lib
+       wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) $(16LIBOBJS) gfx.lib modex.lib -fm=bakapi.map
 #
 #Test Executables!
 #
@@ -385,9 +388,12 @@ modex.$(OBJ): $(MODEXLIB_)modex.asm
 #other~
 #
 clean: .symbolic
-       @$(REMOVECOMMAND) $(EXEC)
+       @$(REMOVECOMMAND) $(BIN)$(EXEC)
        @$(REMOVECOMMAND) *.$(OBJ)
-       @$(REMOVECOMMAND) *.lib
+       @$(REMOVECOMMAND) 16.lib
+       @$(REMOVECOMMAND) gfx.lib
+       @$(REMOVECOMMAND) doslib.lib
+       @$(REMOVECOMMAND) vgmsnd.lib
        @wlib -n 16.lib
        @wlib -n  gfx.lib
        @wlib -n  doslib.lib
@@ -420,15 +426,29 @@ clean: .symbolic
 
 comp: .symbolic
        @upx -9 -qqq $(EXEC)
-       @upx -9 -qqq x-demo.exe
+##     @upx -9 -qqq x-demo.exe
 
 updatelibs: .symbolic
-       cd $(JSMNLIB)
-       git pull
-       cd ../../../
+       @cd $(JSMNLIB)
+       @git pull
+       @cd ../../../
 
 xlib: .symbolic
        @cd 16/xlib
        @wmake clean
        @wmake all
-       cd ../../
+       @cd ../../
+
+mx: .symbolic
+       @cd 16/xw
+#      @wmake clean
+       @wmake all
+       @cd ../../
+
+mx_: .symbolic
+       @cd 16/xw_
+       @wmake -f makefile all
+       @cd ../../
+
+binmove: .symbolic
+       @$(MOVECOMMAND) $(EXEC) $(BIN)$(EXEC)