diff options
Diffstat (limited to 'linden/indra/cmake/Variables.cmake')
| -rw-r--r-- | linden/indra/cmake/Variables.cmake | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake index 5d4dffe..8a06133 100644 --- a/linden/indra/cmake/Variables.cmake +++ b/linden/indra/cmake/Variables.cmake | |||
| @@ -60,17 +60,11 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | |||
| 60 | # set this dynamically from the build system now - | 60 | # set this dynamically from the build system now - |
| 61 | # NOTE: wont have a distributable build unless you add this on the configure line with: | 61 | # NOTE: wont have a distributable build unless you add this on the configure line with: |
| 62 | # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' | 62 | # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' |
| 63 | #set(CMAKE_OSX_ARCHITECTURES i386;ppc) | 63 | set(CMAKE_OSX_ARCHITECTURES i386) |
| 64 | set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) | 64 | set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) |
| 65 | if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") | 65 | if (CMAKE_OSX_ARCHITECTURES MATCHES "i386") |
| 66 | set(ARCH universal) | 66 | set(ARCH i386) |
| 67 | else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") | 67 | endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386") |
| 68 | if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc") | ||
| 69 | set(ARCH ppc) | ||
| 70 | else (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc") | ||
| 71 | set(ARCH i386) | ||
| 72 | endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc") | ||
| 73 | endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") | ||
| 74 | set(LL_ARCH ${ARCH}_darwin) | 68 | set(LL_ARCH ${ARCH}_darwin) |
| 75 | set(LL_ARCH_DIR universal-darwin) | 69 | set(LL_ARCH_DIR universal-darwin) |
| 76 | endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | 70 | endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |