X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=Makefile;h=3a41714e9cdfb60cf8f2246f2e63700f6ebeadb8;hb=18b655f5e908b7a57709b9dec9f00428ed339839;hp=0f7540cdcc9ffd9b62bd6e114d5237d353044519;hpb=12dcd901862c9097eb8e54e39c6b5d2e5d658f03;p=universe.git diff --git a/Makefile b/Makefile index 0f7540c..3a41714 100644 --- a/Makefile +++ b/Makefile @@ -16,19 +16,19 @@ # 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 - CXXFLAGS = -Wall -g -O3 + CXXFLAGS = -fPIC -Wall -g -O3 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) -all: mash main TAGS $(TASK_OBJ) +all: main TAGS $(TASK_OBJ) TAGS: *.cc *.h etags *.cc *.h @@ -44,10 +44,7 @@ main: main.o misc.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 xfig_tracer.o map.o task.o manipulator.o $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$@ -o $@ $^