gistfile1.txt

diff -r edccf8cc52e3 CMake/Packages/FindFreetype.cmake
--- a/CMake/Packages/FindFreetype.cmake	Fri Jun 20 00:53:20 2014 +0200
+++ b/CMake/Packages/FindFreetype.cmake	Fri Oct 03 01:19:56 2014 +0200
@@ -43,7 +43,7 @@
 findpkg_framework(FREETYPE)
 message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
 
-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
+find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
 find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
 
 find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
diff -r edccf8cc52e3 CMake/Utils/OgreConfigTargets.cmake
--- a/CMake/Utils/OgreConfigTargets.cmake	Fri Jun 20 00:53:20 2014 +0200
+++ b/CMake/Utils/OgreConfigTargets.cmake	Fri Oct 03 01:19:56 2014 +0200
@@ -47,7 +47,7 @@
     set(OGRE_LIB_RELEASE_PATH "/Release")
   endif(APPLE AND OGRE_BUILD_PLATFORM_APPLE_IOS)
   if (APPLE)
-    set(OGRE_PLUGIN_PATH "/")
+    set(OGRE_PLUGIN_PATH "/OGRE")
   else()
     set(OGRE_PLUGIN_PATH "/OGRE")
   endif(APPLE)
@@ -79,11 +79,11 @@
 
 	if(EXPORT)
 	  install(TARGETS ${TARGETNAME} #EXPORT Ogre-exports
-		BUNDLE DESTINATION "bin${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None ""
-		RUNTIME DESTINATION "bin${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None ""
+    BUNDLE DESTINATION "bin" CONFIGURATIONS Release None ""
+    RUNTIME DESTINATION "bin" CONFIGURATIONS Release None ""
 		LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
 		ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-		FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELEASE_PATH}/Release" CONFIGURATIONS Release None ""
+		FRAMEWORK DESTINATION "Frameworks" CONFIGURATIONS Release None ""
       )
 	  install(TARGETS ${TARGETNAME} #EXPORT Ogre-exports
 		BUNDLE DESTINATION "bin${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
@@ -109,11 +109,11 @@
 	  #install(EXPORT Ogre-exports DESTINATION ${OGRE_LIB_DIRECTORY})
 	else()
 	  install(TARGETS ${TARGETNAME}
-		BUNDLE DESTINATION "bin${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None ""
-		RUNTIME DESTINATION "bin${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None ""
+    BUNDLE DESTINATION "bin" CONFIGURATIONS Release None ""
+    RUNTIME DESTINATION "bin" CONFIGURATIONS Release None ""
 		LIBRARY DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
 		ARCHIVE DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-		FRAMEWORK DESTINATION "${OGRE_LIB_DIRECTORY}${OGRE_RELEASE_PATH}/Release" CONFIGURATIONS Release None ""
+		FRAMEWORK DESTINATION "Frameworks" CONFIGURATIONS Release None ""
       )
 	  install(TARGETS ${TARGETNAME}
 		BUNDLE DESTINATION "bin${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
@@ -269,8 +269,8 @@
   
   if (APPLE)
     # On OS X, create .app bundle
-    set_property(TARGET ${SAMPLENAME} PROPERTY MACOSX_BUNDLE TRUE)
-    if (NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
+    if (OGRE_BUILD_LIBS_AS_FRAMEWORKS)
+      set_property(TARGET ${SAMPLENAME} PROPERTY MACOSX_BUNDLE TRUE)
       # Add the path where the Ogre framework was found
       if(${OGRE_FRAMEWORK_PATH})
         set_target_properties(${SAMPLENAME} PROPERTIES
diff -r edccf8cc52e3 CMakeLists.txt
--- a/CMakeLists.txt	Fri Jun 20 00:53:20 2014 +0200
+++ b/CMakeLists.txt	Fri Oct 03 01:19:56 2014 +0200
@@ -285,6 +285,7 @@
 cmake_dependent_option(OGRE_BUILD_XSIEXPORTER "Build the Softimage exporter" FALSE "Softimage_FOUND" FALSE)
 option(OGRE_BUILD_TESTS "Build the unit tests & PlayPen" FALSE)
 option(OGRE_CONFIG_DOUBLE "Use doubles instead of floats in Ogre" FALSE)
+cmake_dependent_option(OGRE_BUILD_LIBS_AS_FRAMEWORKS "Build frameworks for libraries on OS X." TRUE "APPLE;NOT OGRE_BUILD_PLATFORM_APPLE_IOS" FALSE)
 
 set(OGRE_CONFIG_ALLOCATOR 4 CACHE STRING
 "Specify the memory allocator to use. Possible values:
diff -r edccf8cc52e3 OgreMain/CMakeLists.txt
--- a/OgreMain/CMakeLists.txt	Fri Jun 20 00:53:20 2014 +0200
+++ b/OgreMain/CMakeLists.txt	Fri Oct 03 01:19:56 2014 +0200
@@ -707,27 +707,36 @@
     set_target_properties(OgreMain PROPERTIES INSTALL_NAME_DIR "OGRE")
   else ()
     set_target_properties(OgreMain PROPERTIES FRAMEWORK TRUE)
-    # Set the INSTALL_PATH so that Frameworks can be local
-    set_target_properties(OgreMain
-       PROPERTIES BUILD_WITH_INSTALL_RPATH 1
-       INSTALL_NAME_DIR "@executable_path/../Frameworks"
-    )
+
+    if (OGRE_BUILD_LIBS_AS_FRAMEWORKS)
+      # Set the INSTALL_PATH so that Frameworks can be local
+      set_target_properties(OgreMain
+         PROPERTIES BUILD_WITH_INSTALL_RPATH 1
+         INSTALL_NAME_DIR "@executable_path/../Frameworks"
+      )
+    endif (OGRE_BUILD_LIBS_AS_FRAMEWORKS)
+
     set_target_properties(OgreMain PROPERTIES PUBLIC_HEADER "${HEADER_FILES}")
 	set_target_properties(OgreMain PROPERTIES RESOURCE "${RESOURCE_FILES}")
 	set_source_files_properties("${RESOURCE_FILES}" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set_target_properties(OgreMain PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
     set_target_properties(OgreMain PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${OGRE_SOURCE_DIR}/OgreMain/include/OgreStableHeaders.h")
     set_target_properties(OgreMain PROPERTIES XCODE_ATTRIBUTE_GCC_UNROLL_LOOPS "YES")
+
+    if (OGRE_BUILD_LIBS_AS_FRAMEWORKS)
     add_custom_command(TARGET OgreMain POST_BUILD
       COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/Threading
 	  COMMAND ditto ${OGRE_SOURCE_DIR}/OgreMain/include/Threading/* ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/Threading/
       COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/OSX
       COMMAND ditto ${OGRE_SOURCE_DIR}/OgreMain/include/OSX/*.h ${OGRE_BINARY_DIR}/lib/$(CONFIGURATION)/Ogre.framework/Headers/OSX/	
 	)
+    endif (OGRE_BUILD_LIBS_AS_FRAMEWORKS)
   endif ()
 
   # Framework is called 'Ogre'
-  set_target_properties(OgreMain PROPERTIES	OUTPUT_NAME Ogre)
+  if (OGRE_BUILD_LIBS_AS_FRAMEWORKS)
+    set_target_properties(OgreMain PROPERTIES	OUTPUT_NAME Ogre)
+  endif ()
 endif ()
 target_link_libraries(OgreMain ${LIBRARIES})
 if (MINGW)
diff -r edccf8cc52e3 RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm
--- a/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm	Fri Jun 20 00:53:20 2014 +0200
+++ b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm	Fri Oct 03 01:19:56 2014 +0200
@@ -118,3 +118,3 @@
-        NameValuePairList::const_iterator opt(NULL);
+        NameValuePairList::const_iterator opt;
 		
         mIsFullScreen = fullScreen;
@@ -232,7 +232,7 @@
         }
         else
         {
-            NameValuePairList::const_iterator param_useNSView_pair(NULL);
+            NameValuePairList::const_iterator param_useNSView_pair;
             param_useNSView_pair = miscParams->find("macAPICocoaUseNSView");
 
             if(param_useNSView_pair != miscParams->end())