removed clang-format and clang_complete files from the repo

[dosdemo] / Makefile.dj

diff --git a/Makefile.dj b/Makefile.dj
index f2414dc..59d4042 100644 (file)
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -1,10 +1,12 @@
-src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/dos/*.c)
+src = $(wildcard src/*.c) $(wildcard src/3dgfx/*.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)
+obj = $(src:.c=.odj) $(asmsrc:.asm=.odj)
+dep = $(src:.c=.d)
 bin = demo.exe
 
 asmsrc += cspr/dbgfont.asm cspr/confont.asm
+bindata = data/loading.img
 
 ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
        hostsys = dos
@@ -13,17 +15,24 @@ else
        TOOLPREFIX = i586-pc-msdosdjgpp-
 endif
 
-inc = -Isrc -Isrc/scr -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src
+inc = -Isrc -Isrc/3dgfx -Isrc/scr -Isrc/dos -Ilibs \
+         -Ilibs/imago/src -Ilibs/anim/src -Ilibs/midas
 opt = -O3 -ffast-math -fno-strict-aliasing
-dbg = -g
-#prof = -pg
 warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
-def = -DNO_MUSIC
+
+ifdef RELEASE
+       dbg = -g
+       def = -DNDEBUG -DNO_SOUND
+else
+       def = -DNO_SOUND
+endif
+#prof = -pg
 
 CC = $(TOOLPREFIX)gcc
 AR = $(TOOLPREFIX)ar
-CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(prof) $(inc) $(def)
+CFLAGS = -march=pentium $(warn) -MMD $(dbg) $(opt) $(prof) $(inc) $(def)
 LDFLAGS = libs/imago/imago.dja libs/anim/anim.dja
+#libs/midas/libmidas.a
 
 ifneq ($(hostsys), dos)
 .PHONY: all
@@ -33,20 +42,16 @@ endif
 $(bin): $(obj) imago anim
        $(CC) -o $@ -Wl,-Map=ld.map $(prof) $(obj) $(LDFLAGS)
 
-%.cof: %.asm
+%.odj: %.asm
        nasm -f coff -o $@ $<
 
-ifneq ($(hostsys), dos)
+src/data.odj: src/data.asm $(bindata)
+
 -include $(dep)
-endif
 
-%.cof: %.c
+%.odj: %.c
        $(CC) $(CFLAGS) -o $@ -c $<
 
-%.dep: %.c
-       @echo dep $@
-       @$(CPP) $(CFLAGS) $< -MM -MT $(@:.dep=.cof) >$@
-
 .PHONY: imago
 imago:
        $(MAKE) -C libs/imago -f Makefile.dj
@@ -57,21 +62,23 @@ anim:
 
 .PHONY: cleanlibs
 cleanlibs:
-       $(MAKE) -C libs/imago -f Makefile.dj clean
-       $(MAKE) -C libs/anim -f Makefile.dj clean
+       $(MAKE) -C libs/imago clean -f Makefile.dj
+       $(MAKE) -C libs/anim clean -f Makefile.dj
 
 .PHONY: clean
 .PHONY: cleandep
 
 ifeq ($(hostsys), dos)
 clean:
-       del src\*.cof
-       del src\dos\*.cof
+       del src\*.odj
+       del src\3dgfx\*.odj
+       del src\dos\*.odj
        del $(bin)
 
 cleandep:
-       del src\*.dep
-       del src\dos\*.dep
+       del src\*.d
+       del src\3dgfx\*.d
+       del src\dos\*.d
 else
 clean:
        rm -f $(obj) $(bin)
@@ -83,3 +90,7 @@ cleandep:
 data:
        @tools/procdata
 endif
+
+.PHONY: strip
+strip: $(bin)
+       $(TOOLPREFIX)strip $(bin)