merge up from viewer-development

32 files changed, 233 insertions, 1021 deletions

diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 7ba43f4b13..310e6cbdd4 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -103,7 +103,7 @@ if (VIEWER)
 endif (VIEWER)
 
 # Linux builds the viewer and server in 2 separate projects
-# In order for ./develop.py build server to work on linux, 
+# In order for build server to work on linux, 
 # the viewer project needs a server target.
 # This is not true for mac and windows.
 if (LINUX) 
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 180504d286..5b31b0d237 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -38,21 +38,15 @@ else (STANDALONE)
       set(APR_selector     "a")
       set(APRUTIL_selector "a")
     endif (LLCOMMON_LINK_SHARED)
-    set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.${APR_selector}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.${APR_selector}
-      )
-    set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.${APRUTIL_selector}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.${APRUTIL_selector}
-      )
+    set(APR_LIBRARIES libapr-1.${APR_selector})
+    set(APRUTIL_LIBRARIES libaprutil-1.${APRUTIL_selector})
     set(APRICONV_LIBRARIES iconv)
   else (WINDOWS)
     set(APR_LIBRARIES apr-1)
     set(APRUTIL_LIBRARIES aprutil-1)
     set(APRICONV_LIBRARIES iconv)
   endif (WINDOWS)
-  set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)
+  set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1)
 
   if (LINUX)
     if (VIEWER)
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 3f421b270b..3c7ae50df1 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -85,7 +85,6 @@ source_group("Shared Rules" FILES ${cmake_SOURCE_FILES})
 
 set(master_SOURCE_FILES
     ../CMakeLists.txt
-    ../develop.py
     )
 
 if (SERVER)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 1b08c3fd2e..1f6fe6fedf 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -5,6 +5,7 @@
 # VisualStudio.
 
 include(CMakeCopyIfDifferent)
+include(Linking)
 
 ###################################################################
 # set up platform specific lists of files that need to be copied
@@ -16,7 +17,7 @@ if(WINDOWS)
 
     #*******************************
     # VIVOX - *NOTE: no debug version
-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         SLVoice.exe
         libsndfile-1.dll
@@ -30,9 +31,7 @@ if(WINDOWS)
     #*******************************
     # Misc shared libs 
 
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
-    # or ARCH_PREBUILT_DIRS
-    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
+    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
     set(debug_files
         openjpegd.dll
         libapr-1.dll
@@ -40,14 +39,13 @@ if(WINDOWS)
         libapriconv-1.dll
         )
 
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
-    # or ARCH_PREBUILT_DIRS
-    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
+    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
         openjpeg.dll
         libapr-1.dll
         libaprutil-1.dll
         libapriconv-1.dll
+        dbghelp.dll
         )
 
     if(USE_GOOGLE_PERFTOOLS)
@@ -128,7 +126,7 @@ elseif(DARWIN)
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
     set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release/Resources")
 
-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/universal-darwin")
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         SLVoice
         libsndfile.dylib
@@ -137,14 +135,10 @@ elseif(DARWIN)
         libvivoxplatform.dylib
         libvivoxsdk.dylib
        )
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
-    # or ARCH_PREBUILT_DIRS
-    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_debug")
+    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
     set(debug_files
        )
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
-    # or ARCH_PREBUILT_DIRS
-    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release")
+    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
         libapr-1.0.3.7.dylib
         libapr-1.dylib
@@ -167,7 +161,7 @@ elseif(LINUX)
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
     set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
 
-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
         libsndfile.so.1
         libortp.so
@@ -178,12 +172,12 @@ elseif(LINUX)
        )
     # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
     # or ARCH_PREBUILT_DIRS
-    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib_debug")
+    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
     set(debug_files
        )
     # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
     # or ARCH_PREBUILT_DIRS
-    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib_release_client")
+    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     # *FIX - figure out what to do with duplicate libalut.so here -brad
     set(release_files
         libapr-1.so.0
diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake
index cfc4ccd404..33c6343a93 100644
--- a/indra/cmake/DBusGlib.cmake
+++ b/indra/cmake/DBusGlib.cmake
@@ -10,7 +10,7 @@ elseif (LINUX)
   use_prebuilt_binary(dbusglib)
   set(DBUSGLIB_FOUND ON FORCE BOOL)
   set(DBUSGLIB_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+      ${LIBS_PREBUILT_DIR}/include/glib-2.0
       )
   # We don't need to explicitly link against dbus-glib itself, because
   # the viewer probes for the system's copy at runtime.
diff --git a/indra/cmake/FindAutobuild.cmake b/indra/cmake/FindAutobuild.cmake
new file mode 100644
index 0000000000..45db2b6ed0
--- /dev/null
+++ b/indra/cmake/FindAutobuild.cmake
@@ -0,0 +1,41 @@
+# -*- cmake -*-
+#
+# Find the autobuild tool
+#
+# Output variables:
+#
+#   AUTOBUILD_EXECUTABLE - path to autobuild or pautobuild executable
+
+# *TODO - if cmake was executed by autobuild, autobuild will have set the AUTOBUILD env var
+# update this to check for that case
+
+IF (NOT AUTOBUILD_EXECUTABLE)
+    IF(WIN32)
+      SET(AUTOBUILD_EXE_NAMES autobuild.cmd autobuild.exe)
+    ELSE(WIN32)
+      SET(AUTOBUILD_EXE_NAMES autobuild)
+    ENDIF(WIN32)
+
+    SET(AUTOBUILD_EXECUTABLE)
+    FIND_PROGRAM(
+      AUTOBUILD_EXECUTABLE 
+      NAMES ${AUTOBUILD_EXE_NAMES}
+      PATHS 
+	ENV PATH
+	${CMAKE_SOURCE_DIR}/.. 
+	${CMAKE_SOURCE_DIR}/../..
+	${CMAKE_SOURCE_DIR}/../../..
+      PATH_SUFFIXES "/autobuild/bin/"
+    )
+
+    IF (AUTOBUILD_EXECUTABLE)
+      GET_FILENAME_COMPONENT(_autobuild_name ${AUTOBUILD_EXECUTABLE} NAME_WE)
+      MESSAGE(STATUS "Using autobuild at: ${AUTOBUILD_EXECUTABLE}")
+    ELSE (AUTOBUILD_EXECUTABLE)
+      IF (AUTOBUILD_FIND_REQUIRED)
+	MESSAGE(FATAL_ERROR "Could not find autobuild executable")
+      ENDIF (AUTOBUILD_FIND_REQUIRED)
+    ENDIF (AUTOBUILD_EXECUTABLE)
+
+    MARK_AS_ADVANCED(AUTOBUILD_EXECUTABLE)
+ENDIF (NOT AUTOBUILD_EXECUTABLE)
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index 5f1aa26e89..43a9d282d0 100644
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -9,7 +9,7 @@ else (STANDALONE)
   use_prebuilt_binary(freetype)
   if (LINUX)
     set(FREETYPE_INCLUDE_DIRS
-        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+        ${LIBS_PREBUILT_DIR}/include)
   else (LINUX)
     set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   endif (LINUX)
diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake
index 0ca432da18..d2d0699bcd 100644
--- a/indra/cmake/GStreamer010Plugin.cmake
+++ b/indra/cmake/GStreamer010Plugin.cmake
@@ -13,9 +13,9 @@ elseif (LINUX)
   set(GSTREAMER010_FOUND ON FORCE BOOL)
   set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
   set(GSTREAMER010_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
+      ${LIBS_PREBUILT_DIR}/include/gstreamer-0.10
+      ${LIBS_PREBUILT_DIR}/include/glib-2.0
+      ${LIBS_PREBUILT_DIR}/include/libxml2
       )
   # We don't need to explicitly link against gstreamer itself, because
   # LLMediaImplGStreamer probes for the system's copy at runtime.
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 946fc6b375..133ae14d2f 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -4,7 +4,6 @@ include(Prebuilt)
 if (STANDALONE)
   include(FindGooglePerfTools)
 else (STANDALONE)
-  use_prebuilt_binary(google)
   if (WINDOWS)
     use_prebuilt_binary(google-perftools)
     set(TCMALLOC_LIBRARIES 
@@ -13,11 +12,12 @@ else (STANDALONE)
     set(GOOGLE_PERFTOOLS_FOUND "YES")
   endif (WINDOWS)
   if (LINUX)
+    use_prebuilt_binary(google)
     set(TCMALLOC_LIBRARIES tcmalloc)
     set(STACKTRACE_LIBRARIES stacktrace)
     set(PROFILER_LIBRARIES profiler)
     set(GOOGLE_PERFTOOLS_INCLUDE_DIR
-        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+        ${LIBS_PREBUILT_DIR}/include)
     set(GOOGLE_PERFTOOLS_FOUND "YES")
   endif (LINUX)
 endif (STANDALONE)
diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake
index f5cbad03a6..13c2b86e2f 100644
--- a/indra/cmake/LLKDU.cmake
+++ b/indra/cmake/LLKDU.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-# USE_KDU can be set when launching cmake or develop.py as an option using the argument -DUSE_KDU:BOOL=ON
+# USE_KDU can be set when launching cmake as an option using the argument -DUSE_KDU:BOOL=ON
 # When building using proprietary binaries though (i.e. having access to LL private servers), we always build with KDU
 if (INSTALL_PROPRIETARY AND NOT STANDALONE)
   set(USE_KDU ON)
@@ -14,7 +14,7 @@ if (USE_KDU)
   else (WINDOWS)
     set(KDU_LIBRARY libkdu.a)
   endif (WINDOWS)
-  set(KDU_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/kdu)
+  set(KDU_INCLUDE_DIR ${AUTOBUILD_INSTALL_DIR}/include/kdu)
   set(LLKDU_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llkdu)
   set(LLKDU_LIBRARIES llkdu)
 endif (USE_KDU)
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index bca99caf2a..07db6ab257 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -1,32 +1,43 @@
 # -*- cmake -*-
 
+include(Variables)
+
+
 if (NOT STANDALONE)
+  set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib)
+  set(ARCH_PREBUILT_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/lib/release)
+  set(ARCH_PREBUILT_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/lib/debug)
   if (WINDOWS)
-    set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
-    set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release)
-    set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)
-    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged DLLs")
-    set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged executables")
+    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
+    set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
   elseif (LINUX)
