diff options
Diffstat (limited to 'linden/indra/cmake/Variables.cmake')
-rw-r--r-- | linden/indra/cmake/Variables.cmake | 11 |
1 files changed, 10 insertions, 1 deletions
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") | |||
81 | 81 | ||
82 | if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | 82 | if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |
83 | set(DARWIN 1) | 83 | set(DARWIN 1) |
84 | |||
85 | # Incorporated settings from | ||
86 | # http://imprudenceviewer.org/w/index.php?title=How_to_compile&oldid=1647#Mac | ||
87 | # so that people don't have to set them every time they run develop.py | ||
88 | set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") | ||
89 | set(CMAKE_XCODE_ATTRIBUTE_ARCHS '$(ARCHS_STANDARD_32_BIT)') | ||
90 | set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS "i386 ppc") | ||
91 | # set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "NO") | ||
92 | |||
84 | # set this dynamically from the build system now - | 93 | # set this dynamically from the build system now - |
85 | # NOTE: wont have a distributable build unless you add this on the configure line with: | 94 | # NOTE: wont have a distributable build unless you add this on the configure line with: |
86 | # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' | 95 | # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' |
87 | set(CMAKE_OSX_ARCHITECTURES i386) | 96 | set(CMAKE_OSX_ARCHITECTURES i386;ppc) |
88 | set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) | 97 | set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) |
89 | if (CMAKE_OSX_ARCHITECTURES MATCHES "i386") | 98 | if (CMAKE_OSX_ARCHITECTURES MATCHES "i386") |
90 | set(ARCH i386) | 99 | set(ARCH i386) |