X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=GNUmakefile;h=8b0f6fb2f264eaa865023950bf59c95ec3b222ce;hp=a6c99364310fb7ea5afba7287521d10926bdea7e;hb=refs%2Fheads%2Fmaster;hpb=67c749060592270c9cd8b4f7dafe7d7c7a61a614

diff --git a/GNUmakefile b/GNUmakefile
index a6c9936..767026f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,5 @@
-src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/glut/*.c)
+src = $(wildcard src/*.c) $(wildcard src/3dgfx/*.c) $(wildcard src/scr/*.c) \
+	  $(wildcard src/glut/*.c)
 asmsrc = $(wildcard src/*.asm)
 obj = $(src:.c=.o) $(asmsrc:.asm=.o)
 dep = $(obj:.o=.d)
@@ -7,14 +8,14 @@ bin = demo
 asmsrc += cspr/dbgfont.asm cspr/confont.asm
 bindata = data/loading.img
 
-inc = -I/usr/local/include -Isrc -Isrc/3dgfx -Isrc/scr -Isrc/glut -Ilibs \
+inc = -I/usr/local/include -Isrc -Isrc/3dgfx -Isrc/scr -Isrc/utils -Isrc/glut -Ilibs \
 	  -Ilibs/imago/src -Ilibs/mikmod/include
 def = -DMINIGLUT_USE_LIBC -DMIKMOD_STATIC
-warn = -pedantic -Wall -Wno-unused-variable -Wno-unused-function
+warn = -pedantic -Wall -Wno-unused-variable -Wno-unused-function -Wno-address
 #opt = -O3 -ffast-math
 dbg = -g
 
-CFLAGS = $(arch) $(warn) $(opt) -fno-pie -fno-strict-aliasing $(dbg) $(inc)
+CFLAGS = $(arch) $(warn) -MMD $(opt) -fno-pie -fno-strict-aliasing $(dbg) $(inc)
 LDFLAGS = $(arch) -no-pie -Llibs/imago -Llibs/mikmod -limago -lmikmod \
 		  $(sndlib_$(sys)) -lm
 
@@ -26,7 +27,7 @@ endif
 
 sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/; s/IRIX.*/IRIX/')
 ifeq ($(sys), mingw)
-	obj = $(src:.c=.w32.o)
+	obj = $(src:.c=.w32.o) $(asmsrc:.asm=.w32.o)
 
 	bin = demo_win32.exe
 
@@ -51,15 +52,14 @@ $(bin): $(obj) imago mikmod
 %.o: %.asm
 	nasm -f elf -o $@ $<
 
+%.w32.o: %.asm
+	nasm -f coff -o $@ $<
+
 %.w32.o: %.c
 	$(CC) -o $@ $(CFLAGS) -c $<
 
 src/data.o: src/data.asm $(bindata)
 
-%.d: %.c
-	@echo dep $@
-	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
-
 .PHONY: libs
 libs: imago anim mikmod