-    if (VIEWER)
-      set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release_client)
-    else (VIEWER)
-      set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
-    endif (VIEWER)
-    set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
-    set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
-    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/lib CACHE FILEPATH "Location of staged .sos")
-    set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin CACHE FILEPATH "Location of staged executables")
+    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/lib)
+    set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin)
   elseif (DARWIN)
-    set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
-    set(ARCH_PREBUILT_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
-    set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE})
-    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged DLLs")
-    set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs/\$(CONFIGURATION)" CACHE FILEPATH "Location of staged executables")
+    set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
+    set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs/\$(CONFIGURATION)")
   endif (WINDOWS)
 endif (NOT STANDALONE)
 
-link_directories(${ARCH_PREBUILT_DIRS})
+# Autobuild packages must provide 'release' versions of libraries, but may provide versions for
+# specific build types.  AUTOBUILD_LIBS_INSTALL_DIRS lists first the build type directory and then
+# the 'release' directory (as a default fallback).
+# *NOTE - we have to take special care to use CMAKE_CFG_INTDIR on IDE generators (like mac and
+# windows) and CMAKE_BUILD_TYPE on Makefile based generators (like linux).  The reason for this is
+# that CMAKE_BUILD_TYPE is essentially meaningless at configuration time for IDE generators and
+# CMAKE_CFG_INTDIR is meaningless at build time for Makefile generators
+if(WINDOWS OR DARWIN)
+  # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us
+  # fortunately both windows and darwin are case insensitive filesystems so this works.
+  set(AUTOBUILD_LIBS_INSTALL_DIRS "${AUTOBUILD_INSTALL_DIR}/lib/")
+else(WINDOWS OR DARWIN)
+  # else block is for linux and any other makefile based generators
+  string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
+  set(AUTOBUILD_LIBS_INSTALL_DIRS ${AUTOBUILD_INSTALL_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER})
+endif(WINDOWS OR DARWIN)
+
+list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
+link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS})
 
 if (LINUX)
   set(DL_LIBRARY dl)
diff --git a/indra/cmake/MonoEmbed.cmake b/indra/cmake/MonoEmbed.cmake
index 0f1f23309c..30890aed21 100644
--- a/indra/cmake/MonoEmbed.cmake
+++ b/indra/cmake/MonoEmbed.cmake
@@ -37,9 +37,9 @@ IF (DARWIN)
 
 ELSE (DARWIN)
 
-  SET(MONO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)  
+  SET(MONO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)  
   SET(GLIB_2_0_PLATFORM_INCLUDE_DIR
-    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0)
+    ${LIBS_PREBUILT_DIR}/include/glib-2.0)
   SET(GLIB_2_0_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/glib-2.0)
 
   INCLUDE_DIRECTORIES(
diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake
index e591fbc3d8..218482449d 100644
--- a/indra/cmake/MySQL.cmake
+++ b/indra/cmake/MySQL.cmake
@@ -7,7 +7,7 @@ use_prebuilt_binary(mysql)
 if (LINUX)
   if (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1")
     set(MYSQL_LIBRARIES mysqlclient)
-    set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
   else (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1")
     # Use the native MySQL library on a 64-bit system.
     set(MYSQL_FIND_QUIETLY ON)
@@ -16,9 +16,9 @@ if (LINUX)
   endif (WORD_SIZE EQUAL 32 OR DEBIAN_VERSION STREQUAL "3.1")
 elseif (WINDOWS)
   set(MYSQL_LIBRARIES mysqlclient)
-  set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
 elseif (DARWIN)
-  set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(MYSQL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
   set(MYSQL_LIBRARIES
     optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libmysqlclient.a
     debug ${ARCH_PREBUILT_DIRS_DEBUG}/libmysqlclient.a
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index d01c680ed1..ed483e5aea 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -15,7 +15,7 @@ if (OPENAL)
     pkg_check_modules(OPENAL_LIB REQUIRED openal)
     pkg_check_modules(FREEALUT_LIB REQUIRED freealut)
   else (STANDALONE)
-    use_prebuilt_binary(openal-soft)
+    use_prebuilt_binary(openal_soft)
   endif (STANDALONE)
   set(OPENAL_LIBRARIES 
     openal
diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake
index 6a2b6811af..661666f00d 100644
--- a/indra/cmake/OpenGL.cmake
+++ b/indra/cmake/OpenGL.cmake
@@ -5,5 +5,5 @@ if (NOT STANDALONE)
   use_prebuilt_binary(GL)
   # possible glh_linear should have its own .cmake file instead
   use_prebuilt_binary(glh_linear)
-  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
 endif (NOT STANDALONE)
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 81584c09ea..c692b67b49 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -13,7 +13,7 @@ else (STANDALONE)
   else (WINDOWS)
     set(OPENSSL_LIBRARIES ssl)
   endif (WINDOWS)
-  set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)
 
 if (LINUX)
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index a91519278c..9b758b03f0 100644
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -1,33 +1,45 @@
 # -*- cmake -*-
 
-include(Python)
-include(FindSCP)
+include(FindAutobuild)
 
 macro (use_prebuilt_binary _binary)
-  if (NOT STANDALONE)
+  if (NOT DEFINED STANDALONE_${_binary})
+    set(STANDALONE_${_binary} ${STANDALONE})
+  endif (NOT DEFINED STANDALONE_${_binary})
+
+  if (NOT STANDALONE_${_binary})
     if(${CMAKE_BINARY_DIR}/temp/sentinel_installed IS_NEWER_THAN ${CMAKE_BINARY_DIR}/temp/${_binary}_installed)
       if(INSTALL_PROPRIETARY)
         include(FindSCP)
         if(DEBUG_PREBUILT)
-          message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. --scp=${SCP_EXECUTABLE} ${_binary}")
+          message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install
+          --install-dir=${AUTOBUILD_INSTALL_DIR}
+          #--scp="${SCP_EXECUTABLE}"
+          --skip-license-check
+          ${_binary} ")
         endif(DEBUG_PREBUILT)
-        execute_process(COMMAND ${PYTHON_EXECUTABLE}
-          install.py 
-          --install-dir=${CMAKE_SOURCE_DIR}/..
-          --scp=${SCP_EXECUTABLE}
+        execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
+          install
+          --install-dir=${AUTOBUILD_INSTALL_DIR}
+          #--scp="${SCP_EXECUTABLE}"
+          --skip-license-check
           ${_binary}
-          WORKING_DIRECTORY ${SCRIPTS_DIR}
+          WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
           RESULT_VARIABLE ${_binary}_installed
           )
       else(INSTALL_PROPRIETARY)
         if(DEBUG_PREBUILT)
-          message("cd ${SCRIPTS_DIR} && ${PYTHON_EXECUTABLE} install.py --install-dir=${CMAKE_SOURCE_DIR}/.. ${_binary}")
+          message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install
+          --install-dir=${AUTOBUILD_INSTALL_DIR}
+          --skip-license-check
+          ${_binary} ")
         endif(DEBUG_PREBUILT)
-        execute_process(COMMAND ${PYTHON_EXECUTABLE}
-          install.py 
-          --install-dir=${CMAKE_SOURCE_DIR}/..
+        execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
+          install
+          --install-dir=${AUTOBUILD_INSTALL_DIR}
+          --skip-license-check
           ${_binary}
-          WORKING_DIRECTORY ${SCRIPTS_DIR}
+          WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
           RESULT_VARIABLE ${_binary}_installed
           )
       endif(INSTALL_PROPRIETARY)
@@ -40,5 +52,5 @@ macro (use_prebuilt_binary _binary)
               "Failed to download or unpack prebuilt '${_binary}'."
               " Process returned ${${_binary}_installed}.")
     endif (NOT ${_binary}_installed EQUAL 0)
-  endif (NOT STANDALONE)
+  endif (NOT STANDALONE_${_binary})
 endmacro (use_prebuilt_binary _binary)
diff --git a/indra/cmake/QuickTimePlugin.cmake b/indra/cmake/QuickTimePlugin.cmake
index 02f432e3c1..012f4e20d8 100644
--- a/indra/cmake/QuickTimePlugin.cmake
+++ b/indra/cmake/QuickTimePlugin.cmake
@@ -33,7 +33,7 @@ elseif (WINDOWS)
   endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
   
   include_directories(
-    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
+    ${LIBS_PREBUILT_DIR}/include/quicktime
     "${QUICKTIME_SDK_DIR}\\CIncludes"
     )
 endif (DARWIN)
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index f529f5b644..91e5258fb7 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -51,11 +51,11 @@ else (STANDALONE)
   endif (LINUX)
 
   include_directories (
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
+      ${LIBS_PREBUILT_DIR}/include
       ${LIBS_PREBUILT_DIR}/include
       )
   foreach(include ${${LL_ARCH}_INCLUDES})
-      include_directories(${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/${include})
+      include_directories(${LIBS_PREBUILT_DIR}/include/${include})
   endforeach(include)
 endif (STANDALONE)
 
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 5dc0cabf03..88cfdfc0b9 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -17,6 +17,10 @@
 
 # Relative and absolute paths to subtrees.
 
+if(NOT DEFINED COMMON_CMAKE_DIR)
+    set(COMMON_CMAKE_DIR "${CMAKE_SOURCE_DIR}/cmake")
+endif(NOT DEFINED COMMON_CMAKE_DIR)
+
 set(LIBS_CLOSED_PREFIX)
 set(LIBS_OPEN_PREFIX)
 set(LIBS_SERVER_PREFIX)
@@ -26,14 +30,26 @@ set(VIEWER_PREFIX)
 set(INTEGRATION_TESTS_PREFIX)
 set(LL_TESTS ON CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation")
 
-set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX})
-set(LIBS_OPEN_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX})
+if(LIBS_CLOSED_DIR)
+  file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)
+else(LIBS_CLOSED_DIR)
+  set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX})
+endif(LIBS_CLOSED_DIR)
+if(LIBS_COMMON_DIR)
+  file(TO_CMAKE_PATH "${LIBS_COMMON_DIR}" LIBS_COMMON_DIR)
+else(LIBS_COMMON_DIR)
+  set(LIBS_COMMON_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX})
+endif(LIBS_COMMON_DIR)
+set(LIBS_OPEN_DIR ${LIBS_COMMON_DIR})
+
 set(LIBS_SERVER_DIR ${CMAKE_SOURCE_DIR}/${LIBS_SERVER_PREFIX})
 set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX})
 set(SERVER_DIR ${CMAKE_SOURCE_DIR}/${SERVER_PREFIX})
 set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX})
 
