More post merge cleanups, make it compile under Windows.

7 files changed, 33 insertions, 6 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 06368c0..6a97391 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -73,7 +73,6 @@ if (WINDOWS)
       /DUNICODE
       /D_UNICODE 
       /GS
-      /TP
       /W3
       /c
       /Zc:forScope
@@ -100,9 +99,10 @@ if (WINDOWS)
   endif (MSVC80 OR MSVC90)
   
   # Are we using the crummy Visual Studio KDU build workaround?
-  if (NOT VS_DISABLE_FATAL_WARNINGS)
-    add_definitions(/WX)
-  endif (NOT VS_DISABLE_FATAL_WARNINGS)
+  # FIXME: Let's just disable this for now, see if it's needed, coz I have no idea what that work around is about.
+#  if (NOT VS_DISABLE_FATAL_WARNINGS)
+#    add_definitions(/WX)
+#  endif (NOT VS_DISABLE_FATAL_WARNINGS)
 endif (WINDOWS)
 
 
diff --git a/linden/indra/cmake/gpg.vs.cmake b/linden/indra/cmake/gpg.vs.cmake
index a5220f4..c551b3a 100644
--- a/linden/indra/cmake/gpg.vs.cmake
+++ b/linden/indra/cmake/gpg.vs.cmake
@@ -4,3 +4,4 @@
 # make the libgcrypt, libgpg-error, and libotr compile.
 
 set(gpg.vs_INCLUDE_DIRS )
+add_definitions( /DHAVE_CONFIG_H=1 )
diff --git a/linden/indra/cmake/libgcrypt.cmake b/linden/indra/cmake/libgcrypt.cmake
index 4d19467..19ef1f8 100644
--- a/linden/indra/cmake/libgcrypt.cmake
+++ b/linden/indra/cmake/libgcrypt.cmake
@@ -2,9 +2,19 @@
 
 set(LIBGCRYPT_INCLUDE_DIRS
     ${CMAKE_BINARY_DIR}/libgcrypt/include
+    ${LIBS_OPEN_DIR}/libgcrypt/libgcrypt-1.2.2/src
     )
 
+if (DARWIN OR LINUX)
 set(LIBGCRYPT_LIBRARIES
     ${CMAKE_BINARY_DIR}/libgcrypt/lib/libgcrypt.a
     )
+endif (DARWIN OR LINUX)
 
+if (WINDOWS)
+set(LIBGCRYPT_LIBRARIES
+    ${CMAKE_BINARY_DIR}/libgcrypt/gcrypt.lib
+    )
+endif (WINDOWS)
+
+add_definitions( /DHAVE_CONFIG_H=1 )
diff --git a/linden/indra/cmake/libgpg-error.cmake b/linden/indra/cmake/libgpg-error.cmake
index 417ad19..4ec0926 100644
--- a/linden/indra/cmake/libgpg-error.cmake
+++ b/linden/indra/cmake/libgpg-error.cmake
@@ -2,9 +2,19 @@
 
 set(LIBGPG-ERROR_INCLUDE_DIRS
     ${CMAKE_BINARY_DIR}/libgpg-error/include
+    ${LIBS_OPEN_DIR}/libgpg-error/libgpg-error-1.0/src
     )
 
+if (DARWIN OR LINUX)
 set(LIBGPG-ERROR_LIBRARIES
     ${CMAKE_BINARY_DIR}/libgpg-error/lib/libgpg-error.a
     )
+endif (DARWIN OR LINUX)
 
+if (WINDOWS)
+set(LIBGPG-ERROR_LIBRARIES
+    ${CMAKE_BINARY_DIR}/libgpg-error/gpg-error.lib
+    )
+endif (WINDOWS)
+
+add_definitions( /DHAVE_CONFIG_H=1 )
diff --git a/linden/indra/cmake/libotr.cmake b/linden/indra/cmake/libotr.cmake
index 30544f8..6fd61f2 100644
--- a/linden/indra/cmake/libotr.cmake
+++ b/linden/indra/cmake/libotr.cmake
@@ -6,3 +6,5 @@ set(LIBOTR_INCLUDE_DIRS
 set(LIBOTR_LIBRARIES
     otr
     )
+
+add_definitions( /DHAVE_CONFIG_H=1 )
diff --git a/linden/indra/cmake/libotrb.cmake b/linden/indra/cmake/libotrb.cmake
index eb8522f..e9290e8 100644
--- a/linden/indra/cmake/libotrb.cmake
+++ b/linden/indra/cmake/libotrb.cmake
@@ -2,3 +2,5 @@
 include(Prebuilt)
 
 set(OTR_LIBRARY otr)
+
+add_definitions( /DHAVE_CONFIG_H=1 )
diff --git a/linden/indra/gpg.vs/libgpg-error-1.1.vs/custom/config.h b/linden/indra/gpg.vs/libgpg-error-1.1.vs/custom/config.h
index 39d58f5..6a18960 100755
--- a/linden/indra/gpg.vs/libgpg-error-1.1.vs/custom/config.h
+++ b/linden/indra/gpg.vs/libgpg-error-1.1.vs/custom/config.h
@@ -93,8 +93,10 @@
 #define WIN32_LEAN_AND_MEAN

 #include <windows.h>

 

-#define strcasecmp stricmp

-#define strncasecmp strnicmp

+#define strcasecmp _stricmp

+#define strncasecmp _strnicmp

 #define snprintf _snprintf

+//#define snprintf _snprintf_s

+//#define strerror strerror_s

 

 #endif