projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed compiled sprites
[dosdemo]
/
GNUmakefile
diff --git
a/GNUmakefile
b/GNUmakefile
index
057ccfb
..
49fb3a1
100644
(file)
--- a/
GNUmakefile
+++ b/
GNUmakefile
@@
-7,7
+7,7
@@
bin = demo
asmsrc += cspr/dbgfont.asm cspr/confont.asm
bindata = data/loading.img
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`
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
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
else
sdl_ldflags = `sdl-config --libs`
endif