diff options
author | Armin Weatherwax | 2009-12-04 11:03:07 +0100 |
---|---|---|
committer | Jacek Antonelli | 2010-01-03 16:31:13 -0600 |
commit | d057e71bcd0a93a18edda2659c49fdf537031d49 (patch) | |
tree | c6b0224511a5678395704e80c2a6b09554b5cb82 /linden/indra/cmake | |
parent | Merge test release. (diff) | |
download | meta-impy-d057e71bcd0a93a18edda2659c49fdf537031d49.zip meta-impy-d057e71bcd0a93a18edda2659c49fdf537031d49.tar.gz meta-impy-d057e71bcd0a93a18edda2659c49fdf537031d49.tar.bz2 meta-impy-d057e71bcd0a93a18edda2659c49fdf537031d49.tar.xz |
Trying the new 64bit libs and adding the adjustments needed.
(Cherry picked by Jacek from 13412855)
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r-- | linden/indra/cmake/LLWindow.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/cmake/LLWindow.cmake b/linden/indra/cmake/LLWindow.cmake index e749055..db24c70 100644 --- a/linden/indra/cmake/LLWindow.cmake +++ b/linden/indra/cmake/LLWindow.cmake | |||
@@ -17,7 +17,9 @@ 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 | set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) | 20 | #awfixme set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/i686-linux) |
21 | #awfixme set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${ARCH}-linux) | ||
22 | set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/x86_64-linux) | ||
21 | set (SDL_LIBRARY SDL) | 23 | set (SDL_LIBRARY SDL) |
22 | endif (LINUX AND VIEWER) | 24 | endif (LINUX AND VIEWER) |
23 | endif (STANDALONE) | 25 | endif (STANDALONE) |