Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext

1 files changed, 9 insertions, 4 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 1177fc2..6a97391 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -24,6 +24,11 @@ list(REMOVE_DUPLICATES TYPES)
 set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE)
 unset(TYPES)
 
+# Work around nmake / VS difference.
+set(VIEWER_CFG_INTDIR ${CMAKE_CFG_INTDIR})
+if (NMAKE)
+    set(VIEWER_CFG_INTDIR ${CMAKE_BUILD_TYPE})
+endif(NMAKE)
 
 # Determine the number of bits of this processor
 
@@ -68,7 +73,6 @@ if (WINDOWS)
       /DUNICODE
       /D_UNICODE 
       /GS
-      /TP
       /W3
       /c
       /Zc:forScope
@@ -95,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)