-set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH
+set(AUTOBUILD_INSTALL_DIR ${CMAKE_BINARY_DIR}/packages)
+
+set(LIBS_PREBUILT_DIR ${AUTOBUILD_INSTALL_DIR} CACHE PATH
     "Location of prebuilt libraries.")
 
 if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
@@ -41,6 +57,10 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
   set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries")
 endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
 
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+      "Build type.  One of: Debug Release RelWithDebInfo" FORCE)
+endif (NOT CMAKE_BUILD_TYPE)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
   set(WINDOWS ON BOOL FORCE)
@@ -54,20 +74,19 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(LINUX ON BOOl FORCE)
 
   # If someone has specified a word size, use that to determine the
-  # architecture.  Otherwise, let the compiler specify the word size.
-  # Using uname will break under chroots and other cross arch compiles. RC
+  # architecture.  Otherwise, let the architecture specify the word size.
   if (WORD_SIZE EQUAL 32)
     set(ARCH i686)
   elseif (WORD_SIZE EQUAL 64)
     set(ARCH x86_64)
   else (WORD_SIZE EQUAL 32)
-    if(CMAKE_SIZEOF_VOID_P MATCHES 4)
-      set(ARCH i686)
-      set(WORD_SIZE 32)
-    else(CMAKE_SIZEOF_VOID_P MATCHES 4)
-      set(ARCH x86_64)
+    execute_process(COMMAND uname -m COMMAND sed s/i.86/i686/
+                    OUTPUT_VARIABLE ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (ARCH STREQUAL x86_64)
       set(WORD_SIZE 64)
-    endif(CMAKE_SIZEOF_VOID_P MATCHES 4)
+    else (ARCH STREQUAL x86_64)
+      set(WORD_SIZE 32)
+    endif (ARCH STREQUAL x86_64)
   endif (WORD_SIZE EQUAL 32)
 
   set(LL_ARCH ${ARCH}_linux)
@@ -76,25 +95,12 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(DARWIN 1)
-
-  # NOTE: If specifying a different SDK with CMAKE_OSX_SYSROOT at configure
-  # time you should also specify CMAKE_OSX_DEPLOYMENT_TARGET explicitly,
-  # otherwise CMAKE_OSX_SYSROOT will be overridden here. We can't just check
-  # for it being unset, as it gets set to the system default :(
-
-  # Default to building against the 10.4 SDK if no deployment target is
-  # specified.
-  if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-    # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html
-    # see http://public.kitware.com/Bug/view.php?id=9959 + poppy
-    set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4)
-  endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-
-  # GCC 4.2 is incompatible with the MacOSX 10.4 SDK
-  if (${CMAKE_OSX_SYSROOT} MATCHES "10.4u")
-    set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0")
-  endif (${CMAKE_OSX_SYSROOT} MATCHES "10.4u")
+  
+  # To support a different SDK update these Xcode settings:
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
+  set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.2")
+  set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "DWARF with dSYM File")
 
   # NOTE: To attempt an i386/PPC Universal build, add this on the configure line:
   # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
@@ -125,6 +131,7 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
 set(VIEWER_CHANNEL "LindenDeveloper" CACHE STRING "Viewer Channel Name")
 set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
 
+set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
 set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
 
 if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
@@ -144,3 +151,4 @@ endif (LINUX AND SERVER AND VIEWER)
 set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.")
 
 source_group("CMake Rules" FILES CMakeLists.txt)
