Merge 1.8 into default

.hgtags

@@ -6,3 +6,4 @@ c974a42f23b7092a370d1c594eb1e782da9f61c8 v1-7-1
 3e9ed7c712e179a9a3f8434117d32b6ce4a15762 v1-7-2
 548833a16388faee9a9701829f375767225a90e2 v1-7-3
 123466e1905576be1e4cdee82de0f2782d73885e v1-8-0RC1
+3467d92e149c044b3c9a3527827f49f4ef9ae604 v1-7-4

CMake/Dependencies.cmake

@@ -125,7 +125,7 @@ endif ()
 if (APPLE AND OGRE_BUILD_PLATFORM_APPLE_IOS)
 	set(Boost_COMPILER "-xgcc42")
 endif()
-set(Boost_ADDITIONAL_VERSIONS "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" )
+set(Boost_ADDITIONAL_VERSIONS "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" )
 # Components that need linking (NB does not include header-only components like bind)
 set(OGRE_BOOST_COMPONENTS thread date_time)
 find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)

CMake/Packages/FindFreetype.cmake

@@ -31,7 +31,7 @@ clear_if_changed(FREETYPE_PREFIX_PATH
   FREETYPE_INCLUDE_DIR
 )
 
-set(FREETYPE_LIBRARY_NAMES freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
+set(FREETYPE_LIBRARY_NAMES freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
 get_debug_names(FREETYPE_LIBRARY_NAMES)
 
 use_pkgconfig(FREETYPE_PKGC freetype2)

CMake/Packages/FindOGRE.cmake

@@ -69,7 +69,7 @@ else ()
 endif ()
 
 
-if(APPLE)
+if(APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
 	set(OGRE_LIBRARY_NAMES "Ogre${OGRE_LIB_SUFFIX}")
 else()
     set(OGRE_LIBRARY_NAMES "OgreMain${OGRE_LIB_SUFFIX}")
@@ -145,12 +145,12 @@ endforeach (comp)
 set(OGRE_PREFIX_WATCH ${OGRE_PREFIX_PATH} ${OGRE_PREFIX_SOURCE} ${OGRE_PREFIX_BUILD})
 clear_if_changed(OGRE_PREFIX_WATCH ${OGRE_RESET_VARS})
 
-# try to locate Ogre via pkg-config
-use_pkgconfig(OGRE_PKGC "OGRE${OGRE_LIB_SUFFIX}")
-
 if(NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
-  # try to find framework on OSX
-  findpkg_framework(OGRE)
+	# try to locate Ogre via pkg-config
+	use_pkgconfig(OGRE_PKGC "OGRE${OGRE_LIB_SUFFIX}")
+
+	# try to find framework on OSX
+	findpkg_framework(OGRE)
 else()
 	set(OGRE_LIBRARY_FWK "")
 endif()

CMake/Packages/FindiOSSDK.cmake

@@ -9,7 +9,7 @@ findpkg_begin(iOS\ SDK)
 # construct search paths
 set(iOSSDK_PREFIX_PATH ${iOSSDK_HOME} $ENV{iOSSDK_HOME}
   ${OGRE_HOME} $ENV{OGRE_HOME})
-create_search_paths(/Developer/Platforms)
+create_search_paths(/Developer/Platforms /Applications/Xcode.app/Contents/Developer/Platforms)
 # redo search if prefix path changed
 clear_if_changed(iOSSDK_PREFIX_PATH
   iOSSDK_LIBRARY_FWK
@@ -25,7 +25,7 @@ get_debug_names(iOSSDK_LIBRARY_NAMES)
 
 #findpkg_framework(UIKit)
 
-find_path(iOSSDK_INCLUDE_DIR iPhoneOS.platform /Developer/Platforms)
+find_path(iOSSDK_INCLUDE_DIR iPhoneOS.platform /Developer/Platforms /Applications/Xcode.app/Contents/Developer/Platforms)
 
 if (iOSSDK_INCLUDE_DIR)
   unset(iOSSDK_INCLUDE_DIR)

CMake/Templates/SDK_CMakeLists.txt.in

@@ -76,7 +76,7 @@ set (BOOST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/boost_@Boost_LIB_VERSION@")
 #####################################################################
 
 # Set compiler specific build flags
-if (CMAKE_COMPILER_IS_GNUCXX)
+if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
   add_definitions(-msse)
 endif ()
 if (APPLE AND OGRE_BUILD_PLATFORM_APPLE_IOS)
@@ -114,7 +114,7 @@ if (NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
 		# search names with "lib". This is the workaround.
 		set(CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES} "")
 	endif ()
-	set(Boost_ADDITIONAL_VERSIONS "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.46.1" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" )
+	set(Boost_ADDITIONAL_VERSIONS "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.46.1" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" )
 	# Components that need linking (NB does not include header-only components like bind)
 	set(OGRE_BOOST_COMPONENTS thread date_time)
 	find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
@@ -132,7 +132,7 @@ if (NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
 else()
 	set(BOOST_LIBRARYDIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/release")
 	set(Boost_USE_STATIC_LIBS TRUE)
-	set(Boost_ADDITIONAL_VERSIONS "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.46.1" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" )
+	set(Boost_ADDITIONAL_VERSIONS "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.46.1" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" )
 	# Components that need linking (NB does not include header-only components like bind)
 	set(OGRE_BOOST_COMPONENTS thread date_time)
 	find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)

CMake/Templates/SDK_Samples_CMakeLists.txt.in

@@ -48,6 +48,7 @@ if (NOT OGRE_BUILD_RENDERSYSTEM_GLES OR OGRE_BUILD_RENDERSYSTEM_GLES2)
   add_subdirectory(Fresnel)
   add_subdirectory(Isosurf)
   add_subdirectory(ParticleGS)
+  add_subdirectory(SSAO)
 endif ()
 
   # Add browser last

CMake/Utils/PrecompiledHeader.cmake

@@ -23,7 +23,7 @@ macro(use_precompiled_header TARGET HEADER_FILE SRC_FILE)
       PPROPERTIES COMPILE_FLAGS /Yc"${HEADER}"
 	)
 
-  elseif (CMAKE_COMPILER_IS_GNUCXX)
+  elseif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
     # disabled because it seems to increase compile time
     ## this is some serious hack... we definitely need native 
     ## support in CMake for this!

CMakeLists.txt

@@ -91,11 +91,13 @@ if (NOT APPLE)
 endif ()
 
 # Set compiler specific build flags
-if (CMAKE_COMPILER_IS_GNUCXX)
+if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
   check_cxx_compiler_flag(-msse OGRE_GCC_HAS_SSE)
   if (OGRE_GCC_HAS_SSE)
     add_definitions(-msse)
   endif ()
+  # This is a set of sensible warnings that provide meaningful output
+  add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Wno-overloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -pedantic -Wshadow -Wno-unused-but-set-parameter -Wno-missing-field-initializers -Wno-long-long)
 endif ()
 if (MSVC)
   if (CMAKE_BUILD_TOOL STREQUAL "nmake")
@@ -120,7 +122,7 @@ if (MINGW)
   add_definitions(-D_WIN32_WINNT=0x0500)
 endif ()
 
-if (CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW)
+if ((CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) AND NOT MINGW)
   # Test for GCC visibility
   include(CheckCXXCompilerFlag)
   check_cxx_compiler_flag(-fvisibility=hidden OGRE_GCC_VISIBILITY)
@@ -147,7 +149,7 @@ if (CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW)
   if(OGRE_PLATFORM_X64 AND NOT APPLE)
     add_definitions(-fPIC)
   endif()  
-endif (CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW)
+endif ((CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) AND NOT MINGW)
 
 # determine system endianess
 if (MSVC)
@@ -204,6 +206,9 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS)
   set(CMAKE_OSX_DEPLOYMENT_TARGET "")
   set(CMAKE_EXE_LINKER_FLAGS "-framework Foundation -framework CoreGraphics -framework QuartzCore -framework UIKit")
   set(XCODE_ATTRIBUTE_SDKROOT iphoneos)
+  set(XCODE_ATTRIBUTE_GCC_UNROLL_LOOPS "YES")
+  set(XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer")
+  set(XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
   set(OGRE_BUILD_RENDERSYSTEM_GLES TRUE CACHE BOOL "Forcing OpenGL ES RenderSystem for iOS" FORCE)
   set(OGRE_BUILD_RENDERSYSTEM_GLES2 TRUE CACHE BOOL "Forcing OpenGL ES 2 RenderSystem for iOS" FORCE)
   set(OGRE_STATIC TRUE CACHE BOOL "Forcing static build for iOS" FORCE)

Components/RTShaderSystem/include/OgreShaderFFPColour.h

@@ -59,7 +59,7 @@ class _OgreRTSSExport FFPColour : public SubRenderState
 		SF_PS_INPUT_DIFFUSE		= 1 << 5,
 		SF_PS_INPUT_SPECULAR	= 1 << 6,
 		SF_PS_OUTPUT_DIFFUSE	= 1 << 7,
-		SF_PS_OUTPUT_SPECULAR	= 1 << 8,
+		SF_PS_OUTPUT_SPECULAR	= 1 << 8
 	};
 
 // Interface.

Components/RTShaderSystem/include/OgreShaderFFPRenderState.h

@@ -48,7 +48,7 @@ enum FFPVertexShaderStage
 	FFP_VS_LIGHTING						= 300,
 	FFP_VS_TEXTURING					= 400,		
 	FFP_VS_FOG							= 500,	
-	FFP_VS_POST_PROCESS					= 2000,
+	FFP_VS_POST_PROCESS					= 2000
 };
 
 // Fixed Function fragment shader stages.
@@ -60,7 +60,7 @@ enum FFPFragmentShaderStage
 	FFP_PS_TEXTURING					= 200,	
 	FFP_PS_COLOUR_END					= 300,
 	FFP_PS_FOG							= 400,
-	FFP_PS_POST_PROCESS					= 500,
+	FFP_PS_POST_PROCESS					= 500
 };
 
 // Fixed Function generic stages.
@@ -72,7 +72,7 @@ enum FFPShaderStage
 	FFP_LIGHTING						= 300,
 	FFP_TEXTURING						= 400,
 	FFP_FOG								= 500,
-	FFP_POST_PROCESS					= 600,
+	FFP_POST_PROCESS					= 600
 };
 
 // Fixed Function Library: Common functions

Components/RTShaderSystem/include/OgreShaderParameter.h

@@ -633,6 +633,7 @@ class _OgreRTSSExport ParameterFactory
 	static UniformParameterPtr	createSampler			(GpuConstantType type, int index);
 	static UniformParameterPtr	createSampler1D			(int index);
 	static UniformParameterPtr	createSampler2D			(int index);
+	static UniformParameterPtr	createSampler2DArray	(int index);
 	static UniformParameterPtr	createSampler3D			(int index);
 	static UniformParameterPtr	createSamplerCUBE		(int index);	
 

Components/RTShaderSystem/include/OgreShaderPrerequisites.h

@@ -82,7 +82,7 @@ enum VSOutputCompactPolicy
 {	
 	VSOCP_LOW		= 0,		// VS Outputs will be compacted just in case the maximum slot count exceeded.
 	VSOCP_MEDIUM	= 1,		// VS Outputs will be compacted always without parameter splits.
-	VSOCP_HIGH		= 2,		// VS Outputs will be compacted always including parameter splits.
+	VSOCP_HIGH		= 2			// VS Outputs will be compacted always including parameter splits.
 };
 
 enum SkinningType