projects
/
raydungeon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wall noise and arbitrary render resolution option
[raydungeon]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
3252ec7
..
0af9e1a
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,17
+1,17
@@
-src = $(wildcard src/*.c)
+src = $(wildcard src/*.c) libs/glew/glew.c
obj = $(src:.c=.o)
dep = $(src:.c=.d)
bin = game
warn = -pedantic -Wall
dbg = -g
obj = $(src:.c=.o)
dep = $(src:.c=.d)
bin = game
warn = -pedantic -Wall
dbg = -g
-def = -DMINIGLUT_USE_LIBC
+def = -DMINIGLUT_USE_LIBC -DGLEW_STATIC
-inc = -Ilibs/assfile
-liblist = libs/assfile/assfile.a
+inc = -Ilibs -Ilibs/assfile -Ilibs/treestor/include -Ilibs/glew
+libs = -lassfile -ldrawtext -lgoat3d -limago -ltreestor
CFLAGS = $(warn) $(opt) $(dbg) $(inc) $(def) -MMD
CFLAGS = $(warn) $(opt) $(dbg) $(inc) $(def) -MMD
-LDFLAGS = $(syslib) $(libgl) $(libs) -lm
+LDFLAGS = $(libdir) $(syslib) $(libgl) $(libs) -lm
sys := $(shell uname -s | sed 's/MINGW.*/mingw/')
ifeq ($(sys), mingw)
sys := $(shell uname -s | sed 's/MINGW.*/mingw/')
ifeq ($(sys), mingw)
@@
-21,10
+21,12
@@
ifeq ($(sys), mingw)
obj = $(src:.c=.w32.o)
dep = $(src:.c=.w32.d)
bin = game.exe
obj = $(src:.c=.w32.o)
dep = $(src:.c=.w32.d)
bin = game.exe
- libs = $(liblist:.a=.w32.a)
+
+ libdir = -Llibs/w32
else
else
- libgl = -lGL -lGLU -lX11
- libs = $(liblist)
+ libgl = -lGL -lX11
+
+ libdir = -Llibs/unix
endif
$(bin): $(obj) libs
endif
$(bin): $(obj) libs
@@
-37,11
+39,11
@@
$(bin): $(obj) libs
.PHONY: libs
libs:
.PHONY: libs
libs:
- $(MAKE) -C libs/assfile
+ $(MAKE) -C libs
.PHONY: clean-libs
clean-libs:
.PHONY: clean-libs
clean-libs:
- $(MAKE) -C libs/assfile clean
+ $(MAKE) -C libs clean
.PHONY: clean
clean:
.PHONY: clean
clean: