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

revision of win build system 

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
pull/1/head
Thorsten Liebig 2012-09-14 15:14:26 +02:00
parent 3dd48d8cf9
commit 3f5e22b7f0
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nf2ff/nf2ff.pro
View File

@ -10,18 +10,19 @@ win32 {
WIN32_LIB_ROOT = ../.. WIN32_LIB_ROOT = ../..
# #3rd party libraries#
# tinyxml # tinyxml
INCLUDEPATH += $$WIN32_LIB_ROOT/tinyxml INCLUDEPATH += $$WIN32_LIB_ROOT/tinyxml/include
LIBS += -L$$WIN32_LIB_ROOT/tinyxml/release -ltinyxml2 LIBS += -L$$WIN32_LIB_ROOT/tinyxml/bin -ltinyxml2
# hdf5 # hdf5
INCLUDEPATH += $$WIN32_LIB_ROOT/hdf5/include $$WIN32_LIB_ROOT/hdf5/include/cpp INCLUDEPATH += $$WIN32_LIB_ROOT/hdf5/include
LIBS += -L$$WIN32_LIB_ROOT/hdf5/lib -lhdf5 LIBS += -L$$WIN32_LIB_ROOT/hdf5/lib -lhdf5
# boost # boost
DEFINES += BOOST_THREAD_USE_LIB DEFINES += BOOST_THREAD_USE_LIB
INCLUDEPATH += $$WIN32_LIB_ROOT/boost/include INCLUDEPATH += $$WIN32_LIB_ROOT/boost/include
LIBS += $$WIN32_LIB_ROOT/boost/lib/libboost_thread-mgw44-mt.lib LIBS += -L$$WIN32_LIB_ROOT/boost/lib -lboost_thread -lboost_chrono -lboost_system
} }
!win32 { !win32 {
LIBS += -lboost_thread-mt LIBS += -lboost_thread-mt

21
openEMS.pro
View File

@ -32,27 +32,26 @@ VERSION=0.0.28
win32 { win32 {
CONFIG += console CONFIG += console
WIN32_LIB_ROOT = .. WIN32_LIB_ROOT = ..
# tinyxml
INCLUDEPATH += $$WIN32_LIB_ROOT/tinyxml
LIBS += -L$$WIN32_LIB_ROOT/tinyxml/release -ltinyxml2
# fparser
INCLUDEPATH += $$WIN32_LIB_ROOT/fparser
LIBS += -L$$WIN32_LIB_ROOT/fparser/release -lfparser4
# CSXCAD # CSXCAD
INCLUDEPATH += $$WIN32_LIB_ROOT/CSXCAD INCLUDEPATH += $$WIN32_LIB_ROOT/CSXCAD
LIBS += -L$$WIN32_LIB_ROOT/CSXCAD/release -lCSXCAD0 LIBS += -L$$WIN32_LIB_ROOT/CSXCAD/release -lCSXCAD0
# #3rd party libraries#
# tinyxml
INCLUDEPATH += $$WIN32_LIB_ROOT/tinyxml/include
LIBS += -L$$WIN32_LIB_ROOT/tinyxml/bin -ltinyxml2
# fparser
INCLUDEPATH += $$WIN32_LIB_ROOT/fparser/include
LIBS += -L$$WIN32_LIB_ROOT/fparser/bin -lfparser4
# 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
# boost # boost
DEFINES += BOOST_THREAD_USE_LIB DEFINES += BOOST_THREAD_USE_LIB
INCLUDEPATH += $$WIN32_LIB_ROOT/boost/include INCLUDEPATH += $$WIN32_LIB_ROOT/boost/include
LIBS += $$WIN32_LIB_ROOT/boost/lib/libboost_thread-mgw44-mt.lib LIBS += -L$$WIN32_LIB_ROOT/boost/lib -lboost_thread -lboost_chrono -lboost_system
# vtk # vtk
INCLUDEPATH += $$WIN32_LIB_ROOT/vtk \ INCLUDEPATH += $$WIN32_LIB_ROOT/vtk/include/vtk-5.10
$$WIN32_LIB_ROOT/vtk/Common \
$$WIN32_LIB_ROOT/vtk/Filtering \
$$WIN32_LIB_ROOT/vtk/IO
LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering
} }
!win32 { !win32 {