win32: added WIN32_LIB_ROOT to project file

pull/1/head
Thorsten Liebig 2012-02-10 12:05:05 +01:00
parent 82533bc84e
commit addb226dd4
1 changed files with 24 additions and 22 deletions

View File

@ -27,25 +27,27 @@ CONFIG += debug_and_release
# CONFIG SECTION # CONFIG SECTION
############################################################################### ###############################################################################
WIN32_LIB_ROOT = ..
win32 { win32 {
QMAKE_CXXFLAGS += -DH5_USE_16_API QMAKE_CXXFLAGS += -DH5_USE_16_API
INCLUDEPATH += ../hdf5/include ../hdf5/include/cpp ../boost/include/boost-1_42 INCLUDEPATH += $$WIN32_LIB_ROOT/hdf5/include $$WIN32_LIB_ROOT/hdf5/include/cpp $$WIN32_LIB_ROOT/boost/include/boost-1_42
LIBS += ../hdf5/lib/hdf5.lib LIBS += $$WIN32_LIB_ROOT/hdf5/lib/hdf5.lib
LIBS += ../boost/lib/libboost_thread-mgw44-mt.lib LIBS += $$WIN32_LIB_ROOT/boost/lib/libboost_thread-mgw44-mt.lib
LIBS += -L../CSXCAD/release LIBS += -L../CSXCAD/release
LIBS += ../fparser/release/libfparser4.a LIBS += ../fparser/release/libfparser4.a
LIBS += ../tinyxml/release/libtinyxml2.a LIBS += ../tinyxml/release/libtinyxml2.a
### vtk ### ### vtk ###
INCLUDEPATH += ..\vtk \ INCLUDEPATH += $$WIN32_LIB_ROOT\vtk \
..\vtk\Common \ $$WIN32_LIB_ROOT\vtk\Common \
..\vtk\Filtering \ $$WIN32_LIB_ROOT\vtk\Filtering \
..\vtk\IO $$WIN32_LIB_ROOT\vtk\IO
LIBS += ..\vtk\bin\libvtkIO.dll \ LIBS += $$WIN32_LIB_ROOT\vtk\bin\libvtkIO.dll \
..\vtk\bin\libvtkFiltering.dll \ $$WIN32_LIB_ROOT\vtk\bin\libvtkFiltering.dll \
..\vtk\bin\libvtkCommon.dll \ $$WIN32_LIB_ROOT\vtk\bin\libvtkCommon.dll \
..\vtk\bin\libvtksys.dll \ $$WIN32_LIB_ROOT\vtk\bin\libvtksys.dll \
..\vtk\bin\libvtkzlib.dll $$WIN32_LIB_ROOT\vtk\bin\libvtkzlib.dll
} }
!win32 { !win32 {
LIBS += ../fparser/libfparser.so LIBS += ../fparser/libfparser.so
@ -243,12 +245,12 @@ bits64 {
LIBS = ../CSXCAD/ABI2-64/libCSXCAD.so LIBS = ../CSXCAD/ABI2-64/libCSXCAD.so
LIBS += ../fparser/ABI2-64/libfparser.so LIBS += ../fparser/ABI2-64/libfparser.so
LIBS += ../tinyxml/ABI2-64/libtinyxml.so LIBS += ../tinyxml/ABI2-64/libtinyxml.so
LIBS += ../boost-64/lib/libboost_thread.so LIBS += $$WIN32_LIB_ROOT/boost-64/lib/libboost_thread.so
LIBS += ../hdf5-64/lib/libhdf5.so LIBS += $$WIN32_LIB_ROOT/hdf5-64/lib/libhdf5.so
LIBS += ../hdf5-64/lib/libhdf5_cpp.so \ LIBS += $$WIN32_LIB_ROOT/hdf5-64/lib/libhdf5_cpp.so \
-lpthread -lpthread
INCLUDEPATH += ../hdf5-64/include INCLUDEPATH += $$WIN32_LIB_ROOT/hdf5-64/include
INCLUDEPATH += ../boost-64/include INCLUDEPATH += $$WIN32_LIB_ROOT/boost-64/include
} }
bits32 { bits32 {
QMAKE_CXXFLAGS_RELEASE += -m32 \ QMAKE_CXXFLAGS_RELEASE += -m32 \
@ -259,11 +261,11 @@ bits32 {
LIBS = ../CSXCAD/ABI2-32/libCSXCAD.so LIBS = ../CSXCAD/ABI2-32/libCSXCAD.so
LIBS += ../fparser/ABI2-32/libfparser.so LIBS += ../fparser/ABI2-32/libfparser.so
LIBS += ../tinyxml/ABI2-32/libtinyxml.so LIBS += ../tinyxml/ABI2-32/libtinyxml.so
LIBS += ../boost-32/lib/libboost_thread.so LIBS += $$WIN32_LIB_ROOT/boost-32/lib/libboost_thread.so
LIBS += ../hdf5-32/lib/libhdf5.so LIBS += $$WIN32_LIB_ROOT/hdf5-32/lib/libhdf5.so
LIBS += ../hdf5-32/lib/libhdf5_cpp.so LIBS += $$WIN32_LIB_ROOT/hdf5-32/lib/libhdf5_cpp.so
INCLUDEPATH += ../hdf5-32/include INCLUDEPATH += $$WIN32_LIB_ROOT/hdf5-32/include
INCLUDEPATH += ../boost-32/include INCLUDEPATH += $$WIN32_LIB_ROOT/boost-32/include
} }
ABI2 { ABI2 {
DESTDIR = $$OBJECTS_DIR DESTDIR = $$OBJECTS_DIR