From 4fcee4588f030fea0958f2d3865e4035e93b14ac Mon Sep 17 00:00:00 2001
From: Sebastian Held <sebastian.held@uni-due.de>
Date: Wed, 28 Apr 2010 11:15:59 +0200
Subject: [PATCH] win32 compile fixes

---
 FDTD/engine_multithread.h |  6 ++++++
 FDTD/processfields.cpp    |  2 +-
 FDTD/processfields.h      |  2 +-
 openEMS.pro               | 29 ++++++++++++++++++-----------
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/FDTD/engine_multithread.h b/FDTD/engine_multithread.h
index 55df164..76909d6 100644
--- a/FDTD/engine_multithread.h
+++ b/FDTD/engine_multithread.h
@@ -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 {
diff --git a/FDTD/processfields.cpp b/FDTD/processfields.cpp
index 77b2bb6..c35043e 100644
--- a/FDTD/processfields.cpp
+++ b/FDTD/processfields.cpp
@@ -18,7 +18,7 @@
 #include "processfields.h"
 
 #include <iomanip>
-#include "H5Cpp.h"
+#include <H5Cpp.h>
 
 ProcessFields::ProcessFields(Operator* op, Engine* eng) : Processing(op, eng)
 {
diff --git a/FDTD/processfields.h b/FDTD/processfields.h
index a44f68f..ab164f1 100644
--- a/FDTD/processfields.h
+++ b/FDTD/processfields.h
@@ -19,7 +19,7 @@
 #define PROCESSFIELDS_H
 
 #include "processing.h"
-#include "../tools/array_ops.h"
+#include "tools/array_ops.h"
 
 class ProcessFields : public Processing
 {
diff --git a/openEMS.pro b/openEMS.pro
index cb5f43a..444332c 100644
--- a/openEMS.pro
+++ b/openEMS.pro
@@ -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\'