projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SDL backend shifted key translation
[dosdemo]
/
Makefile.dj
diff --git
a/Makefile.dj
b/Makefile.dj
index
ed1a830
..
af00af7
100644
(file)
--- a/
Makefile.dj
+++ b/
Makefile.dj
@@
-1,8
+1,11
@@
-src = $(wildcard src/*.c) $(wildcard src/dos/*.c)
-obj = $(src:.c=.o)
-dep = $(obj:.o=.d)
+src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/dos/*.c)
+asmsrc = $(wildcard src/*.asm) $(wildcard src/scr/*.asm) $(wildcard src/dos/*.asm)
+obj = $(src:.c=.cof) $(asmsrc:.asm=.cof)
+dep = $(obj:.cof=.dep)
bin = demo.exe
bin = demo.exe
+asmsrc += cspr/dbgfont.asm cspr/confont.asm
+
ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
hostsys = dos
else
ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
hostsys = dos
else
@@
-10,52
+13,76
@@
else
TOOLPREFIX = i586-pc-msdosdjgpp-
endif
TOOLPREFIX = i586-pc-msdosdjgpp-
endif
-inc = -Isrc -Isrc/dos -Ilibs/imago/src -Ilibs/oldmik/src
-opt = -O3 -ffast-math
+inc = -Isrc -Isrc/scr -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src -Ilibs/mikmod/include
+opt = -O3 -ffast-math -fno-strict-aliasing
dbg = -g
dbg = -g
+warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
CC = $(TOOLPREFIX)gcc
AR = $(TOOLPREFIX)ar
CC = $(TOOLPREFIX)gcc
AR = $(TOOLPREFIX)ar
-CFLAGS = -pedantic -Wall -march=pentium $(dbg) $(opt) $(inc)
-LDFLAGS = libs/imago/imago.a libs/oldmik/mikmod.a
+CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(inc)
+LDFLAGS = libs/imago/imago.dja libs/anim/anim.dja libs/mikmod/dos/libmikmod.a
+
+ifneq ($(hostsys), dos)
+.PHONY: all
+all: data $(bin)
+endif
-$(bin): $(obj) imago mikmod
+$(bin): $(obj) imago anim mikmod
$(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
$(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
+%.cof: %.asm
+ nasm -f coff -o $@ $<
+
+ifneq ($(hostsys), dos)
-include $(dep)
-include $(dep)
+endif
+
+%.cof: %.c
+ $(CC) $(CFLAGS) -o $@ -c $<
-%.d: %.c
- @$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
+%.dep: %.c
+ @echo dep $@
+ @$(CPP) $(CFLAGS) $< -MM -MT $(@:.dep=.cof) >$@
.PHONY: imago
imago:
$(MAKE) -C libs/imago -f Makefile.dj
.PHONY: imago
imago:
$(MAKE) -C libs/imago -f Makefile.dj
+.PHONY: anim
+anim:
+ $(MAKE) -C libs/anim -f Makefile.dj
+
.PHONY: mikmod
mikmod:
.PHONY: mikmod
mikmod:
- $(MAKE) -C libs/oldmik -f Makefile.dj
+ $(MAKE) -C libs/mikmod/dos -f Makefile.dj
.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/oldmik -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
ifeq ($(hostsys), dos)
clean:
.PHONY: clean
.PHONY: cleandep
ifeq ($(hostsys), dos)
clean:
- del src\*.o
- del src\dos\*.o
+ del src\*.cof
+ del src\dos\*.cof
del $(bin)
cleandep:
del $(bin)
cleandep:
- del src\*.d
- del src\dos\*.d
+ del src\*.dep
+ del src\dos\*.dep
else
clean:
rm -f $(obj) $(bin)
cleandep:
rm -f $(dep)
else
clean:
rm -f $(obj) $(bin)
cleandep:
rm -f $(dep)
+
+.PHONY: data
+data:
+ @tools/procdata
endif
endif