win32 compile fixes

pull/1/head
Sebastian Held 2010-04-28 11:15:59 +02:00
parent b296c441f9
commit 4fcee4588f
4 changed files with 26 additions and 13 deletions

View File

@ -26,6 +26,12 @@
#include <boost/fusion/container/list/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;
namespace NS_Engine_Multithread {

View File

@ -18,7 +18,7 @@
#include "processfields.h"
#include <iomanip>
#include "H5Cpp.h"
#include <H5Cpp.h>
ProcessFields::ProcessFields(Operator* op, Engine* eng) : Processing(op, eng)
{

View File

@ -19,7 +19,7 @@
#define PROCESSFIELDS_H
#include "processing.h"
#include "../tools/array_ops.h"
#include "tools/array_ops.h"
class ProcessFields : public Processing
{

View File

@ -1,25 +1,32 @@
# -------------------------------------------------
# Project created by QtCreator 2010-02-26T22:34:51
# -------------------------------------------------
QT -= gui \
core
TARGET = openEMS
CONFIG += console
CONFIG -= app_bundle qt
TEMPLATE = app
OBJECTS_DIR = obj
INCLUDEPATH += .
INCLUDEPATH += ../CSXCAD \
../fparser \
../tinyxml
LIBS += -L../CSXCAD \
-lCSXCAD \
-L../fparser \
-lfparser \
-L../tinyxml \
-ltinyxml \
-lboost_thread \
-lhdf5 \
-lhdf5_cpp
LIBS += -L../CSXCAD -lCSXCAD
win32 {
INCLUDEPATH += ../hdf5/include ../boost/include/boost-1_42
LIBS += ../hdf5/lib/libhdf5_cpp.a ../hdf5/lib/libhdf5.a
LIBS += ../boost/lib/libboost_thread-mgw44-mt.lib
LIBS += -L../CSXCAD/release
LIBS += ../fparser/release/libfparser4.a
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/../fparser\'
QMAKE_LFLAGS += \'-Wl,-rpath,\$$ORIGIN/../tinyxml\'