diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index e5c2442b7..fd36418f3 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -82,8 +82,9 @@ CONFIG(debug, debug|release) { win32-g++:release:DEFINES -= NDEBUG } -macx{ +mac{ message( "We are on a mac: build universal binaries" ) -#CONFIG += ppc +CONFIG += x86 ppc } + diff --git a/src/meshlabplugins/baseio/baseio.pro b/src/meshlabplugins/baseio/baseio.pro index d0feff337..87cd11bcc 100644 --- a/src/meshlabplugins/baseio/baseio.pro +++ b/src/meshlabplugins/baseio/baseio.pro @@ -23,3 +23,5 @@ contains(TEMPLATE,lib) { else:TARGET = $$member(TARGET, 0)d } } + +mac:CONFIG += x86 ppc diff --git a/src/meshlabplugins/cleanfilter/cleanfilter.pro b/src/meshlabplugins/cleanfilter/cleanfilter.pro index c48d83698..758ef420c 100644 --- a/src/meshlabplugins/cleanfilter/cleanfilter.pro +++ b/src/meshlabplugins/cleanfilter/cleanfilter.pro @@ -14,6 +14,7 @@ CONFIG += debug_and_release # the following line is needed to avoid mismatch between # the awful min/max macros of windows and the limits max win32:DEFINES += NOMINMAX +mac:CONFIG += x86 ppc contains(TEMPLATE,lib) { diff --git a/src/meshlabplugins/colladaio/colladaio.pro b/src/meshlabplugins/colladaio/colladaio.pro index 7014dabd8..6a24421bb 100644 --- a/src/meshlabplugins/colladaio/colladaio.pro +++ b/src/meshlabplugins/colladaio/colladaio.pro @@ -6,6 +6,7 @@ SOURCES = colladaio.cpp TARGET = colladaio DESTDIR = ../../meshlab/plugins CONFIG += debug_and_release +mac:CONFIG += x86 ppc win32-msvc.net:LIBS -= LIBCMTD.lib diff --git a/src/meshlabplugins/editpaint/editpaint.pro b/src/meshlabplugins/editpaint/editpaint.pro index c2cafdbeb..8983e957c 100755 --- a/src/meshlabplugins/editpaint/editpaint.pro +++ b/src/meshlabplugins/editpaint/editpaint.pro @@ -13,6 +13,7 @@ DEFINES += GLEW_STATIC QT += opengl RESOURCES = meshlab.qrc CONFIG += debug_and_release +mac:CONFIG += x86 ppc contains(TEMPLATE,lib){ CONFIG(debug, debug|release){ diff --git a/src/meshlabplugins/epoch_io/epoch_io.pro b/src/meshlabplugins/epoch_io/epoch_io.pro index 6e1980473..b04cf342e 100644 --- a/src/meshlabplugins/epoch_io/epoch_io.pro +++ b/src/meshlabplugins/epoch_io/epoch_io.pro @@ -26,6 +26,7 @@ TARGET = epoch_io DESTDIR = ../../meshlab/plugins QT += xml CONFIG += debug_and_release +mac:CONFIG += x86 ppc win32-msvc.net:LIBS += ../../../../code/lib/bzip2-1.0.3/libbz2.lib win32-msvc2005:LIBS += ../../../../code/lib/bzip2-1.0.3/libbz2.lib diff --git a/src/meshlabplugins/filtergeom/filtergeom.pro b/src/meshlabplugins/filtergeom/filtergeom.pro index 5361e26c4..e09170a02 100644 --- a/src/meshlabplugins/filtergeom/filtergeom.pro +++ b/src/meshlabplugins/filtergeom/filtergeom.pro @@ -11,6 +11,7 @@ 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 +mac:CONFIG += x86 ppc contains(TEMPLATE,lib) { CONFIG(debug, debug|release) { diff --git a/src/meshlabplugins/meshcolorize/meshcolorize.pro b/src/meshlabplugins/meshcolorize/meshcolorize.pro index bca87dae1..49c11cb58 100644 --- a/src/meshlabplugins/meshcolorize/meshcolorize.pro +++ b/src/meshlabplugins/meshcolorize/meshcolorize.pro @@ -11,6 +11,7 @@ DESTDIR = ../../meshlab/plugins win32:DEFINES += NOMINMAX FORMS = equalizerDialog.ui CONFIG += debug_and_release +mac:CONFIG += x86 ppc contains(TEMPLATE,lib) { diff --git a/src/meshlabplugins/meshdecorate/meshdecorate.pro b/src/meshlabplugins/meshdecorate/meshdecorate.pro index 5a30ea1f5..13eda242d 100644 --- a/src/meshlabplugins/meshdecorate/meshdecorate.pro +++ b/src/meshlabplugins/meshdecorate/meshdecorate.pro @@ -9,6 +9,7 @@ DESTDIR = ../../meshlab/plugins # the awful min/max macros of windows and the limits max win32:DEFINES += NOMINMAX CONFIG += debug_and_release +mac:CONFIG += x86 ppc contains(TEMPLATE,lib) { diff --git a/src/meshlabplugins/meshedit/meshedit.pro b/src/meshlabplugins/meshedit/meshedit.pro index 2cca37d33..c5d6802e3 100644 --- a/src/meshlabplugins/meshedit/meshedit.pro +++ b/src/meshlabplugins/meshedit/meshedit.pro @@ -13,6 +13,7 @@ RESOURCES = meshlab.qrc # the awful min/max macros of windows and the limits max win32:DEFINES += NOMINMAX CONFIG += debug_and_release +mac:CONFIG += x86 ppc contains(TEMPLATE,lib) { CONFIG(debug, debug|release) { diff --git a/src/meshlabplugins/meshfilter/meshfilter.pro b/src/meshlabplugins/meshfilter/meshfilter.pro index e783abd30..f7f8ace05 100644 --- a/src/meshlabplugins/meshfilter/meshfilter.pro +++ b/src/meshlabplugins/meshfilter/meshfilter.pro @@ -21,6 +21,7 @@ win32:DEFINES += NOMINMAX # all dialog are stored in meshlab/ui directory FORMS = ui/transformDialog.ui ../../meshlab/ui/genericELDialog.ui CONFIG += debug_and_release +mac:CONFIG += x86 ppc QT += opengl diff --git a/src/meshlabplugins/meshio/meshio.pro b/src/meshlabplugins/meshio/meshio.pro index 61b3cb088..85d9fd84b 100644 --- a/src/meshlabplugins/meshio/meshio.pro +++ b/src/meshlabplugins/meshio/meshio.pro @@ -23,6 +23,7 @@ mac:INCLUDEPATH += ../../../../code/lib/lib3ds-1.2.0 win32-g++:INCLUDEPATH += ../../../../code/lib/lib3ds-1.2.0 CONFIG += debug_and_release +mac:CONFIG += x86 ppc unix{ CONFIG += warn_off debug_and_release diff --git a/src/meshlabplugins/meshrender/meshrender.pro b/src/meshlabplugins/meshrender/meshrender.pro index e5bc3e275..2324fc8c2 100644 --- a/src/meshlabplugins/meshrender/meshrender.pro +++ b/src/meshlabplugins/meshrender/meshrender.pro @@ -14,6 +14,7 @@ win32:DEFINES += NOMINMAX FORMS = shaderDialog.ui DEFINES += GLEW_STATIC CONFIG += debug_and_release +mac:CONFIG += x86 ppc contains(TEMPLATE,lib) { diff --git a/src/meshlabplugins/meshselect/meshselect.pro b/src/meshlabplugins/meshselect/meshselect.pro index dd9c003ad..1c4f33ca0 100644 --- a/src/meshlabplugins/meshselect/meshselect.pro +++ b/src/meshlabplugins/meshselect/meshselect.pro @@ -11,6 +11,7 @@ RESOURCES = meshlab.qrc # the awful min/max macros of windows and the limits max win32:DEFINES += NOMINMAX CONFIG += debug_and_release +mac:CONFIG += x86 ppc contains(TEMPLATE,lib) { CONFIG(debug, debug|release) { diff --git a/src/meshlabplugins/sampleplugins/samplefilter.pro b/src/meshlabplugins/sampleplugins/samplefilter.pro index c87ea87f7..9e1ee0fa1 100644 --- a/src/meshlabplugins/sampleplugins/samplefilter.pro +++ b/src/meshlabplugins/sampleplugins/samplefilter.pro @@ -10,6 +10,7 @@ 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 +mac:CONFIG += x86 ppc contains(TEMPLATE,lib) { CONFIG(debug, debug|release) {