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

diff --git a/GNUmakefile b/GNUmakefile
index 5e3fdeb..f64feca 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,16 +1,20 @@
 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 = -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
 	$(CC) -o $@ $(obj) $(LDFLAGS)
 
+%.o: %.asm
+	nasm -f elf -o $@ $<
+
 -include $(dep)
 
 %.d: %.c
@@ -24,6 +28,11 @@ imago:
 mikmod:
 	$(MAKE) -C libs/mikmod
 
+.PHONY: cleanlibs
+cleanlibs:
+	$(MAKE) -C libs/imago clean
+	$(MAKE) -C libs/mikmod clean
+
 .PHONY: clean
 clean:
 	rm -f $(obj) $(bin)