X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=makefile;h=95acd3bc918bcb9fcdb1d7685eefb7b5163a0775;hb=24fadbcfdbad9efd936bd80982521e6f8218da7d;hp=729665677a5bbae2ad2c84948061e7197be47f66;hpb=b3d442bd951c5db5ce16fd5a467852449c2438ac;p=16.git

diff --git a/makefile b/makefile
index 72966567..95acd3bc 100755
--- a/makefile
+++ b/makefile
@@ -89,9 +89,9 @@ Z_FLAGS=-zk0 -zc -zp8 -zm
 O_FLAGS=-obmilr -oe=24 -out -oh -ei -onac -ol+ -ok##x
 T_FLAGS=-bt=dos -mh -0 -fpi87 -fo=.$(OBJ) -d1
 
-CPPFLAGS=-DTARGET_MSDOS=16
+CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
 !ifeq DEBUGSERIAL 1
-CPPFLAGS += -DDEBUGSERIAL -DMSDOS=1
+CPPFLAGS += -DDEBUGSERIAL
 !endif
 AFLAGS=$(WCLQ) $(T_FLAGS)
 CFLAGS=$(WCLQ) $(T_FLAGS) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS)
@@ -139,8 +139,9 @@ DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib
 .asm.obj:
 	*wcl $(AFLAGS) $(extra_$^&_obj_opts) -c $[@
 
+#CFLAGS is neccessary here
 .obj.exe :
-	*wcl $(LFLAGS) $(extra_$^&_exe_opts) -fe=$@ $<
+	*wcl $(CFLAGS) $(LFLAGS) $(extra_$^&_exe_opts) -fe=$@ $<
 
 .obj.lib :
 	*wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
@@ -204,9 +205,7 @@ pcxtest2.exe:     pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS)
 #planrpcx.exe:    planrpcx.$(OBJ) gfx.lib
 maptest.exe:      maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) gfx.lib $(DOSLIBLIBS)
 fmemtest.exe:     fmemtest.$(OBJ)
-#exmmtest.exe:     exmmtest.$(OBJ) $(16LIB) $(DOSLIBLIBS)
-exmmtest.exe: exmmtest.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ)
-	wcl $(LFLAGS) exmmtest.$(OBJ) -fm=exmmtest.mah $(16LIB) $(DOSLIBLIBS)
+exmmtest.exe:     exmmtest.$(OBJ) $(16LIB) $(DOSLIBLIBS)
 vgmtest.exe:      vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIBLIBS)
 
 #
@@ -242,7 +241,6 @@ vgmtest.$(OBJ):   $(SRC)/vgmtest.c
 #
 # non executable objects libraries
 #
-
 16.lib: $(16LIBOBJS)
 vgmsnd.lib: $(VGMSNDOBJ)