projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backported build fixes and warnings cleanup from dos
[dosdemo]
/
Makefile.dj
diff --git
a/Makefile.dj
b/Makefile.dj
index
b5c42bb
..
f2414dc
100644
(file)
--- a/
Makefile.dj
+++ b/
Makefile.dj
@@
-4,7
+4,7
@@
obj = $(src:.c=.cof) $(asmsrc:.asm=.cof)
dep = $(obj:.cof=.dep)
bin = demo.exe
dep = $(obj:.cof=.dep)
bin = demo.exe
-asmsrc += font.asm
+asmsrc += cspr/dbgfont.asm cspr/confont.asm
ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
hostsys = dos
ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
hostsys = dos
@@
-13,18
+13,25
@@
else
TOOLPREFIX = i586-pc-msdosdjgpp-
endif
TOOLPREFIX = i586-pc-msdosdjgpp-
endif
-inc = -Isrc -Isrc/scr -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src -Ilibs/mikmod/include
+inc = -Isrc -Isrc/scr -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src
opt = -O3 -ffast-math -fno-strict-aliasing
dbg = -g
opt = -O3 -ffast-math -fno-strict-aliasing
dbg = -g
+#prof = -pg
warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
+def = -DNO_MUSIC
CC = $(TOOLPREFIX)gcc
AR = $(TOOLPREFIX)ar
CC = $(TOOLPREFIX)gcc
AR = $(TOOLPREFIX)ar
-CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(inc)
-LDFLAGS = libs/imago/imago.dja libs/anim/anim.dja libs/mikmod/dos/libmikmod.a
+CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(prof) $(inc) $(def)
+LDFLAGS = libs/imago/imago.dja libs/anim/anim.dja
-$(bin): $(obj) imago anim mikmod
- $(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
+ifneq ($(hostsys), dos)
+.PHONY: all
+all: data $(bin)
+endif
+
+$(bin): $(obj) imago anim
+ $(CC) -o $@ -Wl,-Map=ld.map $(prof) $(obj) $(LDFLAGS)
%.cof: %.asm
nasm -f coff -o $@ $<
%.cof: %.asm
nasm -f coff -o $@ $<
@@
-48,15
+55,10
@@
imago:
anim:
$(MAKE) -C libs/anim -f Makefile.dj
anim:
$(MAKE) -C libs/anim -f Makefile.dj
-.PHONY: mikmod
-mikmod:
- $(MAKE) -C libs/mikmod/dos -f Makefile.dj
-
.PHONY: cleanlibs
cleanlibs:
$(MAKE) -C libs/imago -f Makefile.dj clean
$(MAKE) -C libs/anim -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
.PHONY: cleandep
.PHONY: clean
.PHONY: cleandep
@@
-76,11
+78,8
@@
clean:
cleandep:
rm -f $(dep)
cleandep:
rm -f $(dep)
-endif
-
-tools/csprite/csprite:
- $(MAKE) -C tools/csprite
-
-font.asm: data/legible.fnt tools/csprite/csprite
- tools/csprite/csprite -n cs_font -s 8x16 -conv565 -nasm $< >$@
+.PHONY: data
+data:
+ @tools/procdata
+endif