X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=GNUmakefile;h=f64feca87211e705e8b82f0aaf6dce060edbb623;hp=d6c67d1a805e2cfdb86909a301c62f4f98bd58aa;hb=102f82ec5a8128cb076371aa3d9821e684b94380;hpb=e61875cfadc6ac33302d69474209fd215b9f6842

diff --git a/GNUmakefile b/GNUmakefile
index d6c67d1..f64feca 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,11 +1,12 @@
 src = $(wildcard src/*.c) $(wildcard src/sdl/*.c)
-obj = $(src:.c=.o)
+obj = $(src:.c=.o) $(asmsrc:.asm=.o)
 dep = $(obj:.o=.d)
 bin = demo
 
-inc = -I/usr/local/include -Isrc -Isrc/sdl -Ilibs/imago/src -Ilibs/mikmod/include
+inc = -I/usr/local/include -Isrc -Isrc/sdl -Ilibs -Ilibs/imago/src -Ilibs/mikmod/include
+warn = -pedantic -Wall -Wno-unused-variable -Wno-unused-function
 
-CFLAGS = -pedantic -Wall -g $(inc) `sdl-config --cflags`
+CFLAGS = $(warn) -g $(inc) `sdl-config --cflags`
 LDFLAGS = -Llibs/imago -Llibs/mikmod -limago -lmikmod `sdl-config --libs` -lm
 
 $(bin): $(obj) imago mikmod
@@ -29,8 +30,8 @@ mikmod:
 
 .PHONY: cleanlibs
 cleanlibs:
-	$(MAKE) -C libs/imago -f Makefile.dj clean
-	$(MAKE) -C libs/oldmik -f Makefile.dj clean
+	$(MAKE) -C libs/imago clean
+	$(MAKE) -C libs/mikmod clean
 
 .PHONY: clean
 clean: