diff --git a/src/VirtualLeaf.pro b/src/VirtualLeaf.pro --- a/src/VirtualLeaf.pro +++ b/src/VirtualLeaf.pro @@ -24,6 +24,9 @@ CONFIG += debug CONFIG += qt QMAKE_CXXFLAGS += -fexceptions +QMAKE_CXXFLAGS += -Wall +QMAKE_CXXFLAGS += -Wno-write-strings +QMAKE_CXXFLAGS += -Wno-unused-parameter QMAKE_CXXFLAGS_DEBUG += -g3 QMAKE_CXXFLAGS_DEBUG += -DQDEBUG @@ -36,6 +39,7 @@ DEFINES += REACTIONS_HEADER_STRING=\"$${ DEFINES += FLEMING BINDIR = ../bin +LIBDIR = ../lib DESTDIR = $$BINDIR TARGET = VirtualLeaf TEMPLATE = app @@ -50,9 +54,9 @@ QT += qt3support win32 { CONFIG -= console - LIBXML2DIR = ..\lib\libxml2 - LIBICONVDIR = ..\lib\libiconv - LIBZDIR = ..\lib\libz + LIBXML2DIR = $${LIBDIR}\libxml2 + LIBICONVDIR = $${LIBDIR}\libiconv + LIBZDIR = $${LIBDIR}\libz GRAPHICS = qt RC_FILE = VirtualLeaf.rc QMAKE_CXXFLAGS += -DLIBXML_STATIC @@ -76,7 +80,7 @@ unix { # Input HEADERS += \ - apoplastitem.h \ +# apoplastitem.h \ canvas.h \ cellbase.h \ cell.h \ @@ -118,7 +122,7 @@ HEADERS += \ $${PARTMPL} SOURCES += \ - apoplastitem.cpp \ +# apoplastitem.cpp \ canvas.cpp \ cellbase.cpp \ cell.cpp \ @@ -199,6 +203,7 @@ ICON = leaficon.icns QMAKE_POST_LINK = "\ #install_name_tool -change libqwt.5.dylib $$QWTDIR/lib/libqwt.dylib $${TARGET}.app/Contents/MacOS/$${TARGET}; \ cp leaficon.icns $${DESTDIR}/$${TARGET}.app; \ + cp gpl3.txt $${DESTDIR}/$${TARGET}.app/Contents/MacOS/. ; \ mkdir $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \ cp -R /Library/Frameworks/QtCore.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \ cp -R /Library/Frameworks/QtGui.framework $${DESTDIR}/$${TARGET}.app/Contents/Frameworks; \