From 904d6fa9fcab4a6bd9dc1320b0ca7d660bbc6644 Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia granzuglia Date: Mon, 3 May 2010 08:10:00 +0000 Subject: [PATCH] replaced unix token with pair linux-g++-32, linux-g++-64 in order to avoid conflict with mac os. --- src/common/common.pro | 6 ++++-- src/external/bzip2-1.0.5/bzip2-1.0.5.pro | 3 ++- src/external/levmar-2.3/levmar-2.3.pro | 3 ++- src/external/lib3ds-1.3.0/lib3ds/lib3ds.pro | 3 ++- src/external/muparser_v130/src/src.pro | 3 ++- src/meshlab/meshlab.pro | 6 ++++-- src/meshlabplugins/io_epoch/io_epoch.pro | 6 ++++-- src/meshlabserver/meshlabserver.pro | 7 ++++--- src/shared.pri | 3 ++- 9 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/common/common.pro b/src/common/common.pro index d389e9840..81fbfacd5 100644 --- a/src/common/common.pro +++ b/src/common/common.pro @@ -13,7 +13,8 @@ win32-g++:DLLDESTDIR = ../distrib # win32-msvc2008:DESTDIR = ./release # win32-g++:DLLDESTDIR = ./release # } -unix:DLLDESTDIR = ../distrib +linux-g++-32:DLLDESTDIR = ../distrib +linux-g++-64:DLLDESTDIR = ../distrib mac:DLLDESTDIR = . macx:QMAKE_POST_LINK = "cp libcommon.*dylib ../distrib/meshlab.app/Contents/MacOs/" INCLUDEPATH *= ../.. \ @@ -22,7 +23,8 @@ INCLUDEPATH *= ../.. \ TEMPLATE = lib win32-g++:CONFIG += dll macx-g++:CONFIG += dll -unix:CONFIG += dll +linux-g++-32:CONFIG += dll +linux-g++-64:CONFIG += dll win32-msvc2005:CONFIG += staticlib win32-msvc2008:CONFIG += staticlib diff --git a/src/external/bzip2-1.0.5/bzip2-1.0.5.pro b/src/external/bzip2-1.0.5/bzip2-1.0.5.pro index 5df587f54..795ee0a52 100644 --- a/src/external/bzip2-1.0.5/bzip2-1.0.5.pro +++ b/src/external/bzip2-1.0.5/bzip2-1.0.5.pro @@ -13,7 +13,8 @@ macx:DESTDIR = ../lib/macx win32-g++:DESTDIR = ../lib/win32-gcc win32-msvc2005:DESTDIR = ../lib/win32-msvc2005 win32-msvc2008:DESTDIR = ../lib/win32-msvc2008 -unix:DESTDIR = ../lib/unix +linux-g++-32:DESTDIR = ../lib/linux-g++-32 +linux-g++-64:DESTDIR = ../lib/linux-g++-64 # Input diff --git a/src/external/levmar-2.3/levmar-2.3.pro b/src/external/levmar-2.3/levmar-2.3.pro index a9c532da9..7139fc883 100644 --- a/src/external/levmar-2.3/levmar-2.3.pro +++ b/src/external/levmar-2.3/levmar-2.3.pro @@ -8,7 +8,8 @@ macx:DESTDIR = ../lib/macx win32-g++:DESTDIR = ../lib/win32-gcc win32-msvc2005:DESTDIR = ../lib/win32-msvc2005 win32-msvc2008:DESTDIR = ../lib/win32-msvc2008 -unix:DESTDIR = ../lib/unix +linux-g++-32:DESTDIR = ../lib/linux-g++-32 +linux-g++-64:DESTDIR = ../lib/linux-g++-64 # Input HEADERS += compiler.h \ diff --git a/src/external/lib3ds-1.3.0/lib3ds/lib3ds.pro b/src/external/lib3ds-1.3.0/lib3ds/lib3ds.pro index 220114f66..159a2871c 100644 --- a/src/external/lib3ds-1.3.0/lib3ds/lib3ds.pro +++ b/src/external/lib3ds-1.3.0/lib3ds/lib3ds.pro @@ -13,7 +13,8 @@ macx:DESTDIR = ../../lib/macx win32-g++:DESTDIR = ../../lib/win32-gcc win32-msvc2005:DESTDIR = ../../lib/win32-msvc2005 win32-msvc2008:DESTDIR = ../../lib/win32-msvc2008 -unix:DESTDIR = ../../lib/unix +linux-g++-32:DESTDIR = ../../lib/linux-g++-32 +linux-g++-64:DESTDIR = ../../lib/linux-g++-64 # Input diff --git a/src/external/muparser_v130/src/src.pro b/src/external/muparser_v130/src/src.pro index 02d4ad18d..aab7678ee 100644 --- a/src/external/muparser_v130/src/src.pro +++ b/src/external/muparser_v130/src/src.pro @@ -12,7 +12,8 @@ macx:DESTDIR = ../../lib/macx win32-g++:DESTDIR = ../../lib/win32-gcc win32-msvc2005:DESTDIR = ../../lib/win32-msvc2005 win32-msvc2008:DESTDIR = ../../lib/win32-msvc2008 -unix:DESTDIR = ../../lib/unix +linux-g++-32:DESTDIR = ../../lib/linux-g++-32 +linux-g++-64:DESTDIR = ../../lib/linux-g++-64 # Input SOURCES += muParser.cpp \ diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index b1b709400..299e7ad61 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -107,8 +107,10 @@ win32-g++:LIBS += -L../distrib -lcommon # win32-g++:release:LIBS += -L../common/release -lcommon #} -unix:!mac:LIBS += -L../distrib -lcommon -unix:!mac:QMAKE_RPATHDIR += ../distrib +linux-g++-32:LIBS += -L../distrib -lcommon +linux-g++-32:QMAKE_RPATHDIR += ../distrib +linux-g++-64:LIBS += -L../distrib -lcommon +linux-g++-64:QMAKE_RPATHDIR += ../distrib # uncomment in your local copy only in emergency cases. diff --git a/src/meshlabplugins/io_epoch/io_epoch.pro b/src/meshlabplugins/io_epoch/io_epoch.pro index 2ddff0124..06c96dc9e 100644 --- a/src/meshlabplugins/io_epoch/io_epoch.pro +++ b/src/meshlabplugins/io_epoch/io_epoch.pro @@ -30,12 +30,14 @@ QT += xml win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a -unix:LIBS += ../../external/lib/unix/libbz2.a +linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a +linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5 win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5 win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 -unix:INCLUDEPATH += ../../external/bzip2-1.0.5 +linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5 +linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5 mac:LIBS += -lbz2 diff --git a/src/meshlabserver/meshlabserver.pro b/src/meshlabserver/meshlabserver.pro index eb2d9d151..54f507e2f 100644 --- a/src/meshlabserver/meshlabserver.pro +++ b/src/meshlabserver/meshlabserver.pro @@ -21,9 +21,10 @@ mac:LIBS += ../distrib/meshlab.app/Contents/MacOS/libcommon.dylib win32-msvc2005: LIBS += -L../distrib -lcommon win32-msvc2008: LIBS += -L../distrib -lcommon win32-g++: LIBS += -L../distrib -lcommon -unix: LIBS += -L../distrib -lcommon -unix:QMAKE_RPATHDIR += ../distrib - +linux-g++-32: LIBS += -L../distrib -lcommon +linux-g++-32:QMAKE_RPATHDIR += ../distrib +linux-g++-64: LIBS += -L../distrib -lcommon +linux-g++-64:QMAKE_RPATHDIR += ../distrib #CONFIG (release,debug | release) { # win32-msvc2005:release: LIBS += -L../common/release -lcommon # win32-msvc2008:release: LIBS += -L../common/release -lcommon diff --git a/src/shared.pri b/src/shared.pri index d217ca592..3fee25268 100644 --- a/src/shared.pri +++ b/src/shared.pri @@ -15,7 +15,8 @@ mac:LIBS += ../../common/libcommon.dylib win32-msvc2005: LIBS += ../../distrib/common.lib win32-msvc2008: LIBS += ../../distrib/common.lib win32-g++:LIBS += -L../../distrib -lcommon -unix:!mac:LIBS += -L../../distrib -lcommon +linux-g++-32:LIBS += -L../../distrib -lcommon +linux-g++-64:LIBS += -L../../distrib -lcommon #CONFIG(debug, debug|release) { # win32-msvc2005: LIBS += ../../common/debug/common.lib