Merge branch master (DRTVWR-552) into DRTVWR-542-meshopt

+resolved viewer-manager's inherited conflict

7 files changed, 27 insertions, 10 deletions

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 8aea50e02b..f4071793d5 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -66,11 +66,10 @@ if (WINDOWS)
   # CP changed to only append the flag for 32bit builds - on 64bit builds,
   # locally at least, the build output is spammed with 1000s of 'D9002'
   # warnings about this switch being ignored.
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")  
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
   if( ADDRESS_SIZE EQUAL 32 )
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64")  
   endif()
-
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
       "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Zo"
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 78d8652394..50cd42ff57 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -67,7 +67,7 @@ set(cmake_SOURCE_FILES
     LLSharedLibs.cmake
     LLTestCommand.cmake
     LLUI.cmake
-    LLVFS.cmake
+    LLFileSystem.cmake
     LLWindow.cmake
     LLXML.cmake
     Linking.cmake
diff --git a/indra/cmake/CubemapToEquirectangularJS.cmake b/indra/cmake/CubemapToEquirectangularJS.cmake
new file mode 100644
index 0000000000..bfe2926005
--- /dev/null
+++ b/indra/cmake/CubemapToEquirectangularJS.cmake
@@ -0,0 +1,5 @@
+# -*- cmake -*-
+use_prebuilt_binary(cubemaptoequirectangular)
+
+# Main JS file
+configure_file("${AUTOBUILD_INSTALL_DIR}/js/CubemapToEquirectangular.js" "${CMAKE_SOURCE_DIR}/newview/skins/default/html/common/equirectangular/js/CubemapToEquirectangular.js" COPYONLY)
diff --git a/indra/cmake/JPEGEncoderBasic.cmake b/indra/cmake/JPEGEncoderBasic.cmake
new file mode 100644
index 0000000000..0d2a3231bb
--- /dev/null
+++ b/indra/cmake/JPEGEncoderBasic.cmake
@@ -0,0 +1,5 @@
+# -*- cmake -*-
+use_prebuilt_binary(jpegencoderbasic)
+
+# Main JS file
+configure_file("${AUTOBUILD_INSTALL_DIR}/js/jpeg_encoder_basic.js" "${CMAKE_SOURCE_DIR}/newview/skins/default/html/common/equirectangular/js/jpeg_encoder_basic.js" COPYONLY)
diff --git a/indra/cmake/LLFileSystem.cmake b/indra/cmake/LLFileSystem.cmake
new file mode 100644
index 0000000000..2e6c42c30c
--- /dev/null
+++ b/indra/cmake/LLFileSystem.cmake
@@ -0,0 +1,7 @@
+# -*- cmake -*-
+
+set(LLFILESYSTEM_INCLUDE_DIRS
+    ${LIBS_OPEN_DIR}/llfilesystem
+    )
+
+set(LLFILESYSTEM_LIBRARIES llfilesystem)
diff --git a/indra/cmake/LLVFS.cmake b/indra/cmake/LLVFS.cmake
deleted file mode 100644
index 0fe87cdea6..0000000000
--- a/indra/cmake/LLVFS.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- cmake -*-
-
-set(LLVFS_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llvfs
-    )
-
-set(LLVFS_LIBRARIES llvfs)
diff --git a/indra/cmake/ThreeJS.cmake b/indra/cmake/ThreeJS.cmake
new file mode 100644
index 0000000000..528adcbb25
--- /dev/null
+++ b/indra/cmake/ThreeJS.cmake
@@ -0,0 +1,8 @@
+# -*- cmake -*-
+use_prebuilt_binary(threejs)
+
+# Main three.js file
+configure_file("${AUTOBUILD_INSTALL_DIR}/js/three.min.js" "${CMAKE_SOURCE_DIR}/newview/skins/default/html/common/equirectangular/js/three.min.js" COPYONLY)
+
+# Controls to move around the scene using mouse or keyboard
+configure_file("${AUTOBUILD_INSTALL_DIR}/js/OrbitControls.js" "${CMAKE_SOURCE_DIR}/newview/skins/default/html/common/equirectangular/js/OrbitControls.js" COPYONLY)