projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed the mesh loader
[dosdemo]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
f3630fa
..
e249553
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-5,6
+5,7
@@
dep = $(obj:.odj=.dep)
bin = demo.exe
asmsrc += cspr/dbgfont.asm cspr/confont.asm
bin = demo.exe
asmsrc += cspr/dbgfont.asm cspr/confont.asm
+bindata = data/loading.img
ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
hostsys = dos
ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
hostsys = dos
@@
-15,10
+16,15
@@
endif
inc = -Isrc -Isrc/scr -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src
opt = -O3 -ffast-math -fno-strict-aliasing
inc = -Isrc -Isrc/scr -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src
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
+
+ifdef RELEASE
+ dbg = -g
+ def = -DNDEBUG -DNO_MUSIC
+else
+ def = -DNO_MUSIC
+endif
+#prof = -pg
CC = $(TOOLPREFIX)gcc
AR = $(TOOLPREFIX)ar
CC = $(TOOLPREFIX)gcc
AR = $(TOOLPREFIX)ar
@@
-36,6
+42,8
@@
$(bin): $(obj) imago anim
%.odj: %.asm
nasm -f coff -o $@ $<
%.odj: %.asm
nasm -f coff -o $@ $<
+src/data.odj: src/data.asm $(bindata)
+
ifneq ($(hostsys), dos)
-include $(dep)
endif
ifneq ($(hostsys), dos)
-include $(dep)
endif
@@
-83,3
+91,7
@@
cleandep:
data:
@tools/procdata
endif
data:
@tools/procdata
endif
+
+.PHONY: strip
+strip: $(bin)
+ $(TOOLPREFIX)strip $(bin)