Make sure that it compiles on Windows again.

rdfhdt · Apr 10, 2017 · 686e25d · 686e25d · RubenVerborgh · May 31, 2017
1 parent 7a067ab
commit 686e25d
Show file tree

Hide file tree

Showing 8 changed files with 565 additions and 460 deletions.
diff --git a/hdt-it/hdt-it.pro b/hdt-it/hdt-it.pro
@@ -101,7 +101,7 @@ INCLUDEPATH += $${LIBCDS}/includes ../hdt-lib/include/ .
 # Using Qt Projects
 #win32:LIBS += ../hdt-lib/qmake/win32/libhdt.a $${LIBCDS}/qmake/win32/libcds.a
 
-win32:LIBS += ../hdt-lib/qmake/win32/hdt.lib $${LIBCDS}/qmake/win32/cds.lib ../../zlib/bin/zlib.lib "C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64\opengl32.lib" "C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64\glu32.lib" "F:\serd-0.26.0\bin\serd.lib"
+win32:LIBS += ../hdt-lib/qmake/win32/hdt.lib $${LIBCDS}/qmake/win32/cds.lib "F:\git\zlib\bin\zlib.lib" "C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64\opengl32.lib" "C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64\glu32.lib" "F:\serd-0.26.0\bin\serd.lib"
 
 unix:!macx:LIBS += ../hdt-lib/qmake/unix/libhdt.a $${LIBCDS}/qmake/unix/libcds.a -lGLU
 macx:LIBS += $${LIBCDS}/qmake/macx/libcds.a ../hdt-lib/qmake/macx/libhdt.a
@@ -120,7 +120,7 @@ win32-g++:contains(QMAKE_HOST.arch, x86_64):{
    # win32:LIBS += -L"C:/MinGW/msys/1.0/local/lib/" -lraptor2 -lxml2 -lws2_32
 }
 
-win32:LIBS += -L"C:/msys/local/lib/" -L"/usr/local/lib" -L"C:/MinGW/msys/1.0/local/lib/" -lraptor2 -lxml2 -lws2_32 -lz
+win32:LIBS += -L"C:/msys/local/lib/" -L"/usr/local/lib" -L"C:/MinGW/msys/1.0/local/lib/"
 
 #Unix (Linux & Mac)
 unix:LIBS += -L"/usr/local/lib" -lz -lserd-0

diff --git a/hdt-it/hdtoperation.cpp b/hdt-it/hdtoperation.cpp
@@ -11,7 +11,7 @@
 #define USE_DIALOG
 //#define OPERATION_CANCELABLE
 
-#ifdef __WIN32__
+#ifdef WIN32
 #include <windows.h>
 #define sleep(a) Sleep((a)*1000)
 #else

diff --git a/hdt-lib/src/dictionary/KyotoDictionary.cpp b/hdt-lib/src/dictionary/KyotoDictionary.cpp
@@ -30,7 +30,10 @@
  */
 
 #include <sstream>
+
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <stdexcept>
 #include "KyotoDictionary.hpp"
 

diff --git a/hdt-lib/src/dictionary/PlainDictionary.hpp b/hdt-lib/src/dictionary/PlainDictionary.hpp
@@ -89,10 +89,11 @@ typedef sparse_hash_map<const char *, DictionaryEntry *, hash<const char *>, str
 #else
 
 #ifdef WIN32
-typedef std::hash_map<const char *, DictionaryEntry *, hash<const char *>, str_cmp> DictEntryHash;
+/*typedef std::hash_map<const char *, DictionaryEntry *, hash<const char *>, str_cmp> DictEntryHash;*/
+typedef unordered_map<const char *, DictionaryEntry *, hash<const char *>, str_cmp> DictEntryHash;
 #else
 typedef std::hash_map<const char *, DictionaryEntry *, __gnu_cxx::hash<const char *>, str_cmp> DictEntryHash;
-//typedef unordered_map<const char *, DictionaryEntry *, hash<const char *>, str_cmp> DictEntryHash;
+
 #endif
 #endif