projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added specular offset parameters in gen_phong_tex
[dosdemo]
/
Makefile.dj
diff --git
a/Makefile.dj
b/Makefile.dj
index
c2ad183
..
764ad9d
100644
(file)
--- a/
Makefile.dj
+++ b/
Makefile.dj
@@
-1,4
+1,5
@@
src = $(wildcard src/*.c) $(wildcard src/dos/*.c)
src = $(wildcard src/*.c) $(wildcard src/dos/*.c)
+asmsrc = $(wildcard src/*.asm)
obj = $(src:.c=.cof)
dep = $(obj:.cof=.dep)
bin = demo.exe
obj = $(src:.c=.cof)
dep = $(obj:.cof=.dep)
bin = demo.exe
@@
-10,14
+11,14
@@
else
TOOLPREFIX = i586-pc-msdosdjgpp-
endif
TOOLPREFIX = i586-pc-msdosdjgpp-
endif
-inc = -Isrc -Isrc/dos -Ilibs/imago/src -Ilibs/oldmik/src
+inc = -Isrc -Isrc/dos -Ilibs/imago/src -Ilibs/mikmod/include
opt = -O3 -ffast-math
dbg = -g
CC = $(TOOLPREFIX)gcc
AR = $(TOOLPREFIX)ar
CFLAGS = -pedantic -Wall -march=pentium $(dbg) $(opt) $(inc)
opt = -O3 -ffast-math
dbg = -g
CC = $(TOOLPREFIX)gcc
AR = $(TOOLPREFIX)ar
CFLAGS = -pedantic -Wall -march=pentium $(dbg) $(opt) $(inc)
-LDFLAGS = libs/imago/imago.dja libs/oldmik/mikmod.dja
+LDFLAGS = libs/imago/imago.dja libs/mikmod/dos/libmikmod.a
$(bin): $(obj) imago mikmod
$(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
$(bin): $(obj) imago mikmod
$(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
@@
-39,12
+40,12
@@
imago:
.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/mikmod/dos -f Makefile.dj clean
.PHONY: clean
.PHONY: cleandep
.PHONY: clean
.PHONY: cleandep