projects
/
universe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update.
[universe.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
05e9586
..
3a41714
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-16,19
+16,19
@@
# CXX=g++-3.3
ifeq ($(DEBUG),yes)
# CXX=g++-3.3
ifeq ($(DEBUG),yes)
- CXXFLAGS = -Wall -g -DDEBUG
+ CXXFLAGS = -
fPIC -
Wall -g -DDEBUG
else
# Optimized compilation
# CXXFLAGS = -Wall -g -O3 -pg --coverage
else
# Optimized compilation
# CXXFLAGS = -Wall -g -O3 -pg --coverage
- CXXFLAGS = -Wall -g -O3
+ CXXFLAGS = -
fPIC -
Wall -g -O3
endif
endif
-LDFLAGS = -L/usr/X11R6/lib/
+LDFLAGS = -L/usr/X11R6/lib/
-lz -ldl
TASK_SRC = dummy.cc move_square.cc hit_shape.cc
TASK_OBJ = $(TASK_SRC:.cc=.task)
TASK_SRC = dummy.cc move_square.cc hit_shape.cc
TASK_OBJ = $(TASK_SRC:.cc=.task)
-all: ma
sh ma
in TAGS $(TASK_OBJ)
+all: main TAGS $(TASK_OBJ)
TAGS: *.cc *.h
etags *.cc *.h
TAGS: *.cc *.h
etags *.cc *.h
@@
-36,20
+36,17
@@
TAGS: *.cc *.h
main: main.o misc.o \
simple_window.o \
universe.o \
main: main.o misc.o \
simple_window.o \
universe.o \
- xfig_tracer.o \
polygon.o \
polygon.o \
+ xfig_tracer.o \
map.o \
task.o \
retina.o \
manipulator.o \
approximer.o \
intelligence.o
map.o \
task.o \
retina.o \
manipulator.o \
approximer.o \
intelligence.o
- $(CXX) -lX11 $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
-
-mash: misc.o universe.o polygon.o xfig_tracer.o mash.o
- $(CXX) -lX11 $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -lX11 -o $@ $^
-%.task: %.cc misc.o universe.o polygon.o map.o task.o manipulator.o
+%.task: %.cc misc.o universe.o polygon.o
xfig_tracer.o
map.o task.o manipulator.o
$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$@ -o $@ $^
Makefile.depend: *.h *.cc Makefile
$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$@ -o $@ $^
Makefile.depend: *.h *.cc Makefile