+
diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py
index 320a9be8ab..320a9be8ab 100644..100755
--- a/indra/cmake/run_build_test.py
+++ b/indra/cmake/run_build_test.py
diff --git a/indra/develop.py b/indra/develop.py
deleted file mode 100755
index d9a66352f3..0000000000
--- a/indra/develop.py
+++ /dev/null
@@ -1,863 +0,0 @@
-#!/usr/bin/env python
-"""\
-@file develop.py
-@authors Bryan O'Sullivan, Mark Palange, Aaron Brashears
-@brief Fire and forget script to appropriately configure cmake for SL.
-
-$LicenseInfo:firstyear=2007&license=viewerlgpl$
-Second Life Viewer Source Code
-Copyright (C) 2007-2011, Linden Research, Inc.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation;
-version 2.1 of the License only.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-$/LicenseInfo$
-"""
-
-
-import errno
-import getopt
-import os
-import random
-import re
-import shutil
-import socket
-import sys
-import commands
-import subprocess
-
-class CommandError(Exception):
-    pass
-
-
-def mkdir(path):
-    try:
-        os.mkdir(path)
-        return path
-    except OSError, err:
-        if err.errno != errno.EEXIST or not os.path.isdir(path):
-            raise
-
-def getcwd():
-    cwd = os.getcwd()
-    if 'a' <= cwd[0] <= 'z' and cwd[1] == ':':
-        # CMake wants DOS drive letters to be in uppercase.  The above
-        # condition never asserts on platforms whose full path names
-        # always begin with a slash, so we don't need to test whether
-        # we are running on Windows.
-        cwd = cwd[0].upper() + cwd[1:]
-    return cwd
-
-def quote(opts):
-    return '"' + '" "'.join([ opt.replace('"', '') for opt in opts ]) + '"'
-
-class PlatformSetup(object):
-    generator = None
-    build_types = {}
-    for t in ('Debug', 'Release', 'RelWithDebInfo'):
-        build_types[t.lower()] = t
-
-    build_type = build_types['relwithdebinfo']
-    standalone = 'OFF'
-    unattended = 'OFF'
-    universal = 'OFF'
-    project_name = 'SecondLife'
-    distcc = True
-    cmake_opts = []
-    word_size = 32
-    using_express = False
-
-    def __init__(self):
-        self.script_dir = os.path.realpath(
-            os.path.dirname(__import__(__name__).__file__))
-
-    def os(self):
-        '''Return the name of the OS.'''
-
-        raise NotImplemented('os')
-
-    def arch(self):
-        '''Return the CPU architecture.'''
-
-        return None
-
-    def platform(self):
-        '''Return a stringified two-tuple of the OS name and CPU
-        architecture.'''
-
-        ret = self.os()
-        if self.arch():
-            ret += '-' + self.arch()
-        return ret 
-
-    def build_dirs(self):
-        '''Return the top-level directories in which builds occur.
-
-        This can return more than one directory, e.g. if doing a
-        32-bit viewer and server build on Linux.'''
-
-        return ['build-' + self.platform()]
-
-    def cmake_commandline(self, src_dir, build_dir, opts, simple):
-        '''Return the command line to run cmake with.'''
-
-        args = dict(
-            dir=src_dir,
-            generator=self.generator,
-            opts=quote(opts),
-            standalone=self.standalone,
-            unattended=self.unattended,
-            word_size=self.word_size,
-            type=self.build_type.upper(),
-            )
-        #if simple:
-        #    return 'cmake %(opts)s %(dir)r' % args
-        return ('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s '
-                '-DSTANDALONE:BOOL=%(standalone)s '
-                '-DUNATTENDED:BOOL=%(unattended)s '
-                '-DWORD_SIZE:STRING=%(word_size)s '
-                '-G %(generator)r %(opts)s %(dir)r' % args)
-
-    def run_cmake(self, args=[]):
-        '''Run cmake.'''
-
-        # do a sanity check to make sure we have a generator
-        if not hasattr(self, 'generator'):
-            raise "No generator available for '%s'" % (self.__name__,)
-        cwd = getcwd()
-        created = []
-        try:
-            for d in self.build_dirs():
-                simple = True
-                if mkdir(d):
-                    created.append(d)
-                    simple = False
-                try:
-                    os.chdir(d)
-                    cmd = self.cmake_commandline(cwd, d, args, simple)
-                    print 'Running %r in %r' % (cmd, d)
-                    self.run(cmd, 'cmake')
-                finally:
-                    os.chdir(cwd)
-        except:
-            # If we created a directory in which to run cmake and
-            # something went wrong, the directory probably just
-            # contains garbage, so delete it.
-            os.chdir(cwd)
-            for d in created:
-                print 'Cleaning %r' % d
-                shutil.rmtree(d)
-            raise
-
-    def parse_build_opts(self, arguments):
-        opts, targets = getopt.getopt(arguments, 'o:', ['option='])
-        build_opts = []
-        for o, a in opts:
-            if o in ('-o', '--option'):
-                build_opts.append(a)
-        return build_opts, targets
-
-    def run_build(self, opts, targets):
-        '''Build the default targets for this platform.'''
-
-        raise NotImplemented('run_build')
-
-    def cleanup(self):
-        '''Delete all build directories.'''
-
-        cleaned = 0
-        for d in self.build_dirs():
-            if os.path.isdir(d):
-                print 'Cleaning %r' % d
-                shutil.rmtree(d)
-                cleaned += 1
-        if not cleaned:
-            print 'Nothing to clean up!'
-
-    def is_internal_tree(self):
-        '''Indicate whether we are building in an internal source tree.'''
-
-        return os.path.isdir(os.path.join(self.script_dir, 'newsim'))
-
-    def find_in_path(self, name, defval=None, basename=False):
-        for ext in self.exe_suffixes:
-            name_ext = name + ext
-            if os.sep in name_ext:
-                path = os.path.abspath(name_ext)
-                if os.access(path, os.X_OK):
-                    return [basename and os.path.basename(path) or path]
-            for p in os.getenv('PATH', self.search_path).split(os.pathsep):
-                path = os.path.join(p, name_ext)
-                if os.access(path, os.X_OK):
-                    return [basename and os.path.basename(path) or path]
-        if defval:
-            return [defval]
-        return []
-
-
-class UnixSetup(PlatformSetup):
-    '''Generic Unixy build instructions.'''
-
-    search_path = '/usr/bin:/usr/local/bin'
-    exe_suffixes = ('',)
-
-    def __init__(self):
-        super(UnixSetup, self).__init__()
-        self.generator = 'Unix Makefiles'
-
-    def os(self):
-        return 'unix'
-
-    def arch(self):
-        cpu = os.uname()[-1]
-        if cpu.endswith('386'):
-            cpu = 'i386'
-        elif cpu.endswith('86'):
-            cpu = 'i686'
-        elif cpu in ('athlon',):
-            cpu = 'i686'
-        elif cpu == 'Power Macintosh':
-            cpu = 'ppc'
-        elif cpu == 'x86_64' and self.word_size == 32:
-            cpu = 'i686'
-        return cpu
-
-    def run(self, command, name=None):
-        '''Run a program.  If the program fails, raise an exception.'''
-        sys.stdout.flush()
-        ret = os.system(command)
-        if ret:
-            if name is None:
-                name = command.split(None, 1)[0]
-            if os.WIFEXITED(ret):
-                st = os.WEXITSTATUS(ret)
-                if st == 127:
-                    event = 'was not found'
-                else:
-                    event = 'exited with status %d' % st
-            elif os.WIFSIGNALED(ret):
-                event = 'was killed by signal %d' % os.WTERMSIG(ret)
-            else:
-                event = 'died unexpectedly (!?) with 16-bit status %d' % ret
-            raise CommandError('the command %r %s' %
-                               (name, event))
-
-
-class LinuxSetup(UnixSetup):
-    def __init__(self):
-        super(LinuxSetup, self).__init__()
-        try:
-            self.debian_sarge = open('/etc/debian_version').read().strip() == '3.1'
-        except:
-            self.debian_sarge = False
-
-    def os(self):
-        return 'linux'
-
-    def build_dirs(self):
-        # Only build the server code if we have it.
-        platform_build = '%s-%s' % (self.platform(), self.build_type.lower())
-
-        if self.arch() == 'i686' and self.is_internal_tree():
-            return ['viewer-' + platform_build, 'server-' + platform_build]
-        elif self.arch() == 'x86_64' and self.is_internal_tree():
-            # the viewer does not build in 64bit -- kdu5 issues
-            # we can either use openjpeg, or overhaul our viewer to handle kdu5 or higher
-            # doug knows about kdu issues
-            return ['server-' + platform_build]
-        else:
-            return ['viewer-' + platform_build]
-
-    def cmake_commandline(self, src_dir, build_dir, opts, simple):
-        args = dict(
-            dir=src_dir,
-            generator=self.generator,
-            opts=quote(opts),
-            standalone=self.standalone,
-            unattended=self.unattended,
-            type=self.build_type.upper(),
-            project_name=self.project_name,
-            word_size=self.word_size,
-            )
-        if not self.is_internal_tree():
-            args.update({'cxx':'g++', 'server':'OFF', 'viewer':'ON'})
-        else:
-            if self.distcc:
-                distcc = self.find_in_path('distcc')
-                baseonly = True
-            else:
-                distcc = []
-                baseonly = False
-            if 'server' in build_dir:
-                gcc = distcc + self.find_in_path(
-                    self.debian_sarge and 'g++-3.3' or 'g++-4.1',
-                    'g++', baseonly)
-                args.update({'cxx': ' '.join(gcc), 'server': 'ON',
-                             'viewer': 'OFF'})
-            else:
-                gcc41 = distcc + self.find_in_path('g++-4.1', 'g++', baseonly)
-                args.update({'cxx': ' '.join(gcc41),
-                             'server': 'OFF',
-                             'viewer': 'ON'})
-        cmd = (('cmake -DCMAKE_BUILD_TYPE:STRING=%(type)s '
-                '-G %(generator)r -DSERVER:BOOL=%(server)s '
-                '-DVIEWER:BOOL=%(viewer)s -DSTANDALONE:BOOL=%(standalone)s '
-                '-DUNATTENDED:BOOL=%(unattended)s '
-                '-DWORD_SIZE:STRING=%(word_size)s '
-                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
-                '%(opts)s %(dir)r')
-               % args)
-        if 'CXX' not in os.environ:
-            args.update({'cmd':cmd})
-            cmd = ('CXX=%(cxx)r %(cmd)s' % args)
-        return cmd
-
-    def run_build(self, opts, targets):
-        job_count = None
-
-        for i in range(len(opts)):
-            if opts[i].startswith('-j'):
-                try:
-                    job_count = int(opts[i][2:])
-                except ValueError:
-                    try:
-                        job_count = int(opts[i+1])
-                    except ValueError:
-                        job_count = True
-
-        def get_cpu_count():
-            count = 0
-            for line in open('/proc/cpuinfo'):
-                if re.match(r'processor\s*:', line):
-                    count += 1
-            return count
-
-        def localhost():
-            count = get_cpu_count()
-            return 'localhost/' + str(count), count
-
-        def get_distcc_hosts():
-            try:
-                hosts = []
-                name = os.getenv('DISTCC_DIR', '/etc/distcc') + '/hosts'
-                for l in open(name):
-                    l = l[l.find('#')+1:].strip()
-                    if l: hosts.append(l)
-                return hosts
-            except IOError:
-                return (os.getenv('DISTCC_HOSTS', '').split() or
-                        [localhost()[0]])
-
-        def count_distcc_hosts():
-            cpus = 0
-            hosts = 0
-            for host in get_distcc_hosts():
-                m = re.match(r'.*/(\d+)', host)
-                hosts += 1
-                cpus += m and int(m.group(1)) or 1
-            return hosts, cpus
-
-        def mk_distcc_hosts(basename, range, num_cpus):
-            '''Generate a list of LL-internal machines to build on.'''
-            loc_entry, cpus = localhost()
-            hosts = [loc_entry]
-            dead = []
-            stations = [s for s in xrange(range) if s not in dead]
-            random.shuffle(stations)
-            hosts += ['%s%d.lindenlab.com/%d,lzo' % (basename, s, num_cpus) for s in stations]
-            cpus += 2 * len(stations)
-            return ' '.join(hosts), cpus
-
-        if job_count is None:
-            hosts, job_count = count_distcc_hosts()
-            hostname = socket.gethostname()
-            if hosts == 1:
-                if hostname.startswith('station'):
-                    hosts, job_count = mk_distcc_hosts('station', 36, 2)
-                    os.environ['DISTCC_HOSTS'] = hosts
-                if hostname.startswith('eniac'):
-                    hosts, job_count = mk_distcc_hosts('eniac', 71, 2)
-                    os.environ['DISTCC_HOSTS'] = hosts
-            if hostname.startswith('build'):
-                max_jobs = 6
-            else:
-                max_jobs = 12
-            if job_count > max_jobs:
-                job_count = max_jobs;
-            opts.extend(['-j', str(job_count)])
-
-        if targets:
-            targets = ' '.join(targets)
-        else:
-            targets = 'all'
-
-        for d in self.build_dirs():
-            cmd = 'make -C %r %s %s' % (d, ' '.join(opts), targets)
-            print 'Running %r' % cmd
-            self.run(cmd)
-
-        
-class DarwinSetup(UnixSetup):
-    def __init__(self):
-        super(DarwinSetup, self).__init__()
-        self.generator = 'Xcode'
-
-    def os(self):
-        return 'darwin'
-
-    def arch(self):
-        if self.universal == 'ON':
-            return 'universal'
-        else:
-            return UnixSetup.arch(self)
-
-    def cmake_commandline(self, src_dir, build_dir, opts, simple):
-        args = dict(
-            dir=src_dir,
-            generator=self.generator,
-            opts=quote(opts),
-            standalone=self.standalone,
-            word_size=self.word_size,
-            unattended=self.unattended,
-            project_name=self.project_name,
-            universal=self.universal,
-            type=self.build_type.upper(),
-            )
-        if self.universal == 'ON':
-            args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\''
-        #if simple:
-        #    return 'cmake %(opts)s %(dir)r' % args
-        return ('cmake -G %(generator)r '
-                '-DCMAKE_BUILD_TYPE:STRING=%(type)s '
-                '-DSTANDALONE:BOOL=%(standalone)s '
-                '-DUNATTENDED:BOOL=%(unattended)s '
-                '-DWORD_SIZE:STRING=%(word_size)s '
-                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
-                '%(universal)s '
-                '%(opts)s %(dir)r' % args)
-
-    def run_build(self, opts, targets):
-        cwd = getcwd()
-        if targets:
-            targets = ' '.join(['-target ' + repr(t) for t in targets])
-        else:
-            targets = ''
-        cmd = ('xcodebuild -configuration %s %s %s | grep -v "^[[:space:]]*setenv" ; exit ${PIPESTATUS[0]}' %
-               (self.build_type, ' '.join(opts), targets))
-        for d in self.build_dirs():
-            try:
-                os.chdir(d)
-                print 'Running %r in %r' % (cmd, d)
-                self.run(cmd)
-            finally:
-                os.chdir(cwd)
-
-
-class WindowsSetup(PlatformSetup):
-    gens = {
-        'vc71' : {
-            'gen' : r'Visual Studio 7 .NET 2003',
-            'ver' : r'7.1'
-            },
-        'vc80' : {
-            'gen' : r'Visual Studio 8 2005',
-            'ver' : r'8.0'
-            },
-        'vc90' : {
-            'gen' : r'Visual Studio 9 2008',
-            'ver' : r'9.0'
-            }
-        }
-    gens['vs2003'] = gens['vc71']
-    gens['vs2005'] = gens['vc80']
-    gens['vs2008'] = gens['vc90']
-
-    search_path = r'C:\windows'
-    exe_suffixes = ('.exe', '.bat', '.com')
-
-    def __init__(self):
-        super(WindowsSetup, self).__init__()
-        self._generator = None
-        self.incredibuild = False
-
-    def _get_generator(self):
-        if self._generator is None:
-            for version in 'vc80 vc90 vc71'.split():
-                if self.find_visual_studio(version):
-                    self._generator = version
-                    print 'Building with ', self.gens[version]['gen']
-                    break
-                else:
-                    print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
-                    for version in 'vc80 vc90 vc71'.split():
-                        if self.find_visual_studio_express(version):
-                            self._generator = version
-                            self.using_express = True
-                            print 'Building with ', self.gens[version]['gen'] , "Express edition"
-                            break
-                        else:
-                            print >> sys.stderr, 'Cannot find any Visual Studio installation'
-                            sys.exit(1)
-        return self._generator
-
-    def _set_generator(self, gen):
-        self._generator = gen
-
-    generator = property(_get_generator, _set_generator)
-
-    def os(self):
-        return 'win32'
-
-    def build_dirs(self):
-        return ['build-' + self.generator]
-
-    def cmake_commandline(self, src_dir, build_dir, opts, simple):
-        args = dict(
-            dir=src_dir,
-            generator=self.gens[self.generator.lower()]['gen'],
-            opts=quote(opts),
-            standalone=self.standalone,
-            unattended=self.unattended,
-            project_name=self.project_name,
-            word_size=self.word_size,
-            )
-        #if simple:
-        #    return 'cmake %(opts)s "%(dir)s"' % args
-        return ('cmake -G "%(generator)s" '
-                '-DSTANDALONE:BOOL=%(standalone)s '
-                '-DUNATTENDED:BOOL=%(unattended)s '
-                '-DWORD_SIZE:STRING=%(word_size)s '
-                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
-                '%(opts)s "%(dir)s"' % args)
-
-    def get_HKLM_registry_value(self, key_str, value_str):
-        import _winreg
-        reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
-        key = _winreg.OpenKey(reg, key_str)
-        value = _winreg.QueryValueEx(key, value_str)[0]
-        print 'Found: %s' % value
-        return value
-        
-    def find_visual_studio(self, gen=None):
-        if gen is None:
-            gen = self._generator
-        gen = gen.lower()
-        value_str = (r'EnvironmentDirectory')
-        key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' %
-                   self.gens[gen]['ver'])
-        print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
-               (key_str, value_str))
-        try:
-            return self.get_HKLM_registry_value(key_str, value_str)           
-        except WindowsError, err:
-            key_str = (r'SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%s\Setup\VS' %
-                       self.gens[gen]['ver'])
-
-        try:
-            return self.get_HKLM_registry_value(key_str, value_str)
-        except:
-            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
-            
-        return ''
-
-    def find_visual_studio_express(self, gen=None):
-        if gen is None:
-            gen = self._generator
-        gen = gen.lower()
-        try:
-            import _winreg
-            key_str = (r'SOFTWARE\Microsoft\VCEXpress\%s\Setup\VC' %
-                       self.gens[gen]['ver'])
-            value_str = (r'ProductDir')
-            print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
-                   (key_str, value_str))
-            print key_str
-
-            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
-            key = _winreg.OpenKey(reg, key_str)
-            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
-            print 'Found: %s' % value
-            return value
-        except WindowsError, err:
-            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
-            return ''
-
-    def get_build_cmd(self):
-        if self.incredibuild:
-            config = self.build_type
-            if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]:
-                config = '\"%s|Win32\"' % config
-
-            executable = 'buildconsole'
-            cmd = "%(bin)s %(prj)s.sln /build /cfg=%(cfg)s" % {'prj': self.project_name, 'cfg': config, 'bin': executable}
-            return (executable, cmd)
-
-        environment = self.find_visual_studio()
-        if environment == '':
-            environment = self.find_visual_studio_express()
-            if environment == '':
-                print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio installation."
-            else:
-                build_dirs=self.build_dirs();
-                print >> sys.stderr, "\nSolution generation complete, it can can now be found in:", build_dirs[0]
-                print >> sys.stderr, "\nPlease see https://wiki.secondlife.com/wiki/Microsoft_Visual_Studio#Extra_steps_for_Visual_Studio_Express_editions for express specific information"
-                exit(0)
-
-        # devenv.com is CLI friendly, devenv.exe... not so much.
-        executable = '%sdevenv.com' % (self.find_visual_studio(),)
-        cmd = ('"%s" %s.sln /build %s' % 
-                (executable, self.project_name, self.build_type))
-        return (executable, cmd)
-
-    def run(self, command, name=None, retry_on=None, retries=1):
-        '''Run a program.  If the program fails, raise an exception.'''
-        assert name is not None, 'On windows an executable path must be given in name. [DEV-44838]'
-        if os.path.isfile(name):
-            path = name
-        else:
-            path = self.find_in_path(name)[0]
-        while retries:
-            retries = retries - 1
-            print "develop.py tries to run:", command
-            ret = subprocess.call(command, executable=path)
-            print "got ret", ret, "from", command
-            if ret == 0:
-                break
-            else:
-                error = 'exited with status %d' % ret
-                if retry_on is not None and retry_on == ret:
-                    print "Retrying... the command %r %s" % (name, error)
-                else:
-                    raise CommandError('the command %r %s' % (name, error))
-
-    def run_cmake(self, args=[]):
-        '''Override to add the vstool.exe call after running cmake.'''
-        PlatformSetup.run_cmake(self, args)
-        if self.unattended == 'OFF':
-            if self.using_express == False:
-                self.run_vstool()
-
-    def run_vstool(self):
-        for build_dir in self.build_dirs():
-            stamp = os.path.join(build_dir, 'vstool.txt')
-            try:
-                prev_build = open(stamp).read().strip()
-            except IOError:
-                prev_build = ''
-            if prev_build == self.build_type:
-                # Only run vstool if the build type has changed.
-                continue
-            executable = os.path.join('tools','vstool','VSTool.exe')
-            vstool_cmd = (executable +
-                          ' --solution ' +
-                          os.path.join(build_dir,'SecondLife.sln') +
-                          ' --config ' + self.build_type +
-                          ' --startup secondlife-bin')
-            print 'Running %r in %r' % (vstool_cmd, getcwd())
-            self.run(vstool_cmd, name=executable)        
-            print >> open(stamp, 'w'), self.build_type
-        
-    def run_build(self, opts, targets):
-        for t in targets:
-            assert t.strip(), 'Unexpected empty targets: ' + repr(targets)
-        cwd = getcwd()
-        executable, build_cmd = self.get_build_cmd()
-
-        for d in self.build_dirs():
-            try:
-                os.chdir(d)
-                if targets:
-                    for t in targets:
-                        cmd = '%s /project %s %s' % (build_cmd, t, ' '.join(opts))
-                        print 'Running %r in %r' % (cmd, d)
-                        self.run(cmd, name=executable, retry_on=4, retries=3)
-                else:
-                    cmd = '%s %s' % (build_cmd, ' '.join(opts))
-                    print 'Running %r in %r' % (cmd, d)
-                    self.run(cmd, name=executable, retry_on=4, retries=3)
-            finally:
-                os.chdir(cwd)
-                
-class CygwinSetup(WindowsSetup):
-    def __init__(self):
-        super(CygwinSetup, self).__init__()
-        self.generator = 'vc80'
-
-    def cmake_commandline(self, src_dir, build_dir, opts, simple):
-        dos_dir = commands.getoutput("cygpath -w %s" % src_dir)
-        args = dict(
-            dir=dos_dir,
-            generator=self.gens[self.generator.lower()]['gen'],
-            opts=quote(opts),
-            standalone=self.standalone,
-            unattended=self.unattended,
-            project_name=self.project_name,
-            word_size=self.word_size,
-            )
-        #if simple:
-        #    return 'cmake %(opts)s "%(dir)s"' % args
-        return ('cmake -G "%(generator)s" '
-                '-DUNATTENDED:BOOl=%(unattended)s '
-                '-DSTANDALONE:BOOL=%(standalone)s '
-                '-DWORD_SIZE:STRING=%(word_size)s '
-                '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
-                '%(opts)s "%(dir)s"' % args)
-
-setup_platform = {
-    'darwin': DarwinSetup,
-    'linux2': LinuxSetup,
-    'win32' : WindowsSetup,
-    'cygwin' : CygwinSetup
-    }
-
-
-usage_msg = '''
-Usage:   develop.py [options] [command [command-options]]
-
-Options:
-  -h | --help           print this help message
-       --standalone     build standalone, without Linden prebuild libraries
-       --unattended     build unattended, do not invoke any tools requiring
-                        a human response
-       --universal      build a universal binary on Mac OS X (unsupported)
-  -t | --type=NAME      build type ("Debug", "Release", or "RelWithDebInfo")
-  -m32 | -m64           build architecture (32-bit or 64-bit)
-  -N | --no-distcc      disable use of distcc
-  -G | --generator=NAME generator name
-                        Windows: VC71 or VS2003 (default), VC80 (VS2005) or 
-                          VC90 (VS2008)
-                        Mac OS X: Xcode (default), Unix Makefiles
-                        Linux: Unix Makefiles (default), KDevelop3
-  -p | --project=NAME   set the root project name. (Doesn't effect makefiles)
-                        
-Commands:
-  build           configure and build default target
-  clean           delete all build directories, does not affect sources
-  configure       configure project by running cmake (default if none given)
-  printbuilddirs  print the build directory that will be used
-
-Command-options for "configure":
-  We use cmake variables to change the build configuration.
-  -DSERVER:BOOL=OFF        Don't configure simulator/dataserver/etc
-  -DVIEWER:BOOL=OFF        Don't configure the viewer
-  -DPACKAGE:BOOL=ON        Create "package" target to make installers
-  -DLOCALIZESETUP:BOOL=ON  Create one win_setup target per supported language
-
-Examples:
-  Set up a viewer-only project for your system:
-    develop.py configure -DSERVER:BOOL=OFF
-  
-  Set up a Visual Studio 2005 project with "package" target:
-    develop.py -G vc80 configure -DPACKAGE:BOOL=ON
-'''
-
-def main(arguments):
-    setup = setup_platform[sys.platform]()
-    try:
-        opts, args = getopt.getopt(
-            arguments,
-            '?hNt:p:G:m:',
-            ['help', 'standalone', 'no-distcc', 'unattended', 'universal', 'type=', 'incredibuild', 'generator=', 'project='])
-    except getopt.GetoptError, err:
-        print >> sys.stderr, 'Error:', err
-        print >> sys.stderr, """
-Note: You must pass -D options to cmake after the "configure" command
-For example: develop.py configure -DSERVER:BOOL=OFF"""
-        print >> sys.stderr, usage_msg.strip()
-        sys.exit(1)
-
-    for o, a in opts:
-        if o in ('-?', '-h', '--help'):
-            print usage_msg.strip()
-            sys.exit(0)
-        elif o in ('--standalone',):
-            setup.standalone = 'ON'
-        elif o in ('--unattended',):
-            setup.unattended = 'ON'
-        elif o in ('--universal',):
-            setup.universal = 'ON'
-        elif o in ('-m',):
-            if a in ('32', '64'):
-                setup.word_size = int(a)
-            else:
-                print >> sys.stderr, 'Error: unknown word size', repr(a)
-                print >> sys.stderr, 'Supported word sizes: 32, 64'
-                sys.exit(1)
-        elif o in ('-t', '--type'):
-            try:
-                setup.build_type = setup.build_types[a.lower()]
-            except KeyError:
-                print >> sys.stderr, 'Error: unknown build type', repr(a)
-                print >> sys.stderr, 'Supported build types:'
-                types = setup.build_types.values()
-                types.sort()
-                for t in types:
-                    print ' ', t
-                sys.exit(1)
-        elif o in ('-G', '--generator'):
-            setup.generator = a
-        elif o in ('-N', '--no-distcc'):
-            setup.distcc = False
-        elif o in ('-p', '--project'):
-            setup.project_name = a
-        elif o in ('--incredibuild'):
-            setup.incredibuild = True
-        else:
-            print >> sys.stderr, 'INTERNAL ERROR: unhandled option', repr(o)
-            sys.exit(1)
-    if not args:
-        setup.run_cmake()
-        return
-    try:
-        cmd = args.pop(0)
-        if cmd in ('cmake', 'configure'):
-            setup.run_cmake(args)
-        elif cmd == 'build':
-            if os.getenv('DISTCC_DIR') is None:
-                distcc_dir = os.path.join(getcwd(), '.distcc')
-                if not os.path.exists(distcc_dir):
-                    os.mkdir(distcc_dir)
-                print "setting DISTCC_DIR to %s" % distcc_dir
-                os.environ['DISTCC_DIR'] = distcc_dir
-            else:
-                print "DISTCC_DIR is set to %s" % os.getenv('DISTCC_DIR')
-            for d in setup.build_dirs():
-                if not os.path.exists(d):
-                    raise CommandError('run "develop.py cmake" first')
-            setup.run_cmake()
-            opts, targets = setup.parse_build_opts(args)
-            setup.run_build(opts, targets)
-        elif cmd == 'clean':
-            if args:
-                raise CommandError('clean takes no arguments')
-            setup.cleanup()
-        elif cmd == 'printbuilddirs':
-            for d in setup.build_dirs():
-                print >> sys.stdout, d
-        else:
-            print >> sys.stderr, 'Error: unknown subcommand', repr(cmd)
-            print >> sys.stderr, "(run 'develop.py --help' for help)"
-            sys.exit(1)
-    except getopt.GetoptError, err:
-        print >> sys.stderr, 'Error with %r subcommand: %s' % (cmd, err)
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    try:
-        main(sys.argv[1:])
-    except CommandError, err:
-        print >> sys.stderr, 'Error:', err
-        sys.exit(1)
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
index e0772e55ca..df47167154 100644
--- a/indra/integration_tests/llui_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llui_libtest/CMakeLists.txt
@@ -91,14 +91,14 @@ if (WINDOWS)
     # Copy over OpenJPEG.dll
     # *NOTE: On Windows with VS2005, only the first comment prints
     set(OPENJPEG_RELEASE
-        "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/openjpeg.dll")
+        "${ARCH_PREBUILT_DIRS_RELEASE}/openjpeg.dll")
     add_custom_command( TARGET llui_libtest POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different 
             ${OPENJPEG_RELEASE} ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Copying OpenJPEG DLLs to binary directory"
         )
     set(OPENJPEG_DEBUG
-        "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/openjpegd.dll")
+        "${ARCH_PREBUILT_DIRS_DEBUG}/openjpegd.dll")
     add_custom_command( TARGET llui_libtest POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different 
             ${OPENJPEG_DEBUG} ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index 21ec622819..632e5d46e3 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -24,6 +24,7 @@ include_directories(
     ${VORBIS_INCLUDE_DIRS}
     ${OPENAL_LIB_INCLUDE_DIRS}
     ${FREEAULT_LIB_INCLUDE_DIRS}
+    ${FMOD_INCLUDE_DIR}
     )
 
 set(llaudio_SOURCE_FILES
diff --git a/indra/llkdu/CMakeLists.txt b/indra/llkdu/CMakeLists.txt
index 7ed1c6c694..046629b514 100644
--- a/indra/llkdu/CMakeLists.txt
+++ b/indra/llkdu/CMakeLists.txt
@@ -19,6 +19,7 @@ include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLIMAGE_INCLUDE_DIRS}
     ${KDU_INCLUDE_DIR}
+    ${LLKDU_INCLUDE_DIRS}
     ${LLMATH_INCLUDE_DIRS}
     )
 
