compile fix for >=Qt-4.8.3
Qt-4.8.3 removed the flags -frtti and -fexceptions from the standard configuration. We now explicitly request RTTI and exceptions.pull/1/head
parent
384cfe5677
commit
25e7cb2b20
|
@ -3,6 +3,7 @@
|
||||||
# -------------------------------------------------
|
# -------------------------------------------------
|
||||||
TARGET = openEMS
|
TARGET = openEMS
|
||||||
CONFIG -= app_bundle qt
|
CONFIG -= app_bundle qt
|
||||||
|
CONFIG += rtti exceptions
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
OBJECTS_DIR = obj
|
OBJECTS_DIR = obj
|
||||||
INCLUDEPATH += .
|
INCLUDEPATH += .
|
||||||
|
@ -40,6 +41,7 @@ win32 {
|
||||||
# tinyxml
|
# tinyxml
|
||||||
INCLUDEPATH += $$WIN32_LIB_ROOT/tinyxml/include
|
INCLUDEPATH += $$WIN32_LIB_ROOT/tinyxml/include
|
||||||
LIBS += -L$$WIN32_LIB_ROOT/tinyxml/bin -ltinyxml2
|
LIBS += -L$$WIN32_LIB_ROOT/tinyxml/bin -ltinyxml2
|
||||||
|
DEFINES += TIXML_USE_STL
|
||||||
# fparser
|
# fparser
|
||||||
INCLUDEPATH += $$WIN32_LIB_ROOT/fparser/include
|
INCLUDEPATH += $$WIN32_LIB_ROOT/fparser/include
|
||||||
LIBS += -L$$WIN32_LIB_ROOT/fparser/bin -lfparser4
|
LIBS += -L$$WIN32_LIB_ROOT/fparser/bin -lfparser4
|
||||||
|
@ -49,7 +51,7 @@ win32 {
|
||||||
# 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 += -L$$WIN32_LIB_ROOT/boost/lib -lboost_thread -lboost_chrono -lboost_system
|
LIBS += -L$$WIN32_LIB_ROOT/boost/lib -lboost_thread
|
||||||
# vtk
|
# vtk
|
||||||
INCLUDEPATH += $$WIN32_LIB_ROOT/vtk/include/vtk-5.10
|
INCLUDEPATH += $$WIN32_LIB_ROOT/vtk/include/vtk-5.10
|
||||||
LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering
|
LIBS += -L$$WIN32_LIB_ROOT/vtk/bin -lvtkCommon -lvtkIO -lvtkFiltering
|
||||||
|
@ -57,6 +59,7 @@ win32 {
|
||||||
!win32 {
|
!win32 {
|
||||||
LIBS += -lfparser
|
LIBS += -lfparser
|
||||||
LIBS += -ltinyxml
|
LIBS += -ltinyxml
|
||||||
|
DEFINES += TIXML_USE_STL
|
||||||
LIBS += -lboost_thread-mt
|
LIBS += -lboost_thread-mt
|
||||||
LIBS += -lhdf5 -lhdf5_cpp
|
LIBS += -lhdf5 -lhdf5_cpp
|
||||||
# CSXCAD
|
# CSXCAD
|
||||||
|
|
Loading…
Reference in New Issue