X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=GNUmakefile;h=49fb3a17884dd744b1af54a5a771d80c34c0c0c7;hp=057ccfbcbc9d5f53ced075596454cca60360d66b;hb=0ce0f59d2afd26e0956716fae169075368020a02;hpb=7cffbf057545fb303ad8f53e432ef42f7708e16d diff --git a/GNUmakefile b/GNUmakefile index 057ccfb..49fb3a1 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -7,7 +7,7 @@ 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` @@ -15,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