diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index e4443067f..e75e57439 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -53,6 +53,9 @@ RESOURCES = meshlab.qrc # to add windows icon RC_FILE = meshlab.rc +# to add MacOS icon +ICON = images/meshlab.icns + QT += opengl QT += xml QT += network @@ -78,11 +81,3 @@ CONFIG(debug, debug|release) { } - -unix{ - LIBS += -L../../../code/lib/glew/lib -lGLEW - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release -} diff --git a/src/meshlabplugins/baseio/baseio.pro b/src/meshlabplugins/baseio/baseio.pro index 7e8e9bd29..181d321ff 100644 --- a/src/meshlabplugins/baseio/baseio.pro +++ b/src/meshlabplugins/baseio/baseio.pro @@ -14,12 +14,6 @@ DESTDIR = ../../meshlab/plugins # the following line is needed to avoid mismatch between # the awful min/max macros of windows and the limits max win32:DEFINES += NOMINMAX -unix{ - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release -} contains(TEMPLATE,lib) { diff --git a/src/meshlabplugins/cleanfilter/cleanfilter.pro b/src/meshlabplugins/cleanfilter/cleanfilter.pro index 25cac1259..5a7dea7e3 100644 --- a/src/meshlabplugins/cleanfilter/cleanfilter.pro +++ b/src/meshlabplugins/cleanfilter/cleanfilter.pro @@ -13,13 +13,6 @@ QT += xml # the following line is needed to avoid mismatch between # the awful min/max macros of windows and the limits max win32:DEFINES += NOMINMAX -unix{ - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release -# LIBS += -l3ds -} contains(TEMPLATE,lib) { diff --git a/src/meshlabplugins/colladaio/colladaio.pro b/src/meshlabplugins/colladaio/colladaio.pro index b287a53f8..80b1b83b2 100644 --- a/src/meshlabplugins/colladaio/colladaio.pro +++ b/src/meshlabplugins/colladaio/colladaio.pro @@ -15,13 +15,6 @@ QT += xml # the following line is needed to avoid mismatch between # the awful min/max macros of windows and the limits max win32:DEFINES += NOMINMAX -unix{ - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release - LIBS += -l3ds -} contains(TEMPLATE,lib) { diff --git a/src/meshlabplugins/editpaint/editpaint.pro b/src/meshlabplugins/editpaint/editpaint.pro index 57a838788..f85f7d9e5 100755 --- a/src/meshlabplugins/editpaint/editpaint.pro +++ b/src/meshlabplugins/editpaint/editpaint.pro @@ -1,7 +1,3 @@ -# Diese Datei wurde mit dem qmake-Manager von KDevelop erstellt. -# ------------------------------------------- -# Unterordner relativ zum Projektordner: . -# Das Target ist eine Anwendung: TEMPLATE = lib CONFIG += plugin @@ -16,12 +12,7 @@ DESTDIR = ../../meshlab/plugins DEFINES += GLEW_STATIC QT += opengl RESOURCES = meshlab.qrc -unix{ - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release -} + contains(TEMPLATE,lib){ CONFIG(debug, debug|release){ unix{ diff --git a/src/meshlabplugins/meshcolorize/meshcolorize.pro b/src/meshlabplugins/meshcolorize/meshcolorize.pro index 74dd8f9d6..687ee303e 100644 --- a/src/meshlabplugins/meshcolorize/meshcolorize.pro +++ b/src/meshlabplugins/meshcolorize/meshcolorize.pro @@ -11,13 +11,6 @@ DESTDIR = ../../meshlab/plugins win32:DEFINES += NOMINMAX FORMS = equalizerDialog.ui -unix{ - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release -} - contains(TEMPLATE,lib) { CONFIG(debug, debug|release) { diff --git a/src/meshlabplugins/meshdecorate/meshdecorate.pro b/src/meshlabplugins/meshdecorate/meshdecorate.pro index beda3b053..bb71f003a 100644 --- a/src/meshlabplugins/meshdecorate/meshdecorate.pro +++ b/src/meshlabplugins/meshdecorate/meshdecorate.pro @@ -10,12 +10,6 @@ DESTDIR = ../../meshlab/plugins win32:DEFINES += NOMINMAX # win32:LIBS += ../../../../code/lib/glut/lib/glut32.lib -unix{ - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release -} contains(TEMPLATE,lib) { CONFIG(debug, debug|release) { diff --git a/src/meshlabplugins/meshedit/meshedit.pro b/src/meshlabplugins/meshedit/meshedit.pro index 0bcf14191..868a6b37f 100644 --- a/src/meshlabplugins/meshedit/meshedit.pro +++ b/src/meshlabplugins/meshedit/meshedit.pro @@ -13,13 +13,6 @@ RESOURCES = meshlab.qrc # the awful min/max macros of windows and the limits max win32:DEFINES += NOMINMAX -unix{ - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release -} - contains(TEMPLATE,lib) { CONFIG(debug, debug|release) { unix:TARGET = $$member(TARGET, 0)_debug diff --git a/src/meshlabplugins/meshfilter/meshfilter.pro b/src/meshlabplugins/meshfilter/meshfilter.pro index 3aa8d040f..5d144f433 100644 --- a/src/meshlabplugins/meshfilter/meshfilter.pro +++ b/src/meshlabplugins/meshfilter/meshfilter.pro @@ -22,12 +22,6 @@ win32:DEFINES += NOMINMAX FORMS = ui/transformDialog.ui ../../meshlab/ui/genericELDialog.ui QT += opengl -unix{ - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release -} contains(TEMPLATE,lib) { CONFIG(debug, debug|release) { diff --git a/src/meshlabplugins/meshrender/meshrender.pro b/src/meshlabplugins/meshrender/meshrender.pro index cc7454c3a..a1511c8a3 100644 --- a/src/meshlabplugins/meshrender/meshrender.pro +++ b/src/meshlabplugins/meshrender/meshrender.pro @@ -14,13 +14,6 @@ win32:DEFINES += NOMINMAX FORMS = shaderDialog.ui DEFINES += GLEW_STATIC -unix{ - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release - QT += xml -} contains(TEMPLATE,lib) { CONFIG(debug, debug|release) { diff --git a/src/meshlabplugins/meshselect/meshselect.pro b/src/meshlabplugins/meshselect/meshselect.pro index 9220c9276..a086fc7d5 100644 --- a/src/meshlabplugins/meshselect/meshselect.pro +++ b/src/meshlabplugins/meshselect/meshselect.pro @@ -11,13 +11,6 @@ RESOURCES = meshlab.qrc # the awful min/max macros of windows and the limits max win32:DEFINES += NOMINMAX -unix{ - QMAKE_CC = gcc - QMAKE_CXX = g++ - QMAKE_LINK = gcc - CONFIG += warn_off debug_and_release -} - contains(TEMPLATE,lib) { CONFIG(debug, debug|release) { unix:TARGET = $$member(TARGET, 0)_debug