X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile.dj;h=9306382cbd0610f91f163d7d97df2a8028fd7edf;hp=fe89fcf624d9137c94d28ffdbdc5bcffcc6476cc;hb=feef1d0ecc88f41adbd4781767afd05a0f381f85;hpb=102f82ec5a8128cb076371aa3d9821e684b94380

diff --git a/Makefile.dj b/Makefile.dj
index fe89fcf..9306382 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -1,5 +1,5 @@
-src = $(wildcard src/*.c) $(wildcard src/dos/*.c)
-asmsrc = $(wildcard src/*.asm) $(wildcard src/dos/*.asm)
+src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/dos/*.c)
+asmsrc = $(wildcard src/*.asm) $(wildcard src/scr/*.asm) $(wildcard src/dos/*.asm)
 obj = $(src:.c=.cof) $(asmsrc:.asm=.cof)
 dep = $(obj:.cof=.dep)
 bin = demo.exe
@@ -11,8 +11,8 @@ else
 	TOOLPREFIX = i586-pc-msdosdjgpp-
 endif
 
-inc = -Isrc -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src -Ilibs/mikmod/include
-#opt = -O3 -ffast-math -fno-strict-aliasing
+inc = -Isrc -Isrc/scr -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src -Ilibs/mikmod/include
+opt = -O3 -ffast-math -fno-strict-aliasing
 dbg = -g
 warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
 
@@ -27,12 +27,15 @@ $(bin): $(obj) imago anim mikmod
 %.cof: %.asm
 	nasm -f coff -o $@ $<
 
+ifneq ($(hostsys), dos)
 -include $(dep)
+endif
 
 %.cof: %.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 
 %.dep: %.c
+	@echo dep $@
 	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.dep=.cof) >$@
 
 .PHONY: imago