diff options
| author | Armin Weatherwax | 2010-01-01 12:59:25 +0100 |
|---|---|---|
| committer | Jacek Antonelli | 2010-04-29 01:15:00 -0500 |
| commit | 2e0d8732cca561f04922ef23be1733d51e32de42 (patch) | |
| tree | 6ec0459e45dcb40c748785ae4fe0eb36e17bf19d /linden/indra/cmake/00-Common.cmake | |
| parent | Updating a few 64bit Linux libs. (diff) | |
| download | meta-impy-2e0d8732cca561f04922ef23be1733d51e32de42.zip meta-impy-2e0d8732cca561f04922ef23be1733d51e32de42.tar.gz meta-impy-2e0d8732cca561f04922ef23be1733d51e32de42.tar.bz2 meta-impy-2e0d8732cca561f04922ef23be1733d51e32de42.tar.xz | |
Fix just another hardcoded path to Linux-i686.
(Backported from 6d50eb4a) @nochangelog
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/cmake/00-Common.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 9b3f423..8a0f8a9 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
| @@ -163,6 +163,9 @@ if (LINUX) | |||
| 163 | # this stops us requiring a really recent glibc at runtime | 163 | # this stops us requiring a really recent glibc at runtime |
| 164 | add_definitions(-fno-stack-protector) | 164 | add_definitions(-fno-stack-protector) |
| 165 | endif (NOT STANDALONE) | 165 | endif (NOT STANDALONE) |
| 166 | if (${ARCH} STREQUAL "x86_64") | ||
| 167 | add_definitions( -DLINUX64=1 ) | ||
| 168 | endif (${ARCH} STREQUAL "x86_64") | ||
| 166 | endif (VIEWER) | 169 | endif (VIEWER) |
| 167 | 170 | ||
| 168 | set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}") | 171 | set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}") |