diff --git a/src/common/common.pro b/src/common/common.pro index 3f30b3525..bf091b161 100644 --- a/src/common/common.pro +++ b/src/common/common.pro @@ -3,7 +3,8 @@ GLEWDIR = ../external/glew-1.5.1 GLEWCODE = $$GLEWDIR/src/glew.c mac:DESTDIR = ../meshlab/meshlab.app/Contents/MacOS - +win32-g++:debug:DESTDIR = ../meshlab/debug +win32-g++:release:DESTDIR = ../meshlab/release INCLUDEPATH *= ../.. $$VCGDIR $$GLEWDIR/include TEMPLATE = lib @@ -14,7 +15,7 @@ QT += xml TARGET = DEPENDPATH += . INCLUDEPATH += . - +win32-g++:DEFINES += GLEW_STATIC # Input HEADERS += filterparameter.h \ filterscript.h \ diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index f1ea7bfb8..7f3704762 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -94,7 +94,13 @@ CONFIG += stl mac:LIBS += meshlab.app/Contents/MacOS/libcommon.dylib win32-msvc2005:LIBS += XXXXXXX win32-msvc2008:LIBS += XXXXXXX -win32-g++:LIBS += XXXXXXX +CONFIG(debug) { +win32-g++:LIBS += -L../common/debug -lcommon +} +CONFIG(release) { +win32-g++:LIBS += -L../common/release -lcommon +} + unix:LIBS += -L../common -lcommon # uncomment in your local copy only in emergency cases. diff --git a/src/meshlab/meshlab.rc b/src/meshlab/meshlab.rc index abfaac17e..8011167df 100644 --- a/src/meshlab/meshlab.rc +++ b/src/meshlab/meshlab.rc @@ -1 +1 @@ - IDI_ICON1 ICON DISCARDABLE "images\eye.ico" \ No newline at end of file + IDI_ICON1 ICON DISCARDABLE "images/eye.ico" \ No newline at end of file diff --git a/src/shared.pri b/src/shared.pri index 080268597..74bf905aa 100644 --- a/src/shared.pri +++ b/src/shared.pri @@ -1,8 +1,8 @@ # this is the common include for all the plugins -CONFIG *= debug_and_release TEMPLATE = lib CONFIG += plugin +QT += opengl QT += xml VCGDIR = ../../../../vcglib @@ -10,7 +10,9 @@ GLEWDIR = ../../external/glew-1.5.1 mac:LIBS += ../../meshlab/meshlab.app/Contents/MacOS/libcommon.dylib win32-msvc2005:LIBS += XXXXXXX win32-msvc2008:LIBS += XXXXXXX -win32-g++:LIBS += XXXXXXX + +win32-g++:debug: LIBS += -L../../common/debug -lcommon +win32-g++:release:LIBS += -L../../common/release -lcommon # uncomment to try Eigen # DEFINES += VCG_USE_EIGEN