projects
/
andemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
working on the demosystem, added libtreestore
[andemo]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
718b7dd
..
163f01f
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,4
+1,4
@@
-src = $(wildcard src/*.c) $(wildcard src/pc/*.c) libs/glew/glew.c
+src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/pc/*.c) libs/glew/glew.c
obj = $(src:.c=.o)
dep = $(src:.c=.d)
bin = demo
obj = $(src:.c=.o)
dep = $(src:.c=.d)
bin = demo
@@
-7,11
+7,11
@@
warn = -pedantic -Wall
dbg = -g
#opt = -O3 -ffast-math -fno-strict-aliasing
def = -DMINIGLUT_USE_LIBC -DGLEW_STATIC
dbg = -g
#opt = -O3 -ffast-math -fno-strict-aliasing
def = -DMINIGLUT_USE_LIBC -DGLEW_STATIC
-incdir = -Isrc -Ilibs/imago/src -Ilibs/glew
+incdir = -Isrc -Ilibs -Ilibs/imago/src -Ilibs/treestore -Ilibs/glew
libdir = -Llibs/unix
CFLAGS = $(warn) $(dbg) $(opt) $(def) $(incdir) -fcommon -MMD
libdir = -Llibs/unix
CFLAGS = $(warn) $(dbg) $(opt) $(def) $(incdir) -fcommon -MMD
-LDFLAGS = $(libdir) $(libsys) $(libgl) -lm -limago
+LDFLAGS = $(libdir) $(libsys) $(libgl) -limago -lpsys -lanim -ltreestore $(libc)
sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/')
ifeq ($(sys), mingw)
sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/')
ifeq ($(sys), mingw)
@@
-20,11
+20,13
@@
ifeq ($(sys), mingw)
libgl = -lopengl32
libsys = -lmingw32 -lgdi32 -lwinmm -mconsole
libdir = -Llibs/w32
libgl = -lopengl32
libsys = -lmingw32 -lgdi32 -lwinmm -mconsole
libdir = -Llibs/w32
+ libc = -lm
else
libgl = -lGL -lX11 -lXext
else
libgl = -lGL -lX11 -lXext
+ libc = -lm -ldl
endif
endif
-$(bin): $(obj)
+$(bin): $(obj) Makefile
$(CC) -o $@ $(obj) $(LDFLAGS)
-include $(dep)
$(CC) -o $@ $(obj) $(LDFLAGS)
-include $(dep)