@@ -49,6 +50,15 @@ if (USE_KDU)
     SET(llkdu_TEST_SOURCE_FILES
       llimagej2ckdu.cpp
       )
+    SET(llkdu_test_additional_HEADER_FILES
+      llimagej2ckdu.h
+      llkdumem.h
+      lltut.h
+      )
+    SET(llkdu_test_additional_INCLUDE_DIRS
+      ${KDU_INCLUDE_DIR}
+      ${LLKDU_INCLUDE_DIRS}
+    )
     LL_ADD_PROJECT_UNIT_TESTS(llkdu "${llkdu_TEST_SOURCE_FILES}")
   endif (LL_TESTS)
 
diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp
index 1ccee4bb64..7ac24a969a 100644
--- a/indra/llkdu/tests/llimagej2ckdu_test.cpp
+++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp
@@ -27,10 +27,10 @@
 
 #include "linden_common.h"
 // Class to test 
-#include "../llimagej2ckdu.h"
-#include "../llkdumem.h"
+#include "llimagej2ckdu.h"
+#include "llkdumem.h"
 // Tut header
-#include "../test/lltut.h"
+#include "lltut.h"
 
 // -------------------------------------------------------------------------------------------
 // Stubbing: Declarations required to link and run the class being tested
diff --git a/indra/llmath/tests/m3math_test.cpp b/indra/llmath/tests/m3math_test.cpp
index e4d31996a3..479a00b99f 100644
--- a/indra/llmath/tests/m3math_test.cpp
+++ b/indra/llmath/tests/m3math_test.cpp
@@ -37,6 +37,11 @@
 
 #include "../test/lltut.h"
 
