projects
/
antikythera
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of goat:git/antikythera
[antikythera]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
8a5b897
..
228e095
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,10
+1,12
@@
src = $(wildcard src/*.cc)
src = $(wildcard src/*.cc)
-obj = $(src:.cc=.o)
+csrc = $(wildcard src/*.c)
+obj = $(src:.cc=.o) $(csrc:.c=.o)
dep = $(obj:.o=.d)
bin = anti
dep = $(obj:.o=.d)
bin = anti
-CXXFLAGS = -std=c++11 -pedantic -Wall -g
-LDFLAGS = $(libgl_$(sys)) -lm -lgmath
+CFLAGS = -pedantic -Wall -g -I/usr/local/include
+CXXFLAGS = -std=c++11 -pedantic -Wall -g -I/usr/local/include
+LDFLAGS = -L/usr/local/lib $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman -lpthread
sys = $(shell uname -s)
libgl_Linux = -lGL -lGLU -lglut -lGLEW
sys = $(shell uname -s)
libgl_Linux = -lGL -lGLU -lglut -lGLEW
@@
-15,6
+17,9
@@
$(bin): $(obj)
-include $(dep)
-include $(dep)
+%.d: %.c
+ @$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
+
%.d: %.cc
@$(CPP) $(CXXFLAGS) $< -MM -MT $(@:.d=.o) >$@
%.d: %.cc
@$(CPP) $(CXXFLAGS) $< -MM -MT $(@:.d=.o) >$@