Merge

OGRECave · Apr 26, 2020 · f2facb9 · f2facb9
2 parents 15a4fcb + 5d2a115
commit f2facb9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
@@ -67,6 +67,19 @@ elseif (UNIX)
   set(OGRE_CFG_INSTALL_PATH "share/OGRE")
 endif ()
 
+if( APPLE )
+  if (OGRE_BUILD_PLATFORM_APPLE_IOS)
+	set( OGRE_MEDIA_PACKS_DIR "." )
+	set( OGRE_MEDIA_TEXTURES_DIR "." )
+  else()
+	set( OGRE_MEDIA_PACKS_DIR "Contents/Resources" )
+	set( OGRE_MEDIA_TEXTURES_DIR "Contents/Resources" )
+  endif()
+else()
+	set( OGRE_MEDIA_PACKS_DIR "${OGRE_MEDIA_DIR_REL}/packs" )
+	set( OGRE_MEDIA_TEXTURES_DIR "${OGRE_MEDIA_DIR_REL}/materials" )
+endif()
+
 # configure plugins.cfg
 if (NOT OGRE_BUILD_RENDERSYSTEM_D3D11)
   set(OGRE_COMMENT_RENDERSYSTEM_D3D11 "#")

diff --git a/OgreMain/include/OgrePrerequisites.h b/OgreMain/include/OgrePrerequisites.h
@@ -52,7 +52,7 @@ namespace Ogre {
     #define OGRE_VERSION_MAJOR 2
     #define OGRE_VERSION_MINOR 2
     #define OGRE_VERSION_PATCH 0
-    #define OGRE_VERSION_SUFFIX "unstable"
+    #define OGRE_VERSION_SUFFIX ""
     #define OGRE_VERSION_NAME "Cerberus"
 
     #define OGRE_VERSION    ((OGRE_VERSION_MAJOR << 16) | (OGRE_VERSION_MINOR << 8) | OGRE_VERSION_PATCH)

diff --git a/OgreMain/src/OgreHlms.cpp b/OgreMain/src/OgreHlms.cpp
@@ -258,8 +258,16 @@ namespace Ogre
         mShaderProfile( "unset!" ),
         mShaderSyntax( "unset!" ),
         mShaderFileExt( "unset!" ),
+    #if OGRE_DEBUG_MODE >= OGRE_DEBUG_MEDIUM
         mDebugOutput( true ),
+    #else
+        mDebugOutput( false ),
+    #endif
+    #if OGRE_DEBUG_MODE >= OGRE_DEBUG_HIGH
+        mDebugOutputProperties( true ),
+    #else
         mDebugOutputProperties( false ),
+    #endif
         mHighQuality( false ),
         mFastShaderBuildHack( false ),
         mDefaultDatablock( 0 ),

diff --git a/Samples/Media/CMakeLists.txt b/Samples/Media/CMakeLists.txt
@@ -13,7 +13,7 @@
 
 # Set media target directory
 if (WIN32)
-  set(OGRE_MEDIA_PATH "media")
+  set(OGRE_MEDIA_PATH "Media")
 elseif (APPLE)
   set(OGRE_MEDIA_PATH "Media")
 elseif (UNIX)