4 files changed, 15 insertions, 18 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 1177fc2..06368c0 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
 
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)