X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=95acd3bc918bcb9fcdb1d7685eefb7b5163a0775;hb=24fadbcfdbad9efd936bd80982521e6f8218da7d;hp=1b178853a9345bf7ca22794423e2bb8c1907bd69;hpb=f78a5b140dc636e6194453efec07bef5bda34567;p=16.git

diff --git a/makefile b/makefile
index 1b178853..95acd3bc 100755
--- a/makefile
+++ b/makefile
@@ -87,15 +87,15 @@ UPXQ=-qqq
 S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000
 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
+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
 !endif
-AFLAGS=$(WCLQ) $(T_FLAGS) -d1 -fo=.$(OBJ)
-CFLAGS=$(WCLQ) $(T_FLAGS) -d1 -fo=.$(OBJ) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS)
-LFLAGS=$(WCLQ) -l=dos -fm=$^&.mah
+AFLAGS=$(WCLQ) $(T_FLAGS)
+CFLAGS=$(WCLQ) $(T_FLAGS) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS)
+LFLAGS=$(WCLQ) -l=dos -fm=$^&.mah -lr
 LIBFLAGS=$(WLIBQ) -b -n
 
 #
@@ -117,7 +117,7 @@ DOSLIBLIBS = $(DOSLIB_CPU)/dos86h/cpu.lib $(DOSLIB_DOS)/dos86h/dos.lib $(DOSLIB_
 !ifeq DEBUGSERIAL 1
 DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib
 !endif
-16LIB=16.lib#$(16LIBOBJS)
+16LIB=$(16LIBOBJS)#16.lib bad program lock up
 
 #
 #	Files locations
@@ -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) $@ $<
@@ -240,7 +241,6 @@ vgmtest.$(OBJ):   $(SRC)/vgmtest.c
 #
 # non executable objects libraries
 #
-
 16.lib: $(16LIBOBJS)
 vgmsnd.lib: $(VGMSNDOBJ)
 
@@ -331,7 +331,6 @@ clean: .symbolic
 	@$(REMOVECOMMAND) *.MAH
 	@$(REMOVECOMMAND) *.mah
 	@$(REMOVECOMMAND) *.err
-	@echo $(OBJ)
 	#@cd $(DOSLIB:$(to_os_path))
 	#@./buildall.sh clean
 	#@cd $(BUILD_ROOT)