projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed warnings
[dosdemo]
/
GNUmakefile
diff --git
a/GNUmakefile
b/GNUmakefile
index
d6c67d1
..
48805fa
100644
(file)
--- a/
GNUmakefile
+++ b/
GNUmakefile
@@
-1,11
+1,12
@@
src = $(wildcard src/*.c) $(wildcard src/sdl/*.c)
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
inc = -I/usr/local/include -Isrc -Isrc/sdl -Ilibs/imago/src -Ilibs/mikmod/include
dep = $(obj:.o=.d)
bin = demo
inc = -I/usr/local/include -Isrc -Isrc/sdl -Ilibs/imago/src -Ilibs/mikmod/include
+warn = -pedantic -Wall -Wno-unused-variable -Wno-unused-function
-CFLAGS = -pedantic -Wall -g $(inc) `sdl-config --cflags`
+CFLAGS = $(warn) -g $(inc) `sdl-config --cflags`
LDFLAGS = -Llibs/imago -Llibs/mikmod -limago -lmikmod `sdl-config --libs` -lm
$(bin): $(obj) imago mikmod
LDFLAGS = -Llibs/imago -Llibs/mikmod -limago -lmikmod `sdl-config --libs` -lm
$(bin): $(obj) imago mikmod
@@
-29,8
+30,8
@@
mikmod:
.PHONY: cleanlibs
cleanlibs:
.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:
.PHONY: clean
clean: