projects
/
universe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating.
[universe.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
6fc991d
..
b5eef5e
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-13,24
+13,26
@@
# Contact <francois.fleuret@epfl.ch> for comments & bug reports #
#============================================================================#
# Contact <francois.fleuret@epfl.ch> for comments & bug reports #
#============================================================================#
-# CXX=g++-3.3
-
ifeq ($(DEBUG),yes)
CXXFLAGS = -fPIC -Wall -g -DDEBUG
else
# Optimized compilation
ifeq ($(DEBUG),yes)
CXXFLAGS = -fPIC -Wall -g -DDEBUG
else
# Optimized compilation
-
#
CXXFLAGS = -Wall -g -O3 -pg --coverage
+
#
CXXFLAGS = -Wall -g -O3 -pg --coverage
CXXFLAGS = -fPIC -Wall -g -O3
endif
CXXFLAGS = -fPIC -Wall -g -O3
endif
-LDFLAGS = -L/usr/X11R6/lib/ -lz -ldl
+LDFLAGS = -lz -ldl
+
+# Do we use X11?
+CXXFLAGS += -DX11_SUPPORT
+LDFLAGS += -L/usr/X11R6/lib/
# Do we use cairo?
CXXFLAGS += -I/usr/include/cairo -DCAIRO_SUPPORT
LDFLAGS += -lcairo
TASK_SRC = dummy.cc move_square.cc hit_shape.cc
# Do we use cairo?
CXXFLAGS += -I/usr/include/cairo -DCAIRO_SUPPORT
LDFLAGS += -lcairo
TASK_SRC = dummy.cc move_square.cc hit_shape.cc
-TASK_OBJ = $(TASK_SRC:.cc=.
task
)
+TASK_OBJ = $(TASK_SRC:.cc=.
so
)
all: main TAGS $(TASK_OBJ)
all: main TAGS $(TASK_OBJ)
@@
-40,8
+42,10
@@
TAGS: *.cc *.h
main: main.o misc.o \
simple_window.o \
universe.o \
main: main.o misc.o \
simple_window.o \
universe.o \
+ plotter.o \
polygon.o \
xfig_tracer.o \
polygon.o \
xfig_tracer.o \
+ canvas.o canvas_cairo.o \
map.o \
task.o \
retina.o \
map.o \
task.o \
retina.o \
@@
-50,13
+54,13
@@
main: main.o misc.o \
intelligence.o
$(CXX) $(CXXFLAGS) $(LDFLAGS) -lX11 -o $@ $^
intelligence.o
$(CXX) $(CXXFLAGS) $(LDFLAGS) -lX11 -o $@ $^
-%.
task
: %.cc misc.o universe.o polygon.o xfig_tracer.o map.o task.o manipulator.o
+%.
so
: %.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
- $(CC) -M *.cc > Makefile.depend
+ $(CC)
$(CXXFLAGS)
-M *.cc > Makefile.depend
clean:
clean:
- \rm -f main *.o *.
task
Makefile.depend
+ \rm -f main *.o *.
so
Makefile.depend
-include Makefile.depend
-include Makefile.depend