Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/sing…

…ularityviewer-internal.git into FMODStudio

indra/cmake/00-Common.cmake

@@ -45,11 +45,10 @@ if (WINDOWS)
   if (MSVC10)
     set(MSVC_DIR 10.0)
     set(MSVC_SUFFIX 100)
+  elseif (MSVC12)
+    set(MSVC_DIR 12.0)
+    set(MSVC_SUFFIX 120)
   endif (MSVC10)
-  if (MSVC11)
-    set(MSVC_DIR 11.0)
-    set(MSVC_SUFFIX 110)
-  endif (MSVC11)
 
   # Remove default /Zm1000 flag that cmake inserts
   string (REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
@@ -85,7 +84,7 @@ if (WINDOWS)
       /W3
       /c
       /Zc:forScope
-	    /Zc:wchar_t-
+      /Zc:wchar_t-
       /nologo
       /Oy-
       )
@@ -97,9 +96,15 @@ if (WINDOWS)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4267 /wd4250 /wd4244")
   endif(WORD_SIZE EQUAL 32)
 
-  # configure win32 API for windows XP+ compatibility
-  set(WINVER "0x0501" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
-  add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
+  if (MSVC12)
+    # configure win32 API for windows vista+ compatibility
+    set(WINVER "0x0600" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
+    add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
+  else (MSVC12)
+    # configure win32 API for windows XP+ compatibility
+    set(WINVER "0x0501" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
+    add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
+  endif (MSVC12)
 
   # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT DISABLE_FATAL_WARNINGS)

indra/cmake/CMakeLists.txt

@@ -29,8 +29,8 @@ set(cmake_SOURCE_FILES
     ELFIO.cmake
     EXPAT.cmake
     ExamplePlugin.cmake
-    FMOD.cmake
     FMODEX.cmake
+    FMODSTUDIO.cmake
     FindAPR.cmake
     FindBerkeleyDB.cmake
     FindCARes.cmake

indra/cmake/Colladadom.cmake

@@ -1,6 +1,7 @@
 # -*- cmake -*-
 
 include(Prebuilt)
+include(Boost)
 
 set(COLLADADOM_FIND_QUIETLY OFF)
 set(COLLADADOM_FIND_REQUIRED ON)
@@ -24,11 +25,26 @@ else (STANDALONE)
 	  )
 
   if (WINDOWS)
-	  add_definitions(-DDOM_DYNAMIC)
-	  set(COLLADADOM_LIBRARIES 
-		  debug libcollada14dom22-d
-		  optimized libcollada14dom22
+	  if(MSVC12)
+        use_prebuilt_binary(pcre)
+        use_prebuilt_binary(libxml)
+        set(COLLADADOM_LIBRARIES 
+          debug libcollada14dom23-sd
+          optimized libcollada14dom23-s
+          libxml2_a
+          debug pcrecppd
+          optimized pcrecpp
+          debug pcred
+          optimized pcre
+          ${BOOST_SYSTEM_LIBRARIES}
 		  )
+	  else(MSVC12)
+        add_definitions(-DDOM_DYNAMIC)
+        set(COLLADADOM_LIBRARIES 
+		    debug libcollada14dom22-d
+		    optimized libcollada14dom22
+		    )
+      endif(MSVC12)
   else (WINDOWS)
 	  set(COLLADADOM_LIBRARIES 
 		  collada14dom

indra/cmake/CopyWinLibs.cmake

@@ -42,9 +42,13 @@ set(debug_files
     libapriconv-1.dll
     libeay32.dll
     ssleay32.dll
-    libcollada14dom22-d.dll
     glod.dll
     )
+  if(MSVC10)
+    set(release_files ${release_files}
+        libcollada14dom22-d.dll
+    )
+  endif(MSVC10)
 
 copy_if_different(
     ${debug_src_dir} 
@@ -223,16 +227,39 @@ set(release_files
     libapriconv-1.dll
     libeay32.dll
     ssleay32.dll
-    libcollada14dom22.dll
     glod.dll
     )
 
 if(WORD_SIZE EQUAL 32)
     set(release_files ${release_files}
+    libcollada14dom22.dll
     libtcmalloc_minimal.dll
     )
 endif(WORD_SIZE EQUAL 32)
 
+if(FMODSTUDIO)
+    if (WORD_SIZE EQUAL 32)
+        set(fmodstudio_dll_file "fmod.dll")
+    else (WORD_SIZE EQUAL 32)
+        set(fmodstudio_dll_file "fmod64.dll")
+    endif (WORD_SIZE EQUAL 32)
+
+    find_path(FMODSTUDIO_BINARY_DIR "${fmodstudio_dll_file}"
+          "${release_src_dir}"
+          "${FMODSTUDIO_SDK_DIR}/api/lowlevel/lib"
+          "${FMODSTUDIO_SDK_DIR}"
+          NO_DEFAULT_PATH
+          )
+
+    if(FMODSTUDIO_BINARY_DIR)
+        copy_if_different("${FMODSTUDIO_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets "${fmodstudio_dll_file}")
+        set(all_targets ${all_targets} ${out_targets})
+        copy_if_different("${FMODSTUDIO_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets "${fmodstudio_dll_file}")
+        set(all_targets ${all_targets} ${out_targets})
+        copy_if_different("${FMODSTUDIO_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets "${fmodstudio_dll_file}")
+        set(all_targets ${all_targets} ${out_targets})
+    endif(FMODSTUDIO_BINARY_DIR)
+endif(FMODSTUDIO)
 
 if(FMODEX)
     if (WORD_SIZE EQUAL 32)
@@ -258,25 +285,6 @@ if(FMODEX)
     endif(FMODEX_BINARY_DIR)
 endif(FMODEX)
 
-if(FMOD)
-    find_path(FMOD_BINARY_DIR fmod.dll
-          ${release_src_dir}
-          ${FMOD_SDK_DIR}/api
-          ${FMOD_SDK_DIR}
-          )
-
-if(FMOD_BINARY_DIR)
-    copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmod.dll)
-    set(all_targets ${all_targets} ${out_targets})
-    copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmod.dll)
-    set(all_targets ${all_targets} ${out_targets})
-    copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmod.dll)
-    set(all_targets ${all_targets} ${out_targets})
-    else(FMOD_BINARY_DIR)
-        list(APPEND release_files fmod.dll)	#Required for compile. This will cause an error in copying binaries.
-    endif(FMOD_BINARY_DIR)
-endif(FMOD)
-
 copy_if_different(
     ${release_src_dir} 
     "${CMAKE_CURRENT_BINARY_DIR}/Release"

indra/cmake/EXPAT.cmake

@@ -9,7 +9,11 @@ if (STANDALONE)
 else (STANDALONE)
     use_prebuilt_binary(expat)
     if (WINDOWS)
-        set(EXPAT_LIBRARIES libexpatMT)
+        if (MSVC12)
+          set(EXPAT_LIBRARIES expat)
+        else (MSVC12)
+          set(EXPAT_LIBRARIES libexpatMT)
+        endif (MSVC12)
     else (WINDOWS)
         set(EXPAT_LIBRARIES expat)
     endif (WINDOWS)

indra/cmake/FMODEX.cmake

@@ -2,6 +2,10 @@
 
 include(Linking)
 
+if (FMODEX AND FMODSTUDIO)
+    message( FATAL_ERROR "You can not enable two FMOD variants at the same time." )
+endif (FMODEX AND FMODSTUDIO)
+
 if (NOT FMODEX_LIBRARY)
   set(FMODEX_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
   if (FMODEX_SDK_DIR)

indra/cmake/FMODSTUDIO.cmake

@@ -0,0 +1,83 @@
+# -*- cmake -*-
+
+include(Linking)
+
+if (FMODEX AND FMODSTUDIO)
+    message( FATAL_ERROR "You can not enable two FMOD variants at the same time." )
+endif (FMODEX AND FMODSTUDIO)
+
+if (NOT FMODSTUDIO_LIBRARY)
+  set(FMODSTUDIO_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
+  if (FMODSTUDIO_SDK_DIR)
+    if(WORD_SIZE EQUAL 32)
+      find_library(FMODSTUDIO_LIBRARY
+                   fmod_vc fmodL_vc fmod fmodL
+                   PATHS
+                   "${FMODSTUDIO_SDK_DIR}/api/lowlevel/lib"
+                   "${FMODSTUDIO_SDK_DIR}/api/lowlevel"
+                   "${FMODSTUDIO_SDK_DIR}"
+                   )
+    elseif(WORD_SIZE EQUAL 64)
+      find_library(FMODSTUDIO_LIBRARY
+                   fmod64_vc fmodL64_vc fmod64 fmodL64
+                   PATHS
+                   "${FMODSTUDIO_SDK_DIR}/api/lowlevel/lib"
+                   "${FMODSTUDIO_SDK_DIR}/api/lowlevel"
+                   "${FMODSTUDIO_SDK_DIR}"
+                   )
+    endif(WORD_SIZE EQUAL 32)
+  endif(FMODSTUDIO_SDK_DIR)
+  if(WINDOWS AND NOT FMODSTUDIO_SDK_DIR)
+    GET_FILENAME_COMPONENT(FMODSTUDIO_PROG_DIR [HKEY_CURRENT_USER\\Software\\FMOD\ Studio\ API\ Windows] ABSOLUTE CACHE)
+    if(WORD_SIZE EQUAL 32)
+      find_library(FMODSTUDIO_LIBRARY
+                   fmod_vc fmodL_vc
+                   PATHS
+                   "${FMODSTUDIO_PROG_DIR}/api/lowlevel/lib"
+                   "${FMODSTUDIO_PROG_DIR}/api/lowlevel"
+                   "${FMODSTUDIO_PROG_DIR}"
+                   )
+    else(WORD_SIZE EQUAL 32)
+      find_library(FMODSTUDIO_LIBRARY
+                   fmod64_vc fmodL64_vc
+                   PATHS
+                   "${FMODSTUDIO_PROG_DIR}/api/lowlevel/lib"
+                   "${FMODSTUDIO_PROG_DIR}/api/lowlevel"
+                   "${FMODSTUDIO_PROG_DIR}"
+                   )
+    endif(WORD_SIZE EQUAL 32)
+    if(FMODSTUDIO_LIBRARY)
+      message(STATUS "Found fmodstudio in ${FMODSTUDIO_PROG_DIR}")
+      set(FMODSTUDIO_SDK_DIR "${FMODSTUDIO_PROG_DIR}")
+      set(FMODSTUDIO_SDK_DIR "${FMODSTUDIO_PROG_DIR}" CACHE PATH "Path to the FMOD Studio SDK." FORCE)
+    endif(FMODSTUDIO_LIBRARY)
+  endif(WINDOWS AND NOT FMODSTUDIO_SDK_DIR)
+endif (NOT FMODSTUDIO_LIBRARY)
+
+find_path(FMODSTUDIO_INCLUDE_DIR fmod.hpp
+          "${LIBS_PREBUILT_DIR}/include/fmodstudio"
+          "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodstudio"
+          "${FMODSTUDIO_SDK_DIR}/api/lowlevel/inc"
+          "${FMODSTUDIO_SDK_DIR}"
+          )
+
+if(DARWIN)
+  set(FMODSTUDIO_ORIG_LIBRARY "${FMODSTUDIO_LIBRARY}")
+  set(FMODSTUDIO_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/libfmod.dylib")
+endif(DARWIN)
+
+if (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
+  set(FMODSTUDIO ON CACHE BOOL "Use closed source FMOD Studio sound library.")
+else (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
+  set(FMODSTUDIO_LIBRARY "")
+  set(FMODSTUDIO_INCLUDE_DIR "")
+  if (FMODSTUDIO)
+    message(STATUS "No support for FMOD Studio audio (need to set FMODSTUDIO_SDK_DIR?)")
+  endif (FMODSTUDIO)
+  set(FMODSTUDIO OFF CACHE BOOL "Use closed source FMOD Studio sound library.")
+  set(FMODSTUDIO OFF)
+endif (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR)
+
+if (FMODSTUDIO)
+  message(STATUS "Building with FMOD Studio audio support")
+endif (FMODSTUDIO)

indra/cmake/FreeType.cmake

@@ -11,7 +11,11 @@ else (STANDALONE)
     set(FREETYPE_INCLUDE_DIRS
         ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
   else (LINUX)
-    set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    if(MSVC12)
+      set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/freetype2)
+    else(MSVC12)
+      set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+	endif (MSVC12)
   endif (LINUX)
 
   set(FREETYPE_LIBRARIES freetype)

indra/cmake/JsonCpp.cmake

@@ -10,9 +10,15 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(jsoncpp)
   if (WINDOWS)
-    set(JSONCPP_LIBRARIES 
-      debug json_vc${MSVC_SUFFIX}d
-      optimized json_vc${MSVC_SUFFIX})
+    if(MSVC12)
+      set(JSONCPP_LIBRARIES 
+        debug json_vc${MSVC_SUFFIX}debug_libmt.lib
+        optimized json_vc${MSVC_SUFFIX}_libmt)
+    else(MSVC12)
+      set(JSONCPP_LIBRARIES 
+        debug json_vc${MSVC_SUFFIX}d
+        optimized json_vc${MSVC_SUFFIX})
+    endif(MSVC12)
   elseif (DARWIN)
     set(JSONCPP_LIBRARIES json_linux-gcc-4.0.1_libmt)
   elseif (LINUX)

indra/cmake/PNG.cmake

@@ -9,7 +9,11 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(libpng)
   if (WINDOWS)
-    set(PNG_LIBRARIES libpng15)
+    if(MSVC12)
+      set(PNG_LIBRARIES libpng16)
+    else(MSVC12)
+      set(PNG_LIBRARIES libpng15)
+    endif(MSVC12)
   elseif(DARWIN)
     set(PNG_LIBRARIES png15)
   else(LINUX)

indra/develop.py

@@ -447,14 +447,14 @@ class WindowsSetup(PlatformSetup):
             'gen' : r'Visual Studio 10',
             'ver' : r'10.0'
             },
-        'vc110' : {
-            'gen' : r'Visual Studio 11',
-            'ver' : r'11.0'
+        'vc120' : {
+            'gen' : r'Visual Studio 12',
+            'ver' : r'12.0'
             }
         }
 
     gens['vs2010'] = gens['vc100']
-    gens['vs2012'] = gens['vc110']
+    gens['vs2013'] = gens['vc120']
 
     search_path = r'C:\windows'
     exe_suffixes = ('.exe', '.bat', '.com')