pro-file: Linux & win32 fixes
This commit is contained in:
parent
97311fc1a3
commit
ec1f3ec387
14
openEMS.pro
14
openEMS.pro
@ -6,7 +6,6 @@ CONFIG -= app_bundle qt
|
|||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
OBJECTS_DIR = obj
|
OBJECTS_DIR = obj
|
||||||
INCLUDEPATH += .
|
INCLUDEPATH += .
|
||||||
INCLUDEPATH += ../CSXCAD
|
|
||||||
CONFIG += debug_and_release
|
CONFIG += debug_and_release
|
||||||
|
|
||||||
|
|
||||||
@ -35,11 +34,13 @@ win32 {
|
|||||||
WIN32_LIB_ROOT = ..
|
WIN32_LIB_ROOT = ..
|
||||||
# tinyxml
|
# tinyxml
|
||||||
INCLUDEPATH += $$WIN32_LIB_ROOT/tinyxml
|
INCLUDEPATH += $$WIN32_LIB_ROOT/tinyxml
|
||||||
LIBS += -L../tinyxml/release -ltinyxml2
|
LIBS += -L$$WIN32_LIB_ROOT/tinyxml/release -ltinyxml2
|
||||||
# fparser
|
# fparser
|
||||||
LIBS += -L../fparser/release -lfparser4
|
INCLUDEPATH += $$WIN32_LIB_ROOT/fparser
|
||||||
|
LIBS += -L$$WIN32_LIB_ROOT/fparser/release -lfparser4
|
||||||
# CSXCAD
|
# CSXCAD
|
||||||
LIBS += -L../CSXCAD/release -lCSXCAD0
|
INCLUDEPATH += $$WIN32_LIB_ROOT/CSXCAD
|
||||||
|
LIBS += -L$$WIN32_LIB_ROOT/CSXCAD/release -lCSXCAD0
|
||||||
# hdf5
|
# hdf5
|
||||||
INCLUDEPATH += $$WIN32_LIB_ROOT/hdf5/include $$WIN32_LIB_ROOT/hdf5/include/cpp
|
INCLUDEPATH += $$WIN32_LIB_ROOT/hdf5/include $$WIN32_LIB_ROOT/hdf5/include/cpp
|
||||||
LIBS += -L$$WIN32_LIB_ROOT/hdf5/lib -lhdf5
|
LIBS += -L$$WIN32_LIB_ROOT/hdf5/lib -lhdf5
|
||||||
@ -57,9 +58,11 @@ win32 {
|
|||||||
!win32 {
|
!win32 {
|
||||||
LIBS += -lfparser
|
LIBS += -lfparser
|
||||||
LIBS += -ltinyxml
|
LIBS += -ltinyxml
|
||||||
LIBS += -L../CSXCAD -lCSXCAD
|
|
||||||
LIBS += -lboost_thread-mt
|
LIBS += -lboost_thread-mt
|
||||||
LIBS += -lhdf5 -lhdf5_cpp
|
LIBS += -lhdf5 -lhdf5_cpp
|
||||||
|
# CSXCAD
|
||||||
|
INCLUDEPATH += ../CSXCAD
|
||||||
|
LIBS += -L../CSXCAD -lCSXCAD
|
||||||
### vtk ###
|
### vtk ###
|
||||||
INCLUDEPATH += /usr/include/vtk-5.2 \
|
INCLUDEPATH += /usr/include/vtk-5.2 \
|
||||||
/usr/include/vtk-5.4 \
|
/usr/include/vtk-5.4 \
|
||||||
@ -67,7 +70,6 @@ win32 {
|
|||||||
/usr/include/vtk-5.8 \
|
/usr/include/vtk-5.8 \
|
||||||
/usr/include/vtk-5.10 \
|
/usr/include/vtk-5.10 \
|
||||||
/usr/include/vtk
|
/usr/include/vtk
|
||||||
INCLUDEPATH += /usr/include/CSXCAD
|
|
||||||
LIBS += -lvtkCommon \
|
LIBS += -lvtkCommon \
|
||||||
-lvtkIO \
|
-lvtkIO \
|
||||||
-lvtksys \
|
-lvtksys \
|
||||||
|
Loading…
Reference in New Issue
Block a user