projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed all the makefiles to build with the new libanim
[dosdemo]
/
Makefile.dj
diff --git
a/Makefile.dj
b/Makefile.dj
index
2088717
..
a687012
100644
(file)
--- a/
Makefile.dj
+++ b/
Makefile.dj
@@
-11,7
+11,7
@@
else
TOOLPREFIX = i586-pc-msdosdjgpp-
endif
TOOLPREFIX = i586-pc-msdosdjgpp-
endif
-inc = -Isrc -Isrc/dos -Ilibs/imago/src -Ilibs/mikmod/include
+inc = -Isrc -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src -Ilibs/mikmod/include
opt = -O3 -ffast-math -fno-strict-aliasing
dbg = -g
warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
opt = -O3 -ffast-math -fno-strict-aliasing
dbg = -g
warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
@@
-19,9
+19,9
@@
warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
CC = $(TOOLPREFIX)gcc
AR = $(TOOLPREFIX)ar
CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(inc)
CC = $(TOOLPREFIX)gcc
AR = $(TOOLPREFIX)ar
CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(inc)
-LDFLAGS = libs/imago/imago.dja libs/mikmod/dos/libmikmod.a
+LDFLAGS = libs/imago/imago.dja libs/anim/anim.dja libs/mikmod/dos/libmikmod.a
-$(bin): $(obj) imago mikmod
+$(bin): $(obj) imago anim mikmod
$(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
%.cof: %.asm
$(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
%.cof: %.asm
@@
-39,6
+39,10
@@
$(bin): $(obj) imago mikmod
imago:
$(MAKE) -C libs/imago -f Makefile.dj
imago:
$(MAKE) -C libs/imago -f Makefile.dj
+.PHONY: anim
+anim:
+ $(MAKE) -C libs/anim -f Makefile.dj
+
.PHONY: mikmod
mikmod:
$(MAKE) -C libs/mikmod/dos -f Makefile.dj
.PHONY: mikmod
mikmod:
$(MAKE) -C libs/mikmod/dos -f Makefile.dj
@@
-46,6
+50,7
@@
mikmod:
.PHONY: cleanlibs
cleanlibs:
$(MAKE) -C libs/imago -f Makefile.dj clean
.PHONY: cleanlibs
cleanlibs:
$(MAKE) -C libs/imago -f Makefile.dj clean
+ $(MAKE) -C libs/anim -f Makefile.dj clean
$(MAKE) -C libs/mikmod/dos -f Makefile.dj clean
.PHONY: clean
$(MAKE) -C libs/mikmod/dos -f Makefile.dj clean
.PHONY: clean