Browse Source

HPCC-13251 Fix HPCC Windows VS 9 2008 Win64 errors

Xiaoming Wang 10 years ago
parent
commit
225114648c

+ 2 - 2
cmake_modules/FindBOOST_REGEX.cmake

@@ -44,7 +44,7 @@ IF (NOT BOOST_REGEX_FOUND)
       ENDIF()
     ELSEIF(WIN32)
       IF (${ARCH64BIT} EQUAL 1)
-        SET (boost_regex_lib "boost_regex-vc100-mt.lib")
+        SET (boost_regex_lib "boost_regex-vc90-mt-1_57.lib")
       ELSE()
         SET (boost_regex_lib "libboost_regex-vc90-mt.lib") # note - this may not be the lib we need, but should be in same place as it...
       ENDIF()
@@ -58,7 +58,7 @@ IF (NOT BOOST_REGEX_FOUND)
         ENDIF()
       ELSEIF(WIN32)
     IF (${ARCH64BIT} EQUAL 1)
-      SET (osdir "windows-x86_64-vc100")
+      SET (osdir "windows-x86_64-vc90")
     ELSE()
       SET (osdir "windows-i386-vc90")
     ENDIF()

+ 2 - 0
cmake_modules/commonSetup.cmake

@@ -182,6 +182,8 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
 
     if (${ARCH64BIT} EQUAL 0)
       add_definitions(/Zc:wchar_t-)
+    else()
+      add_definitions(/bigobj)
     endif ()
 
     if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")

+ 1 - 1
lib2/CMakeLists.txt

@@ -27,7 +27,7 @@ elseif (WIN32)
     #TODO:  Should find these dlls not assume them.
     if (NOT USE_NATIVE_LIBRARIES)
       if (${ARCH64BIT} EQUAL 1)
-        find_file (BOOST_REGEX_BIN "boost_regex-vc100-mt-1_46.dll" "${EXTERNALS_DIRECTORY}/boost/windows-x86_64-vc100/lib" NO_DEFAULT_PATH)
+        find_file (BOOST_REGEX_BIN "boost_regex-vc90-mt-1_57.dll" "${EXTERNALS_DIRECTORY}/boost/windows-x86_64-vc90/lib" NO_DEFAULT_PATH)
       else()
         find_file (BOOST_REGEX_BIN "boost_regex-vc90-mt-1_44.dll" "${EXTERNALS_DIRECTORY}/boost/windows-i386-vc90/lib" NO_DEFAULT_PATH)
       endif()

+ 1 - 1
rtl/eclrtl/eclinclude4.hpp

@@ -46,7 +46,7 @@
 #include <math.h>
 
 #define CHEAP_UCHAR_DEF
-#if __WIN32
+#if __WIN32 || _WIN64
 typedef wchar_t UChar;
 #else //__WIN32
 typedef unsigned short UChar;