+#if LL_WINDOWS
+// disable unreachable code warnings caused by usage of skip.
+#pragma warning(disable: 4702)
+#endif
+
 namespace tut
 {
 	struct m3math_test
@@ -277,19 +282,21 @@ namespace tut
 		LLVector3 llvec2(1, 2, 0);
 		LLVector3 llvec3(2, 4, 2);
 
+        skip("This test fails depending on architecture. Need to fix comparison operation, is_approx_equal, to work on more than one platform.");
+
 		llmat_obj.setRows(llvec1, llvec2, llvec3);
 		llmat_obj.orthogonalize();
 
 		ensure("LLMatrix3::orthogonalize failed ",
-		       is_approx_equal(0.19611613f, llmat_obj.mMatrix[0][0]) &&
+		       is_approx_equal(0.19611614f, llmat_obj.mMatrix[0][0]) &&
 		       is_approx_equal(0.78446454f, llmat_obj.mMatrix[0][1]) &&
-		       is_approx_equal(0.58834839f, llmat_obj.mMatrix[0][2]) &&
-		       is_approx_equal(0.47628206f, llmat_obj.mMatrix[1][0]) &&
-		       is_approx_equal(0.44826555f, llmat_obj.mMatrix[1][1]) &&
-		       is_approx_equal(-0.75644791f, llmat_obj.mMatrix[1][2]) &&
-		       is_approx_equal(-0.85714287f, llmat_obj.mMatrix[2][0]) &&
+		       is_approx_equal(0.58834841f, llmat_obj.mMatrix[0][2]) &&
+		       is_approx_equal(0.47628204f, llmat_obj.mMatrix[1][0]) &&
+		       is_approx_equal(0.44826545f, llmat_obj.mMatrix[1][1]) &&
+		       is_approx_equal(-0.75644795f, llmat_obj.mMatrix[1][2]) &&
+		       is_approx_equal(-0.85714286f, llmat_obj.mMatrix[2][0]) &&
 		       is_approx_equal(0.42857143f, llmat_obj.mMatrix[2][1]) &&
-		       is_approx_equal(-0.28571427f, llmat_obj.mMatrix[2][2]));
+		       is_approx_equal(-0.28571429f, llmat_obj.mMatrix[2][2]));
 	}
 
 	//test case for adjointTranspose() fn.
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index 96ebe83826..966bea329c 100644
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -193,8 +193,8 @@ LLFontGL* LLFontGL::getFontDefault()
 	return NULL; 
 }
 
