Added universal binary support for mac compiling

This commit is contained in:
Paolo Cignoni cignoni 2007-04-20 08:30:41 +00:00
parent 9e4e842737
commit 63edd09888
15 changed files with 18 additions and 2 deletions

View File

@ -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
}

View File

@ -23,3 +23,5 @@ contains(TEMPLATE,lib) {
else:TARGET = $$member(TARGET, 0)d
}
}
mac:CONFIG += x86 ppc

View File

@ -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) {

View File

@ -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

View File

@ -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){

View File

@ -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

View File

@ -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) {

View File

@ -11,6 +11,7 @@ DESTDIR = ../../meshlab/plugins
win32:DEFINES += NOMINMAX
FORMS = equalizerDialog.ui
CONFIG += debug_and_release
mac:CONFIG += x86 ppc
contains(TEMPLATE,lib) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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

View File

@ -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

View File

@ -14,6 +14,7 @@ win32:DEFINES += NOMINMAX
FORMS = shaderDialog.ui
DEFINES += GLEW_STATIC
CONFIG += debug_and_release
mac:CONFIG += x86 ppc
contains(TEMPLATE,lib) {

View File

@ -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) {

View File

@ -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) {