zcy
/
openEMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux: use upstream fparser library

pull/1/head
Thorsten Liebig 2012-08-01 13:54:29 +02:00
parent 4f53cb65fd
commit 6222d1299e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openEMS.pro
View File

@ -6,7 +6,7 @@ CONFIG -= app_bundle qt
TEMPLATE = app TEMPLATE = app
OBJECTS_DIR = obj OBJECTS_DIR = obj
INCLUDEPATH += . INCLUDEPATH += .
INCLUDEPATH += ../CSXCAD ../fparser INCLUDEPATH += ../CSXCAD
CONFIG += debug_and_release CONFIG += debug_and_release
@ -55,7 +55,7 @@ win32 {
LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering
} }
!win32 { !win32 {
LIBS += -L../fparser -lfparser LIBS += -lfparser
LIBS += -ltinyxml LIBS += -ltinyxml
LIBS += -L../CSXCAD -lCSXCAD LIBS += -L../CSXCAD -lCSXCAD
LIBS += -lboost_thread-mt LIBS += -lboost_thread-mt
@ -73,7 +73,6 @@ win32 {
-lvtksys \ -lvtksys \
-lvtkFiltering -lvtkFiltering
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\' QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\'
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../fparser\'
} }
# vtk includes deprecated header files; silence the corresponding warning # vtk includes deprecated header files; silence the corresponding warning