-char* _PREHASH_AgentData = "AgentData";
-char* _PREHASH_AgentID = "AgentID";
+char* _PREHASH_AgentData = (char *)"AgentData";
+char* _PREHASH_AgentID = (char *)"AgentID";
 
 LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS);
 
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt
index 3b1f679540..b36291f0e8 100644
--- a/indra/media_plugins/webkit/CMakeLists.txt
+++ b/indra/media_plugins/webkit/CMakeLists.txt
@@ -121,8 +121,8 @@ if (DARWIN)
   add_custom_command(
     TARGET media_plugin_webkit POST_BUILD
 #    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
-    DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
+    COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
+    DEPENDS media_plugin_webkit ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
     )
     
 endif (DARWIN)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index af6beacdfa..ef1d05a779 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1508,7 +1508,7 @@ if (WINDOWS)
       ${CMAKE_CURRENT_SOURCE_DIR}/licenses-win32.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/featuretable.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/featuretable_xp.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/dbghelp.dll
+      ${ARCH_PREBUILT_DIRS_RELEASE}/dbghelp.dll
       ${ARCH_PREBUILT_DIRS_RELEASE}/libeay32.dll
       ${ARCH_PREBUILT_DIRS_RELEASE}/qtcore4.dll
       ${ARCH_PREBUILT_DIRS_RELEASE}/qtgui4.dll
