9 files changed, 44 insertions, 22 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)
 
 
diff --git a/linden/indra/cmake/CMakeLists.txt b/linden/indra/cmake/CMakeLists.txt
index 4a7d633..aca7b5a 100644
--- a/linden/indra/cmake/CMakeLists.txt
+++ b/linden/indra/cmake/CMakeLists.txt
@@ -93,7 +93,6 @@ set(cmake_SOURCE_FILES
         UI.cmake
         UnixInstall.cmake
         Variables.cmake
-        ViewerArtwork.cmake
         ViewerMiscLibs.cmake
         WebKitLibPlugin.cmake
         XmlRpcEpi.cmake
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 88c0c5c..dfb0e70 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -81,10 +81,19 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(DARWIN 1)
+
+  # Incorporated settings from
+  # http://imprudenceviewer.org/w/index.php?title=How_to_compile&oldid=1647#Mac
+  # so that people don't have to set them every time they run develop.py
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION  "4.0")
+  set(CMAKE_XCODE_ATTRIBUTE_ARCHS '$(ARCHS_STANDARD_32_BIT)')
+  set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS "i386 ppc")
+  # set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "NO")
+
   # set this dynamically from the build system now -
   # NOTE: wont have a distributable build unless you add this on the configure line with:
   # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
-  set(CMAKE_OSX_ARCHITECTURES i386)
+  set(CMAKE_OSX_ARCHITECTURES i386;ppc)
   set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
   if (CMAKE_OSX_ARCHITECTURES MATCHES "i386")
     set(ARCH i386)
diff --git a/linden/indra/cmake/ViewerArtwork.cmake b/linden/indra/cmake/ViewerArtwork.cmake
deleted file mode 100644
index 20210fc..0000000
--- a/linden/indra/cmake/ViewerArtwork.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- cmake -*-
-#
-# Download viewer artwork even when using standalone
-
-include(Variables)
-include(Prebuilt)
-
-if (NOT STANDALONE)
-  use_prebuilt_binary(artwork)
-  use_prebuilt_binary(fonts)
-else (NOT STANDALONE)
-  set(STANDALONE OFF)
-    use_prebuilt_binary(artwork)
-    use_prebuilt_binary(fonts)
-  set(STANDALONE ON)
-endif (NOT STANDALONE)
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 )