Moved build dirs out of indra directory. installed.xml and prebuilts are now per-build-target. Added support for v3 prebuilt package layout.

2014-12-03 22:36:42 -06:00
parent 7ddef751ef
commit 958031dbaf
44 changed files with 502 additions and 458 deletions
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -17,7 +17,10 @@ else (STANDALONE)
    use_prebuilt_binary(mesa)
    use_prebuilt_binary(SDL)
    set (SDL_FOUND TRUE)
-    set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR})
+    set (SDL_INCLUDE_DIR
+      ${LIBS_PREBUILT_DIR}/include
+      ${LIBS_PREBUILT_LEGACY_DIR}/include
+      )
    if(WORD_SIZE EQUAL 64)
      set (SDL_LIBRARY SDL)
    else(WORD_SIZE EQUAL 64)