win32 compile fixes
This commit is contained in:
parent
b296c441f9
commit
4fcee4588f
@ -26,6 +26,12 @@
|
|||||||
#include <boost/fusion/container/list/list_fwd.hpp>
|
#include <boost/fusion/container/list/list_fwd.hpp>
|
||||||
#include <boost/fusion/include/list_fwd.hpp>
|
#include <boost/fusion/include/list_fwd.hpp>
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
#include <Winsock2.h> // for struct timeval
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <sys/time.h>
|
||||||
|
|
||||||
class Engine_Multithread;
|
class Engine_Multithread;
|
||||||
|
|
||||||
namespace NS_Engine_Multithread {
|
namespace NS_Engine_Multithread {
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include "processfields.h"
|
#include "processfields.h"
|
||||||
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include "H5Cpp.h"
|
#include <H5Cpp.h>
|
||||||
|
|
||||||
ProcessFields::ProcessFields(Operator* op, Engine* eng) : Processing(op, eng)
|
ProcessFields::ProcessFields(Operator* op, Engine* eng) : Processing(op, eng)
|
||||||
{
|
{
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#define PROCESSFIELDS_H
|
#define PROCESSFIELDS_H
|
||||||
|
|
||||||
#include "processing.h"
|
#include "processing.h"
|
||||||
#include "../tools/array_ops.h"
|
#include "tools/array_ops.h"
|
||||||
|
|
||||||
class ProcessFields : public Processing
|
class ProcessFields : public Processing
|
||||||
{
|
{
|
||||||
|
29
openEMS.pro
29
openEMS.pro
@ -1,25 +1,32 @@
|
|||||||
# -------------------------------------------------
|
# -------------------------------------------------
|
||||||
# Project created by QtCreator 2010-02-26T22:34:51
|
# Project created by QtCreator 2010-02-26T22:34:51
|
||||||
# -------------------------------------------------
|
# -------------------------------------------------
|
||||||
QT -= gui \
|
|
||||||
core
|
|
||||||
TARGET = openEMS
|
TARGET = openEMS
|
||||||
CONFIG += console
|
CONFIG += console
|
||||||
CONFIG -= app_bundle qt
|
CONFIG -= app_bundle qt
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
OBJECTS_DIR = obj
|
OBJECTS_DIR = obj
|
||||||
|
INCLUDEPATH += .
|
||||||
INCLUDEPATH += ../CSXCAD \
|
INCLUDEPATH += ../CSXCAD \
|
||||||
../fparser \
|
../fparser \
|
||||||
../tinyxml
|
../tinyxml
|
||||||
LIBS += -L../CSXCAD \
|
LIBS += -L../CSXCAD -lCSXCAD
|
||||||
-lCSXCAD \
|
|
||||||
-L../fparser \
|
win32 {
|
||||||
-lfparser \
|
INCLUDEPATH += ../hdf5/include ../boost/include/boost-1_42
|
||||||
-L../tinyxml \
|
LIBS += ../hdf5/lib/libhdf5_cpp.a ../hdf5/lib/libhdf5.a
|
||||||
-ltinyxml \
|
LIBS += ../boost/lib/libboost_thread-mgw44-mt.lib
|
||||||
-lboost_thread \
|
LIBS += -L../CSXCAD/release
|
||||||
-lhdf5 \
|
LIBS += ../fparser/release/libfparser4.a
|
||||||
-lhdf5_cpp
|
LIBS += ../tinyxml/release/libtinyxml2.a
|
||||||
|
}
|
||||||
|
!win32 {
|
||||||
|
LIBS += ../fparser/libfparser.so
|
||||||
|
LIBS += ../tinyxml/libtinyxml.so
|
||||||
|
LIBS += -lboost_thread
|
||||||
|
LIBS += -lhdf5 -lhdf5_cpp
|
||||||
|
}
|
||||||
|
|
||||||
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\'
|
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../tinyxml\'
|
||||||
|
Loading…
Reference in New Issue
Block a user