projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed clang-format and clang_complete files from the repo
[dosdemo]
/
GNUmakefile
diff --git
a/GNUmakefile
b/GNUmakefile
index
0054bbc
..
767026f
100644
(file)
--- a/
GNUmakefile
+++ b/
GNUmakefile
@@
-8,10
+8,10
@@
bin = demo
asmsrc += cspr/dbgfont.asm cspr/confont.asm
bindata = data/loading.img
asmsrc += cspr/dbgfont.asm cspr/confont.asm
bindata = data/loading.img
-inc = -I/usr/local/include -Isrc -Isrc/3dgfx -Isrc/scr -Isrc/glut -Ilibs \
+inc = -I/usr/local/include -Isrc -Isrc/3dgfx -Isrc/scr -Isrc/utils -Isrc/glut -Ilibs \
-Ilibs/imago/src -Ilibs/mikmod/include
def = -DMINIGLUT_USE_LIBC -DMIKMOD_STATIC
-Ilibs/imago/src -Ilibs/mikmod/include
def = -DMINIGLUT_USE_LIBC -DMIKMOD_STATIC
-warn = -pedantic -Wall -Wno-unused-variable -Wno-unused-function
+warn = -pedantic -Wall -Wno-unused-variable -Wno-unused-function -Wno-address
#opt = -O3 -ffast-math
dbg = -g
#opt = -O3 -ffast-math
dbg = -g
@@
-27,7
+27,7
@@
endif
sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/; s/IRIX.*/IRIX/')
ifeq ($(sys), mingw)
sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/; s/IRIX.*/IRIX/')
ifeq ($(sys), mingw)
- obj = $(src:.c=.w32.o)
+ obj = $(src:.c=.w32.o) $(asmsrc:.asm=.w32.o)
bin = demo_win32.exe
bin = demo_win32.exe
@@
-52,6
+52,9
@@
$(bin): $(obj) imago mikmod
%.o: %.asm
nasm -f elf -o $@ $<
%.o: %.asm
nasm -f elf -o $@ $<
+%.w32.o: %.asm
+ nasm -f coff -o $@ $<
+
%.w32.o: %.c
$(CC) -o $@ $(CFLAGS) -c $<
%.w32.o: %.c
$(CC) -o $@ $(CFLAGS) -c $<