Win32 compatibility

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc4bfd7bc502b4211bc046bd3cc5cbfff36c5d53..8fc783a082e84a61001d7693c7b3b94391670fb6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,7 +38,8 @@ IF (MSVC)
   add_definitions(/wd4251 /wd4290)  # Disable annoying Visual C++ warnings
 ENDIF (MSVC)
 
-include_directories(${PTHREAD_INCLUDE_DIR})
+# !!! to avoid using wrong config.h file on win32 platform add include directories only in following order
+include_directories(${CMAKE_BINARY_DIR} ${PTHREAD_INCLUDE_DIR})
 
 add_subdirectory (Core)
 
@@ -62,7 +63,7 @@ ENDIF (NOT WIN32)
 
 add_library(batch SHARED ${SRC_FILES})
 
-include_directories(${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Core)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Core)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Local)
 target_link_libraries(batch ${PTHREAD_LIBRARY})
 

diff --git a/src/Core/Log.cxx b/src/Core/Log.cxx
index 980b2c1efe2262b7aed7f8e524de880a791dd2b2..2011bd39ba14ae22b8da7a0446e52995da58c690 100644 (file)
--- a/src/Core/Log.cxx
+++ b/src/Core/Log.cxx
@@ -29,6 +29,10 @@
 #include "Utils.hxx"
 #include "Log.hxx"
 
+#ifdef WIN32
+#include <time.h>
+#endif
+
 using namespace std;
 
 namespace Batch {