1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
|
Description: Modifications to Makefile
Pass CXXFLAGS and LDFLAGS to enable build hardening
Define NDEBUG to quietly ignore WXDEBUG assertion failures (as happens by
default under wx2.8).
Author: Morten Kjeldgaard <mok@bioxray.au.dk>
Author: Graham Inggs <ginggs@debian.org>
Last-Update: 2017-12-25
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
INCDIRS = -Ivcg -Isrc -I.
-OPTFLAGS = -Os -Wall -g
+CXXFLAGS ?= -O2 -Wall -g
-CXXFLAGS = $(INCDIRS) $(OPTFLAGS) `wx-config --cppflags`
-LIBS = $(CXXFLAGS) `wx-config --libs core,base --gl-libs` -lGLEW -lGLU -lGL
+CXXFLAGS += -DPKGDATADIR='"/usr/share/qutemol/"' $(INCDIRS) `wx-config --cppflags` -DNDEBUG
+LIBS = `wx-config --libs core,base --gl-libs` -lGLEW -lGLU -lGL -lgif -lpng
OBJS = \
src/AO.o \
@@ -19,12 +19,33 @@
src/main.o \
src/wx_trackball.o \
vcg/wrap/gui/trackball.o \
- vcg/wrap/gui/trackmode.o
+ vcg/wrap/gui/trackmode.o \
+ src/progress.o src/MyCanvas.o src/saveSnapDialog.o src/gifSave.o src/pngSave.o
all: qutemol
clean:
- find . -name "*.o" | xargs rm
+ rm -f $(OBJS) qutemol
qutemol: $(OBJS)
- $(CXX) -o qutemol $(CFLAGS) $(OBJS) $(LIBS)
+ $(CXX) -o qutemol $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
+
+src/AO.o: src/AO.cpp
+src/AOgpu.o: src/AOgpu.cpp
+src/AtomColor.o: src/AtomColor.cpp
+src/CgUtil.o: src/CgUtil.cpp
+src/Common.o: src/Common.cpp
+src/HardSettings.o: src/HardSettings.cpp
+src/Mol.o: src/Mol.cpp
+src/MyTab.o: src/MyTab.cpp
+src/Sampling.o: src/Sampling.cpp
+src/ShadowMap.o: src/ShadowMap.cpp
+src/main.o: src/main.cpp
+src/wx_trackball.o: src/wx_trackball.cpp
+vcg/wrap/gui/trackball.o: vcg/wrap/gui/trackball.cpp
+vcg/wrap/gui/trackmode.o: vcg/wrap/gui/trackmode.cpp
+src/progress.o: src/progress.cpp
+src/MyCanvas.o: src/MyCanvas.cpp
+src/saveSnapDialog.o: src/saveSnapDialog.cpp
+src/gifSave.o: src/gifSave.cpp
+src/pngSave.o: src/pngSave.cpp
|