X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=GNUmakefile;h=49fb3a17884dd744b1af54a5a771d80c34c0c0c7;hp=511b0ad3c428e293753f8f959b289110d7261bba;hb=0ce0f59d2afd26e0956716fae169075368020a02;hpb=c912e59b898fe1ac461a1468e4a2e1937de286d7

diff --git a/GNUmakefile b/GNUmakefile
index 511b0ad..49fb3a1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,11 +1,13 @@
 src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/sdl/*.c)
+asmsrc = $(wildcard src/*.asm)
 obj = $(src:.c=.o) $(asmsrc:.asm=.o)
 dep = $(obj:.o=.d)
 bin = demo
 
 asmsrc += cspr/dbgfont.asm cspr/confont.asm
+bindata = data/loading.img
 
-inc = -I/usr/local/include -Isrc -Isrc/scr -Isrc/sdl -Ilibs -Ilibs/imago/src -Ilibs/mikmod/include
+inc = -I/usr/local/include -Isrc -Isrc/3dgfx -Isrc/scr -Isrc/sdl -Ilibs -Ilibs/imago/src -Ilibs/mikmod/include
 warn = -pedantic -Wall -Wno-unused-variable -Wno-unused-function
 
 CFLAGS = $(arch) $(warn) -g $(inc) `sdl-config --cflags`
@@ -13,7 +15,7 @@ LDFLAGS = $(arch) -Llibs/imago -Llibs/mikmod -limago -lmikmod $(sdl_ldflags) -lm
 
 ifneq ($(shell uname -m), i386)
 	arch = -m32
-	sdl_ldflags = -L/usr/lib/i386-linux-gnu -lSDL
+	sdl_ldflags = -L/usr/lib/i386-linux-gnu -lSDL-1.2
 else
 	sdl_ldflags = `sdl-config --libs`
 endif
@@ -27,6 +29,8 @@ $(bin): $(obj) imago mikmod
 %.o: %.asm
 	nasm -f elf -o $@ $<
 
+src/data.o: src/data.asm $(bindata)
+
 -include $(dep)
 
 %.d: %.c