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 cd5bfc1..eb9c004 100644 --- a/linden/indra/cmake/Variables.cmake +++ b/linden/indra/cmake/Variables.cmake | |||
@@ -61,17 +61,11 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | |||
61 | # set this dynamically from the build system now - | 61 | # set this dynamically from the build system now - |
62 | # NOTE: wont have a distributable build unless you add this on the configure line with: | 62 | # NOTE: wont have a distributable build unless you add this on the configure line with: |
63 | # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' | 63 | # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' |
64 | #set(CMAKE_OSX_ARCHITECTURES i386;ppc) | 64 | set(CMAKE_OSX_ARCHITECTURES i386) |
65 | set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) | 65 | set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) |
66 | if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") | 66 | if (CMAKE_OSX_ARCHITECTURES MATCHES "i386") |
67 | set(ARCH universal) | 67 | set(ARCH i386) |
68 | else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") | 68 | endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386") |
69 | if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc") | ||
70 | set(ARCH ppc) | ||
71 | else (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc") | ||
72 | set(ARCH i386) | ||
73 | endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc") | ||
74 | endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") | ||
75 | set(LL_ARCH ${ARCH}_darwin) | 69 | set(LL_ARCH ${ARCH}_darwin) |
76 | set(LL_ARCH_DIR universal-darwin) | 70 | set(LL_ARCH_DIR universal-darwin) |
77 | endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | 71 | endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |