diff options
| author | Armin Weatherwax | 2009-12-04 11:03:07 +0100 |
|---|---|---|
| committer | Jacek Antonelli | 2010-04-28 23:04:21 -0500 |
| commit | 1fc0936f2eff90370404fa3c03fb64a266ac06bd (patch) | |
| tree | 97ff3ea39f8350ae16cd23c95fbcec4c0e77cb95 /linden/indra/cmake/LLWindow.cmake | |
| parent | Updated ChangeLog.txt and RELEASE_NOTES.txt for version 1.2.2. (diff) | |
| download | meta-impy-1fc0936f2eff90370404fa3c03fb64a266ac06bd.zip meta-impy-1fc0936f2eff90370404fa3c03fb64a266ac06bd.tar.gz meta-impy-1fc0936f2eff90370404fa3c03fb64a266ac06bd.tar.bz2 meta-impy-1fc0936f2eff90370404fa3c03fb64a266ac06bd.tar.xz | |
Trying the new 64bit libs and adding the adjustments needed.
(Backported from d057e71bc) @nochangelog
Diffstat (limited to 'linden/indra/cmake/LLWindow.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 c0efa27..babba64 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) |