X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=GNUmakefile;h=830297d3edbe4cf7d6780cafe4b67f631096ce28;hp=de6b64a6b9856a49f095194ceed9b5dc324c519e;hb=45f6f46fe758d15aafccdb69ae837fc7d84ee466;hpb=9b942b99fe10222bee50c47bfc809de268d331ec

diff --git a/GNUmakefile b/GNUmakefile
index de6b64a..830297d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,5 +1,5 @@
 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
 
@@ -11,6 +11,9 @@ 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
@@ -26,8 +29,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: