X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile.dj;h=764ad9d12285d2606ae7ecefbdda2c369ad9160d;hp=c2ad183fd634ba416dd8101ea150000792fd70c4;hb=32ff3cf2d7d7a5ae82f5ca400b320c67e6984ad6;hpb=e61875cfadc6ac33302d69474209fd215b9f6842

diff --git a/Makefile.dj b/Makefile.dj
index c2ad183..764ad9d 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -1,4 +1,5 @@
 src = $(wildcard src/*.c) $(wildcard src/dos/*.c)
+asmsrc = $(wildcard src/*.asm)
 obj = $(src:.c=.cof)
 dep = $(obj:.cof=.dep)
 bin = demo.exe
@@ -10,14 +11,14 @@ else
 	TOOLPREFIX = i586-pc-msdosdjgpp-
 endif
 
-inc = -Isrc -Isrc/dos -Ilibs/imago/src -Ilibs/oldmik/src
+inc = -Isrc -Isrc/dos -Ilibs/imago/src -Ilibs/mikmod/include
 opt = -O3 -ffast-math
 dbg = -g
 
 CC = $(TOOLPREFIX)gcc
 AR = $(TOOLPREFIX)ar
 CFLAGS = -pedantic -Wall -march=pentium $(dbg) $(opt) $(inc)
-LDFLAGS = libs/imago/imago.dja libs/oldmik/mikmod.dja
+LDFLAGS = libs/imago/imago.dja libs/mikmod/dos/libmikmod.a
 
 $(bin): $(obj) imago mikmod
 	$(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
@@ -39,12 +40,12 @@ imago:
 
 .PHONY: mikmod
 mikmod:
-	$(MAKE) -C libs/oldmik -f Makefile.dj
+	$(MAKE) -C libs/mikmod/dos -f Makefile.dj
 
 .PHONY: cleanlibs
 cleanlibs:
 	$(MAKE) -C libs/imago -f Makefile.dj clean
-	$(MAKE) -C libs/oldmik -f Makefile.dj clean
+	$(MAKE) -C libs/mikmod/dos -f Makefile.dj clean
 
 .PHONY: clean
 .PHONY: cleandep