X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=GNUmakefile;h=ea8082c7b16ed5812286d222b44d29a5b62957a6;hb=0d60e0e144c0faf5efb9551d1d23b7463ce8a4c0;hp=0054bbc2c86e53b047f870f01708a5acc9bb719a;hpb=2bcafceb439dcb5751a9a7b7bc139ae2fce42690;p=dosdemo

diff --git a/GNUmakefile b/GNUmakefile
index 0054bbc..ea8082c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-src = $(wildcard src/*.c) $(wildcard src/3dgfx/*.c) $(wildcard src/scr/*.c) \
+src = $(wildcard src/*.c) $(wildcard src/3dgfx/*.c) $(wildcard src/scr/*.c) $(wildcard src/utils/*.c) \
 	  $(wildcard src/glut/*.c)
 asmsrc = $(wildcard src/*.asm)
 obj = $(src:.c=.o) $(asmsrc:.asm=.o)
@@ -8,10 +8,10 @@ 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
 
@@ -27,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
 
@@ -52,6 +52,9 @@ $(bin): $(obj) imago mikmod
 %.o: %.asm
 	nasm -f elf -o $@ $<
 
+%.w32.o: %.asm
+	nasm -f coff -o $@ $<
+
 %.w32.o: %.c
 	$(CC) -o $@ $(CFLAGS) -c $<