diff options
| author | Armin Weatherwax | 2010-01-03 19:31:05 +0100 |
|---|---|---|
| committer | Jacek Antonelli | 2010-01-03 16:32:46 -0600 |
| commit | aa251ea50f0b5035678af9093fd97b445f7b961d (patch) | |
| tree | 17ea0f30a103e9c6042d8d08dc8c15207bade58b | |
| parent | Update install.xml to newest 64bit libs. (diff) | |
| download | meta-impy-aa251ea50f0b5035678af9093fd97b445f7b961d.zip meta-impy-aa251ea50f0b5035678af9093fd97b445f7b961d.tar.gz meta-impy-aa251ea50f0b5035678af9093fd97b445f7b961d.tar.bz2 meta-impy-aa251ea50f0b5035678af9093fd97b445f7b961d.tar.xz | |
Use ${ARCH} instead of x86_64 in CMake.
(Cherry picked by Jacek from f604a685)
| -rw-r--r-- | linden/indra/cmake/LLWindow.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linden/indra/cmake/LLWindow.cmake b/linden/indra/cmake/LLWindow.cmake index db24c70..1023693 100644 --- a/linden/indra/cmake/LLWindow.cmake +++ b/linden/indra/cmake/LLWindow.cmake | |||
| @@ -17,9 +17,7 @@ else (STANDALONE) | |||
| 17 | use_prebuilt_binary(mesa) | 17 | use_prebuilt_binary(mesa) |
| 18 | if (LINUX AND VIEWER) | 18 | if (LINUX AND VIEWER) |
| 19 | set (SDL_FOUND TRUE) | 19 | set (SDL_FOUND TRUE) |
| 20 | #awfixme set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) | 20 | set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${ARCH}-linux) |
| 21 | #awfixme set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${ARCH}-linux) | ||
| 22 | set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/x86_64-linux) | ||
| 23 | set (SDL_LIBRARY SDL) | 21 | set (SDL_LIBRARY SDL) |
| 24 | endif (LINUX AND VIEWER) | 22 | endif (LINUX AND VIEWER) |
| 25 | endif (STANDALONE) | 23 | endif (STANDALONE) |