@@ -1882,7 +1882,7 @@ if (PACKAGE)
       "${VIEWER_DIST_DIR}"
       "${VIEWER_EXE_GLOBS}"
       "${VIEWER_LIB_GLOB}"
-      "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/bin/dump_syms"
+      "${AUTOBUILD_INSTALL_DIR}/bin/dump_syms"
       "${VIEWER_SYMBOL_FILE}"
     DEPENDS generate_breakpad_symbols.py
         VERBATIM)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1722c84d34..a1327cfe93 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -301,6 +301,10 @@ class WindowsManifest(ViewerManifest):
             self.path("vivoxplatform.dll")
             self.path("vivoxoal.dll")
 
+            # For use in crash reporting (generates minidumps)
+            if self.args['configuration'].lower() != 'debug':
+                self.path("dbghelp.dll")
+
             # For google-perftools tcmalloc allocator.
             try:
                 if self.args['configuration'].lower() == 'debug':
@@ -316,9 +320,6 @@ class WindowsManifest(ViewerManifest):
         self.path("featuretable.txt")
         self.path("featuretable_xp.txt")
 
-        # For use in crash reporting (generates minidumps)
-        self.path("dbghelp.dll")
-
         self.enable_no_crt_manifest_check()
         
         # Media plugins - QuickTime
@@ -338,7 +339,7 @@ class WindowsManifest(ViewerManifest):
 
 
         if self.args['configuration'].lower() == 'debug':
-            if self.prefix(src=os.path.join(os.pardir, os.pardir, 'libraries', 'i686-win32', 'lib', 'debug'),
+            if self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'debug'),
                            dst="llplugin"):
                 self.path("libeay32.dll")
                 self.path("qtcored4.dll")
@@ -369,7 +370,7 @@ class WindowsManifest(ViewerManifest):
 
                 self.end_prefix()
         else:
-            if self.prefix(src=os.path.join(os.pardir, os.pardir, 'libraries', 'i686-win32', 'lib', 'release'),
+            if self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'release'),
                            dst="llplugin"):
                 self.path("libeay32.dll")
                 self.path("qtcore4.dll")
@@ -568,7 +569,7 @@ class DarwinManifest(ViewerManifest):
             self.path("Info-SecondLife.plist", dst="Info.plist")
 
             # copy additional libs in <bundle>/Contents/MacOS/
-            self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib")
+            self.path("../packages/lib/release/libndofdev.dylib", dst="MacOS/libndofdev.dylib")
 
             self.path("../viewer_components/updater/scripts/darwin/update_install", "MacOS/update_install")
 
@@ -610,15 +611,7 @@ class DarwinManifest(ViewerManifest):
                 self.path("uk.lproj")
                 self.path("zh-Hans.lproj")
 
-                # SLVoice and vivox lols
-                self.path("vivox-runtime/universal-darwin/libsndfile.dylib", "libsndfile.dylib")
-                self.path("vivox-runtime/universal-darwin/libvivoxoal.dylib", "libvivoxoal.dylib")
-                self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib")
-                self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib")
-                self.path("vivox-runtime/universal-darwin/libvivoxplatform.dylib", "libvivoxplatform.dylib")
-                self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
-
-                libdir = "../../libraries/universal-darwin/lib_release"
+                libdir = "../packages/lib/release"
                 dylibs = {}
 
                 # Need to get the llcommon dll from any of the build directories as well
@@ -645,6 +638,11 @@ class DarwinManifest(ViewerManifest):
                                     ):
                         self.path(os.path.join(libdir, libfile), libfile)
 
+                # SLVoice and vivox lols
+                for libfile in ('libsndfile.dylib', 'libvivoxoal.dylib', 'libortp.dylib', \
+                    'libvivoxsdk.dylib', 'libvivoxplatform.dylib', 'SLVoice') :
+                     self.path(os.path.join(libdir, libfile), libfile)
+                
                 try:
                     # FMOD for sound
                     self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
@@ -687,7 +685,7 @@ class DarwinManifest(ViewerManifest):
                 if self.prefix(src="", dst="llplugin"):
                     self.path("../media_plugins/quicktime/" + self.args['configuration'] + "/media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib")
                     self.path("../media_plugins/webkit/" + self.args['configuration'] + "/media_plugin_webkit.dylib", "media_plugin_webkit.dylib")
-                    self.path("../../libraries/universal-darwin/lib_release/libllqtwebkit.dylib", "libllqtwebkit.dylib")
+                    self.path("../packages/lib/release/libllqtwebkit.dylib", "libllqtwebkit.dylib")
 
                     self.end_prefix("llplugin")
 
@@ -927,7 +925,7 @@ class Linux_i686Manifest(LinuxManifest):
     def construct(self):
         super(Linux_i686Manifest, self).construct()
 
-        if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
+        if self.prefix("../packages/lib/release", dst="lib"):
             self.path("libapr-1.so.0")
             self.path("libaprutil-1.so.0")
             self.path("libbreakpad_client.so.0.0.0", "libbreakpad_client.so.0")
@@ -951,10 +949,10 @@ class Linux_i686Manifest(LinuxManifest):
             self.end_prefix("lib")
 
             # Vivox runtimes
-            if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
+            if self.prefix(src="../packages/lib/release", dst="bin"):
                     self.path("SLVoice")
                     self.end_prefix()
-            if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
+            if self.prefix(src="../packages/lib/release", dst="lib"):
                     self.path("libortp.so")
                     self.path("libsndfile.so.1")
                     #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index 02d7031b81..1211bb7e5a 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -378,8 +378,8 @@ endif (DARWIN OR WINDOWS)
 
 if (DARWIN)
   add_custom_command(TARGET llmediaplugintest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
+    COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${PLUGINS_DESTINATION_DIR}
+    DEPENDS ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
   )
 endif (DARWIN)
 
@@ -388,7 +388,7 @@ if(WINDOWS)
   # Plugin test library deploy
   #
   # Debug config runtime files required for the plugin test mule
-  set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
+  set(plugintest_debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
   set(plugintest_debug_files
     libeay32.dll
     libglib-2.0-0.dll
@@ -411,7 +411,7 @@ if(WINDOWS)
   set(plugin_test_targets ${plugin_test_targets} ${out_targets})
   
   # Debug config runtime files required for the plugin test mule (Qt image format plugins)
-  set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/imageformats")
+  set(plugintest_debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}/imageformats")
   set(plugintest_debug_files
     qgifd4.dll
     qicod4.dll
@@ -429,7 +429,7 @@ if(WINDOWS)
   set(plugin_test_targets ${plugin_test_targets} ${out_targets})
 
   # Debug config runtime files required for the plugin test mule (Qt codec plugins)
-  set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/codecs")
+  set(plugintest_debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}/codecs")
   set(plugintest_debug_files
     qcncodecsd4.dll
     qjpcodecsd4.dll
@@ -445,7 +445,7 @@ if(WINDOWS)
   set(plugin_test_targets ${plugin_test_targets} ${out_targets})
  
   # Release & ReleaseDebInfo config runtime files required for the plugin test mule
-  set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
+  set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
   set(plugintest_release_files
     libeay32.dll
     libglib-2.0-0.dll
@@ -477,7 +477,7 @@ if(WINDOWS)
   set(plugin_test_targets ${plugin_test_targets} ${out_targets})
 
   # Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
-  set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/imageformats")
+  set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}/imageformats")
   set(plugintest_release_files
     qgif4.dll
     qico4.dll
@@ -503,7 +503,7 @@ if(WINDOWS)
   set(plugin_test_targets ${plugin_test_targets} ${out_targets})
 
   # Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt codec plugins)
-  set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/codecs")
+  set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}/codecs")
   set(plugintest_release_files
     qcncodecs4.dll  
     qjpcodecs4.dll