lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-19 19:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

replaced unix token with pair linux-g++-32, linux-g++-64 in order to avoid conflict with mac os.

Browse Source
This commit is contained in:
Guido Ranzuglia granzuglia 2010-05-03 08:10:00 +00:00
parent 9f653204a9
commit 904d6fa9fc
9 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/common.pro
View File

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

3
src/external/bzip2-1.0.5/bzip2-1.0.5.pro vendored
View File

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

3
src/external/levmar-2.3/levmar-2.3.pro vendored
View File

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

3
src/external/lib3ds-1.3.0/lib3ds/lib3ds.pro vendored
View File

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

3
src/external/muparser_v130/src/src.pro vendored
View File

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

6
src/meshlab/meshlab.pro
View File

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

6
src/meshlabplugins/io_epoch/io_epoch.pro
View File

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

7
src/meshlabserver/meshlabserver.pro
View File

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

3
src/shared.pri
View File

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