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

use upstream tinyxml

Browse Source
This commit is contained in:
Thorsten Liebig 2012-04-11 11:43:30 +02:00
parent 3fdaa90e68
commit 0ef64998e4
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nf2ff/nf2ff.pro
View File

@ -1,7 +1,6 @@
CONFIG -= app_bundle qt CONFIG -= app_bundle qt
TEMPLATE = app TEMPLATE = app
OBJECTS_DIR = obj OBJECTS_DIR = obj
INCLUDEPATH += ../../tinyxml
CONFIG += debug_and_release CONFIG += debug_and_release
win32 { win32 {
@ -14,9 +13,8 @@ win32 {
!win32 { !win32 {
LIBS += -lboost_thread-mt LIBS += -lboost_thread-mt
LIBS += -lhdf5 LIBS += -lhdf5
LIBS += -L../tinyxml -ltinyxml LIBS += -ltinyxml
} }
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../../tinyxml\'
# hdf5 compat # hdf5 compat
DEFINES += H5_USE_16_API DEFINES += H5_USE_16_API

6
openEMS.pro
View File

@ -6,8 +6,7 @@ CONFIG -= app_bundle qt
TEMPLATE = app TEMPLATE = app
OBJECTS_DIR = obj OBJECTS_DIR = obj
INCLUDEPATH += ../CSXCAD \ INCLUDEPATH += ../CSXCAD \
../fparser \ ../fparser
../tinyxml
LIBS += -L../CSXCAD -lCSXCAD LIBS += -L../CSXCAD -lCSXCAD
CONFIG += debug_and_release CONFIG += debug_and_release
@ -56,7 +55,7 @@ win32 {
} }
!win32 { !win32 {
LIBS += -L../fparser -lfparser LIBS += -L../fparser -lfparser
LIBS += -L../tinyxml -ltinyxml LIBS += -ltinyxml
LIBS += -lboost_thread-mt LIBS += -lboost_thread-mt
LIBS += -lhdf5 -lhdf5_cpp LIBS += -lhdf5 -lhdf5_cpp
### vtk ### ### vtk ###
@ -73,7 +72,6 @@ win32 {
} }
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\' QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../CSXCAD\'
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../fparser\' QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../fparser\'
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../tinyxml\'
# hdf5 compat # hdf5 compat
DEFINES += H5_USE_16_API DEFINES += H5_USE_16_API