OGRE + Ogitor on Mac OS X 10.9

Discussion area about developing or extending OGRE, adding plugins for it or building applications on it. No newbie questions please, use the Help forum for that.
Post Reply
GreyHeli
Gnoblar
Posts: 1
Joined: Wed Jan 14, 2015 11:31 pm

OGRE + Ogitor on Mac OS X 10.9

Post by GreyHeli »

I'm new here. Long-time Cocoa/C++ developer.

After 2.5 days of hacking and downloading, I got OGRE 1.9 + Ogitor 0.54 to run on Mac OS X 10.9

OGRE + Ogitor looks like the best codebase for what I need:
MIT-style license
3d gizmo UI control ( works great! move! rotate! increase gizmo scale! )
3d scene editor with support for various file formats
multiple cameras, etc.


Here's my hg diff for OGRE and Ogitor.
Many OSX 10.9 bug fixes ( my edits so far are hacks... some need to be ifdefed )

ogitor hg diff:

Code: Select all

diff -r 24aed880f704 CMakeLists.txt
--- a/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -56,7 +56,7 @@
 
 set(OGITOR_PREPROCESSOR "OGITOR_EXPORT")
 
-set(OGITOR_QT_PREPROCESSOR "")
+set(OGITOR_QT_PREPROCESSOR "-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED")
 
 # Somehow, relative paths doesn't work on Linux when installing files..
 if(UNIX)
@@ -163,6 +163,12 @@
 endif(UNIX AND NOT APPLE)
 
 if(APPLE)
+    # KPK 2015 MAC OS X
+    if (NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
+        set(CMAKE_OSX_SYSROOT macosx10.9)
+        set(XCODE_ATTRIBUTE_SDKROOT macosx10.9)
+    endif(NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
+    
     # Newer ld versions need this linked explicitly
     find_package(Threads REQUIRED)
     add_definitions(${CMAKE_THREAD_LIBS_INIT})
diff -r 24aed880f704 CMakeModules/FindOGITOR.cmake
--- a/CMakeModules/FindOGITOR.cmake	Sun Jan 26 20:09:59 2014 +0100
+++ b/CMakeModules/FindOGITOR.cmake	Wed Jan 14 17:02:57 2015 -0600
@@ -45,7 +45,8 @@
 if(OGITOR_INCLUDE_DIR AND OGITOR_LIBRARY_REL AND OGITOR_LIBRARY_DBG)
 	set(OGITOR_FOUND TRUE)
 endif(OGITOR_INCLUDE_DIR AND OGITOR_LIBRARY_REL AND OGITOR_LIBRARY_DBG)
-set(OGITOR_LIBRARIES optimized ${OGITOR_LIBRARY_REL} debug ${OGITOR_LIBRARY_DBG})
+# KPK 2015 set(OGITOR_LIBRARIES optimized ${OGITOR_LIBRARY_REL} debug ${OGITOR_LIBRARY_DBG})
+set(OGITOR_LIBRARIES ${OGITOR_LIBRARY_REL})
 set(OGITOR_LIBRARIES ${OGITOR_LIBRARIES} CACHE STRING "Ogitor libraries")
 set(OGITOR_INCLUDE_DIRS ${OGITOR_INCLUDE_DIR})
 
diff -r 24aed880f704 CMakeModules/FindOGRE.cmake
--- a/CMakeModules/FindOGRE.cmake	Sun Jan 26 20:09:59 2014 +0100
+++ b/CMakeModules/FindOGRE.cmake	Wed Jan 14 17:02:57 2015 -0600
@@ -84,6 +84,7 @@
     ${ENV_PROGRAMFILES}/OGRE
     C:/OgreSDK
   )
+   message(STATUS "Looking for hello world3...")
 elseif (UNIX)
   set(OGRE_PREFIX_GUESSES
     /opt/ogre
@@ -94,13 +95,27 @@
     /usr/local/lib${LIB_SUFFIX}/OGRE
     $ENV{HOME}/ogre
     $ENV{HOME}/OGRE
-  )
+    
+     message(STATUS "Looking for hello world2...")
+  )  
 endif ()
+
+set(OGRE_PREFIX_GUESSES
+    /Projects/mbox/bonepile/ogre/ogre/build/sdk/lib/debug/Debug/
+    /Projects/mbox/bonepile/ogre/ogre/build
+    /Projects/mbox/bonepile/ogre/ogre/build/sdk/lib/
+    /Projects/mbox/bonepile/ogre/ogre/build/sdk/
+    /Users/kknauber
+   )
+
+
 set(OGRE_PREFIX_PATH
   ${OGRE_HOME} ${OGRE_SDK} ${ENV_OGRE_HOME} ${ENV_OGRE_SDK}
   ${OGRE_PREFIX_GUESSES}
 )
 
+message(STATUS "Looking for hello world3... ${OGRE_PREFIX_PATH} ")
+
 create_search_paths(OGRE)
 
 # If both OGRE_BUILD and OGRE_SOURCE are set, prepare to find Ogre in a build dir
@@ -115,9 +130,22 @@
   endforeach(dir)
   foreach(dir ${OGRE_PREFIX_BUILD})
     set(OGRE_INC_SEARCH_PATH ${dir}/include ${OGRE_INC_SEARCH_PATH})
-    set(OGRE_LIB_SEARCH_PATH ${dir}/lib ${OGRE_LIB_SEARCH_PATH})
+    if(APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
+        set(OGRE_LIB_SEARCH_PATH ${dir}/lib/macosx ${OGRE_LIB_SEARCH_PATH})
+    else()
+        set(OGRE_LIB_SEARCH_PATH ${dir}/lib ${OGRE_LIB_SEARCH_PATH})
+    endif()
+
+    if (OGRE_BUILD_PLATFORM_APPLE_IOS)
+        set(OGRE_LIB_SEARCH_PATH ${dir}/lib/iphoneos ${dir}/lib/iphonesimulator ${OGRE_LIB_SEARCH_PATH})
+    endif()
+
     set(OGRE_BIN_SEARCH_PATH ${dir}/bin ${OGRE_BIN_SEARCH_PATH})
     set(OGRE_BIN_SEARCH_PATH ${dir}/Samples/Common/bin ${OGRE_BIN_SEARCH_PATH})
+
+    if(APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
+      set(OGRE_BIN_SEARCH_PATH ${dir}/bin/macosx ${OGRE_BIN_SEARCH_PATH})
+    endif()
   endforeach(dir)
   
   if (OGRE_PREFIX_DEPENDENCIES_DIR)
@@ -137,7 +165,7 @@
   RenderSystem_Direct3D11 RenderSystem_Direct3D9 RenderSystem_GL RenderSystem_GL3Plus RenderSystem_GLES RenderSystem_GLES2)
 set(OGRE_RESET_VARS 
   OGRE_CONFIG_INCLUDE_DIR OGRE_INCLUDE_DIR 
-  OGRE_LIBRARY_FWK OGRE_LIBRARY_REL OGRE_LIBRARY_DBG
+  OGRE_FRAMEWORK_INCLUDES OGRE_FRAMEWORK_PATH OGRE_LIBRARY_FWK OGRE_LIBRARY_REL OGRE_LIBRARY_DBG
   OGRE_PLUGIN_DIR_DBG OGRE_PLUGIN_DIR_REL OGRE_MEDIA_DIR)
 foreach (comp ${OGRE_COMPONENTS})
   set(OGRE_RESET_VARS ${OGRE_RESET_VARS}
@@ -148,12 +176,13 @@
 set(OGRE_PREFIX_WATCH ${OGRE_PREFIX_PATH} ${OGRE_PREFIX_SOURCE} ${OGRE_PREFIX_BUILD})
 clear_if_changed(OGRE_PREFIX_WATCH ${OGRE_RESET_VARS})
 
+message(STATUS "try to find framework on OSX111")
 if(NOT OGRE_STATIC)
 	# try to locate Ogre via pkg-config
 	use_pkgconfig(OGRE_PKGC "OGRE${OGRE_LIB_SUFFIX}")
 
-	# try to find framework on OSX
-	findpkg_framework(OGRE)
+	message(STATUS "try to find framework on OSX")
+	findpkg_framework(Ogre)
 else()
 	set(OGRE_LIBRARY_FWK "")
 endif()
@@ -206,8 +235,9 @@
   set(OGRE_INCOMPATIBLE FALSE)
 endif ()
 
-find_library(OGRE_LIBRARY_REL NAMES ${OGRE_LIBRARY_NAMES} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "release" "relwithdebinfo" "minsizerel")
-find_library(OGRE_LIBRARY_DBG NAMES ${OGRE_LIBRARY_NAMES_DBG} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "debug")
+find_library(OGRE_LIBRARY_REL NAMES ${OGRE_LIBRARY_NAMES} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Release" "RelWithDebInfo" "MinSizeRel")
+find_library(OGRE_LIBRARY_DBG NAMES ${OGRE_LIBRARY_NAMES_DBG} HINTS ${OGRE_LIB_SEARCH_PATH} ${OGRE_PKGC_LIBRARY_DIRS} ${OGRE_FRAMEWORK_SEARCH_PATH} PATH_SUFFIXES "" "Debug")
+
 make_library_set(OGRE_LIBRARY)
 
 if(APPLE)
@@ -329,9 +359,9 @@
 if (NOT OGRE_STATIC)
 	if (WIN32)
 		find_file(OGRE_BINARY_REL NAMES "OgreMain.dll" HINTS ${OGRE_BIN_SEARCH_PATH}
-          PATH_SUFFIXES "" release relwithdebinfo minsizerel)
+          PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
 		find_file(OGRE_BINARY_DBG NAMES "OgreMain_d.dll" HINTS ${OGRE_BIN_SEARCH_PATH}
-          PATH_SUFFIXES "" debug )
+          PATH_SUFFIXES "" Debug )
 	endif()
 	mark_as_advanced(OGRE_BINARY_REL OGRE_BINARY_DBG)
 endif()
@@ -357,16 +387,16 @@
   find_path(OGRE_${COMPONENT}_INCLUDE_DIR NAMES ${HEADER} HINTS ${OGRE_INCLUDE_DIRS} ${OGRE_PREFIX_SOURCE} PATH_SUFFIXES ${COMPONENT} OGRE/${COMPONENT} Components/${COMPONENT}/include)
   set(OGRE_${COMPONENT}_LIBRARY_NAMES "Ogre${COMPONENT}${OGRE_LIB_SUFFIX}")
   get_debug_names(OGRE_${COMPONENT}_LIBRARY_NAMES)
-  find_library(OGRE_${COMPONENT}_LIBRARY_REL NAMES ${OGRE_${COMPONENT}_LIBRARY_NAMES} HINTS ${OGRE_LIBRARY_DIR_REL} PATH_SUFFIXES "" "release" "relwithdebinfo" "minsizerel")
-  find_library(OGRE_${COMPONENT}_LIBRARY_DBG NAMES ${OGRE_${COMPONENT}_LIBRARY_NAMES_DBG} HINTS ${OGRE_LIBRARY_DIR_DBG} PATH_SUFFIXES "" "debug")
+  find_library(OGRE_${COMPONENT}_LIBRARY_REL NAMES ${OGRE_${COMPONENT}_LIBRARY_NAMES} HINTS ${OGRE_LIBRARY_DIR_REL} ${OGRE_FRAMEWORK_PATH} PATH_SUFFIXES "" "Release" "RelWithDebInfo" "MinSizeRel")
+  find_library(OGRE_${COMPONENT}_LIBRARY_DBG NAMES ${OGRE_${COMPONENT}_LIBRARY_NAMES_DBG} HINTS ${OGRE_LIBRARY_DIR_DBG} ${OGRE_FRAMEWORK_PATH} PATH_SUFFIXES "" "Debug")
   make_library_set(OGRE_${COMPONENT}_LIBRARY)
   findpkg_finish(OGRE_${COMPONENT})
   if (OGRE_${COMPONENT}_FOUND)
     # find binaries
     if (NOT OGRE_STATIC)
 	  if (WIN32)
-	    find_file(OGRE_${COMPONENT}_BINARY_REL NAMES "Ogre${COMPONENT}.dll" HINTS ${OGRE_COMPONENT_SEARCH_PATH_REL} PATH_SUFFIXES "" bin bin/release bin/relwithdebinfo bin/minsizerel release)
-	    find_file(OGRE_${COMPONENT}_BINARY_DBG NAMES "Ogre${COMPONENT}_d.dll" HINTS ${OGRE_COMPONENT_SEARCH_PATH_DBG} PATH_SUFFIXES "" bin bin/debug debug)
+	    find_file(OGRE_${COMPONENT}_BINARY_REL NAMES "Ogre${COMPONENT}.dll" HINTS ${OGRE_COMPONENT_SEARCH_PATH_REL} PATH_SUFFIXES "" bin bin/Release bin/RelWithDebInfo bin/MinSizeRel Release)
+	    find_file(OGRE_${COMPONENT}_BINARY_DBG NAMES "Ogre${COMPONENT}_d.dll" HINTS ${OGRE_COMPONENT_SEARCH_PATH_DBG} PATH_SUFFIXES "" bin bin/Debug Debug)
 	  endif()
 	  mark_as_advanced(OGRE_${COMPONENT}_BINARY_REL OGRE_${COMPONENT}_BINARY_DBG)
     endif()
@@ -412,9 +442,9 @@
   get_debug_names(OGRE_${PLUGIN}_LIBRARY_NAMES)
   #set(OGRE_${PLUGIN}_LIBRARY_FWK ${OGRE_LIBRARY_FWK})
   find_library(OGRE_${PLUGIN}_LIBRARY_REL NAMES ${OGRE_${PLUGIN}_LIBRARY_NAMES}
-    HINTS "${OGRE_BUILD}/lib" ${OGRE_LIBRARY_DIRS} PATH_SUFFIXES "" OGRE opt release release/opt relwithdebinfo relwithdebinfo/opt minsizerel minsizerel/opt)
+    HINTS "${OGRE_BUILD}/lib" ${OGRE_LIBRARY_DIRS} ${OGRE_FRAMEWORK_PATH} PATH_SUFFIXES "" OGRE OGRE-${OGRE_VERSION} opt Release Release/opt RelWithDebInfo RelWithDebInfo/opt MinSizeRel MinSizeRel/opt)
   find_library(OGRE_${PLUGIN}_LIBRARY_DBG NAMES ${OGRE_${PLUGIN}_LIBRARY_NAMES_DBG}
-    HINTS "${OGRE_BUILD}/lib" ${OGRE_LIBRARY_DIRS} PATH_SUFFIXES "" OGRE opt debug debug/opt)
+    HINTS "${OGRE_BUILD}/lib" ${OGRE_LIBRARY_DIRS} ${OGRE_FRAMEWORK_PATH} PATH_SUFFIXES "" OGRE OGRE-${OGRE_VERSION} opt Debug Debug/opt)
   make_library_set(OGRE_${PLUGIN}_LIBRARY)
 
   if (OGRE_${PLUGIN}_LIBRARY OR OGRE_${PLUGIN}_INCLUDE_DIR)
@@ -442,9 +472,9 @@
 		  ${OGRE_BIN_SEARCH_PATH}
         )
         find_path(OGRE_PLUGIN_DIR_REL NAMES "${PLUGIN}.dll" HINTS ${OGRE_PLUGIN_SEARCH_PATH_REL}
-          PATH_SUFFIXES "" bin bin/release bin/relwithdebinfo bin/minsizerel release)
+          PATH_SUFFIXES "" bin bin/Release bin/RelWithDebInfo bin/MinSizeRel Release)
         find_path(OGRE_PLUGIN_DIR_DBG NAMES "${PLUGIN}_d.dll" HINTS ${OGRE_PLUGIN_SEARCH_PATH_DBG}
-          PATH_SUFFIXES "" bin bin/debug debug)
+          PATH_SUFFIXES "" bin bin/Debug Debug)
       elseif (UNIX)
         get_filename_component(OGRE_PLUGIN_DIR_TMP ${OGRE_${PLUGIN}_LIBRARY_REL} PATH)
         set(OGRE_PLUGIN_DIR_REL ${OGRE_PLUGIN_DIR_TMP} CACHE STRING "Ogre plugin dir (release)" FORCE)
diff -r 24aed880f704 CMakeModules/FindPkgMacros.cmake
--- a/CMakeModules/FindPkgMacros.cmake	Sun Jan 26 20:09:59 2014 +0100
+++ b/CMakeModules/FindPkgMacros.cmake	Wed Jan 14 17:02:57 2015 -0600
@@ -70,7 +70,9 @@
   if (${PREFIX}_FWK)
     set(${PREFIX} ${${PREFIX}_FWK})
   elseif (${PREFIX}_REL AND ${PREFIX}_DBG)
-    set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
+    # kpk 2015 remove optimized & debug tags
+    #  set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG})
+    set(${PREFIX} ${${PREFIX}_REL})
   elseif (${PREFIX}_REL)
     set(${PREFIX} ${${PREFIX}_REL})
   elseif (${PREFIX}_DBG)
@@ -127,6 +129,11 @@
       /System/Library/Frameworks
       /Network/Library/Frameworks
       /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.0.sdk/System/Library/Frameworks/
+      /Projects/mbox/bonepile/ogre/ogre/build/
+      /Projects/mbox/bonepile/ogre/ogre/build/sdk/lib/debug/Debug/
+      /Projects/mbox/bonepile/ogre/ogre/build/sdk/lib/debug/Debug//OgrePaging.framework/
+      /Projects/mbox/bonepile/ogre/ogre/build/sdk/lib/debug/Debug//OgrePaging.framework/Versions/1.10.0/
+      /Projects/mbox/bonepile/ogre/ogre/build/sdk/lib/
     )
     FOREACH(dir ${${fwk}_FRAMEWORK_PATH})
       SET(fwkpath ${dir}/${fwk}.framework)
diff -r 24aed880f704 CMakeModules/findscripts/FindOgitor.cmake
--- a/CMakeModules/findscripts/FindOgitor.cmake	Sun Jan 26 20:09:59 2014 +0100
+++ b/CMakeModules/findscripts/FindOgitor.cmake	Wed Jan 14 17:02:57 2015 -0600
@@ -59,7 +59,8 @@
     find_library(Ogitor_${COMPONENT_CASE}_LIBRARY_REL NAMES ${COMPONENT_CASE} libOg${COMPONENT_CASE} libOg${COMPONENT_CASE}.so ${COMPONENT_CASE}.lib HINTS $ENV{OGITORDIR} PATH_SUFFIXES ${suffixes}; lib/Release PATHS ${paths})
     find_library(Ogitor_${COMPONENT_CASE}_LIBRARY_DBG NAMES ${COMPONENT_CASE} libOg${COMPONENT_CASE} libOg${COMPONENT_CASE}.so ${COMPONENT_CASE}.lib HINTS $ENV{OGITORDIR} PATH_SUFFIXES ${suffixes}; lib/Debug PATHS ${paths})
 
-    set(Ogitor_${COMPONENT_CASE}_LIBRARY optimized ${Ogitor_${COMPONENT_CASE}_LIBRARY_REL} debug ${Ogitor_${COMPONENT_CASE}_LIBRARY_DBG})
+    # kpk 2015 APPLE remove optimized set(Ogitor_${COMPONENT_CASE}_LIBRARY optimized ${Ogitor_${COMPONENT_CASE}_LIBRARY_REL} debug ${Ogitor_${COMPONENT_CASE}_LIBRARY_DBG})
+    set(Ogitor_${COMPONENT_CASE}_LIBRARY ${Ogitor_${COMPONENT_CASE}_LIBRARY_REL})
 
     if (Ogitor_${COMPONENT_CASE}_LIBRARY_REL OR Ogitor_${COMPONENT_CASE}_LIBRARY_DBG AND Ogitor_${COMPONENT_CASE}_INCLUDE_DIR)
         set(Ogitor_${COMPONENT_CASE}_FOUND True)
@@ -75,8 +76,9 @@
 find_library(Ogitor_LIBRARY_REL NAMES DotSceneSerializer libDotSceneSerializer.so libDotSceneSerializer.lib HINTS $ENV{OGITORDIR} PATH_SUFFIXES ${suffixes}; lib/Release PATHS ${paths})
 find_library(Ogitor_LIBRARY_DBG NAMES DotSceneSerializer libDotSceneSerializer.so libDotSceneSerializer.lib HINTS $ENV{OGITORDIR} PATH_SUFFIXES ${suffixes}; lib/Debug PATHS ${paths})
 
-set(Ogitor_LIBRARIES optimized ${Ogitor_LIBRARY_REL} ${Ogitor_COMPONENTS_LIBRARY_REL} debug ${Ogitor_LIBRARY_DBG} ${Ogitor_COMPONENTS_LIBRARY_DBG})
-
+# kpk 2015 APPLE remove optimized set(Ogitor_LIBRARIES optimized ${Ogitor_LIBRARY_REL} ${Ogitor_COMPONENTS_LIBRARY_REL} debug ${Ogitor_LIBRARY_DBG} ${Ogitor_COMPONENTS_LIBRARY_DBG})
+set(Ogitor_LIBRARIES ${Ogitor_LIBRARY_REL} ${Ogitor_COMPONENTS_LIBRARY_REL})
+ 
 set(Ogitor_FOUND False)
 if (Ogitor_LIBRARIES AND Ogitor_INCLUDE_DIR)
     set(Ogitor_FOUND True)
diff -r 24aed880f704 Dependencies/GenericImageEditor/CMakeLists.txt
--- a/Dependencies/GenericImageEditor/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/GenericImageEditor/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -5,7 +5,7 @@
 project(GenericImageEditor)
 
 set(QT_MIN_VERSION "4.5.0")
-find_package(Qt4 COMPONENTS QtSvg REQUIRED)
+find_package(Qt4 COMPONENTS QtSvg QtGui QtCore REQUIRED)
 
 if(NOT QT4_FOUND)
     MESSAGE(SEND_ERROR "Failed to find Qt 4.5 or greater.")
diff -r 24aed880f704 Dependencies/GenericImageEditor/include/iimageeditorcodec.hxx
--- a/Dependencies/GenericImageEditor/include/iimageeditorcodec.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/GenericImageEditor/include/iimageeditorcodec.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -39,7 +39,9 @@
 #include <QtGui/QKeyEvent>
 #include <QtGui/QToolBar>
 
+#ifndef Q_MOC_RUN
 #include <Ogre.h>
+#endif
 
 //----------------------------------------------------------------------------------------
 
diff -r 24aed880f704 Dependencies/GenericTextEditor/CMakeLists.txt
--- a/Dependencies/GenericTextEditor/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/GenericTextEditor/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -5,7 +5,7 @@
 project(GenericTextEditor)
 
 set(QT_MIN_VERSION "4.5.0")
-find_package(Qt4 COMPONENTS QtSvg REQUIRED)
+find_package(Qt4 COMPONENTS QtSvg QtGui QtCore REQUIRED)
 
 if(NOT QT4_FOUND)
     MESSAGE(SEND_ERROR "Failed to find Qt 4.5 or greater.")
diff -r 24aed880f704 Dependencies/ImageConverter/CMakeLists.txt
--- a/Dependencies/ImageConverter/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/ImageConverter/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -5,7 +5,7 @@
 project(ImageConverter)
 
 set(QT_MIN_VERSION "4.5.0")
-find_package(Qt4 COMPONENTS QtSvg REQUIRED)
+find_package(Qt4 COMPONENTS QtSvg REQUIRED QtGui REQUIRED QtCore REQUIRED)
 
 if(NOT QT4_FOUND)
     MESSAGE(SEND_ERROR "Failed to find Qt 4.5 or greater.")
diff -r 24aed880f704 Dependencies/ImageConverter/src/imageconverter.cpp
--- a/Dependencies/ImageConverter/src/imageconverter.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/ImageConverter/src/imageconverter.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -30,7 +30,6 @@
 /// THE SOFTWARE.
 ////////////////////////////////////////////////////////////////////////////////*/
 
-
 #include "imageconverter.hxx"
 
 #include "OgitorsRoot.h"
diff -r 24aed880f704 Dependencies/OFS/include/ofs13.h
--- a/Dependencies/OFS/include/ofs13.h	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/OFS/include/ofs13.h	Wed Jan 14 17:02:57 2015 -0600
@@ -264,7 +264,7 @@
 

 	  return (strcasecmp( elem1.name.c_str(), elem2.name.c_str() ) < 0 ) ;

 #else

-	  return (_strcmpi(elem1.name.c_str(), elem2.name.c_str()) < 0);

+	  return (strcmp(elem1.name.c_str(), elem2.name.c_str()) < 0);

 #endif

 	  

         };

diff -r 24aed880f704 Dependencies/OFS/include/ofs_base.h
--- a/Dependencies/OFS/include/ofs_base.h	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/OFS/include/ofs_base.h	Wed Jan 14 17:02:57 2015 -0600
@@ -347,7 +347,7 @@
 
         static bool Compare(FileEntry elem1, FileEntry elem2)
         {
-#ifdef linux
+#if defined(linux) || defined(__MAC_10_0)
 	return (strcasecmp(elem1.name.c_str(), elem2.name.c_str()) < 0);
 #else
 	return (_strcmpi(elem1.name.c_str(), elem2.name.c_str()) < 0);
diff -r 24aed880f704 Dependencies/OFS/source/ofs.cpp
--- a/Dependencies/OFS/source/ofs.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/OFS/source/ofs.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -293,7 +293,7 @@
         if(it == mAllocatedHandles.end())
         {
             std::string extension = file_name.substr(file_name.size() - 4);
-#ifdef linux
+#if defined(linux) || defined(__MAC_10_0)
 	        int result = strcasecmp(extension.c_str(), ".ofs");
 #else
 	        int result = _strcmpi(extension.c_str(), ".ofs");
diff -r 24aed880f704 Dependencies/PagedGeometry/source/BatchPage.cpp
--- a/Dependencies/PagedGeometry/source/BatchPage.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/PagedGeometry/source/BatchPage.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -25,6 +25,8 @@
 #include <OgreHighLevelGpuProgram.h>
 #include <OgreHighLevelGpuProgramManager.h>
 #include <OgreLogManager.h>
+#include <OgreTechnique.h>
+
 using namespace Ogre;
 
 namespace Forests {
diff -r 24aed880f704 Dependencies/PagedGeometry/source/BatchedGeometry.cpp
--- a/Dependencies/PagedGeometry/source/BatchedGeometry.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/PagedGeometry/source/BatchedGeometry.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -471,7 +471,7 @@
 				case VET_COLOUR_ABGR:
 					break;
 				default:
-					OGRE_EXCEPT(0, "Unknown RenderSystem color format", "BatchedGeometry::SubBatch::addSubMesh()");
+            OGRE_EXCEPT(Exception::ERR_CANNOT_WRITE_TO_FILE, "Unknown RenderSystem color format", "BatchedGeometry::SubBatch::addSubMesh()");
 					break;
 		}
 	}
@@ -542,8 +542,8 @@
 
 		}
 
-		Pass *p = material->getTechnique(0)->getPass(0);
-		p->setVertexColourTracking(TVC_AMBIENT);
+		// kpk tbd Pass *p = material->getTechnique(0)->getPass(0);
+		// kpk tbd p->setVertexColourTracking(TVC_AMBIENT);
 	}
 
 	//For each queued mesh...
diff -r 24aed880f704 Dependencies/PagedGeometry/source/GrassLoader.cpp
--- a/Dependencies/PagedGeometry/source/GrassLoader.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/PagedGeometry/source/GrassLoader.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -35,6 +35,9 @@
 #include "OgreRenderSystemCapabilities.h"
 #include "OgreHighLevelGpuProgram.h"
 #include "OgreHighLevelGpuProgramManager.h"
+#include <OgreTechnique.h>
+#include <OgreSceneNode.h>
+
 using namespace Ogre;
 
 #include <limits> //for numeric_limits
@@ -1380,7 +1383,9 @@
                 //(depending on whether or not it was already generated).
 
                 //Apply the shader to the material
-                Pass *pass = tmpMat->getTechnique(0)->getPass(0);
+               Technique *tech = tmpMat->getTechnique(0);
+               
+                Pass *pass = tech->getPass(0);
                 pass->setVertexProgram(vsName);
                 GpuProgramParametersSharedPtr params = pass->getVertexProgramParameters();
 
diff -r 24aed880f704 Dependencies/PagedGeometry/source/ImpostorPage.cpp
--- a/Dependencies/PagedGeometry/source/ImpostorPage.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/PagedGeometry/source/ImpostorPage.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -24,6 +24,9 @@
 #include <OgreEntity.h>
 #include <OgreSubEntity.h>
 #include <OgreHardwarePixelBuffer.h>
+#include <OgreTechnique.h>
+#include <OgreViewport.h>
+
 using namespace Ogre;
 
 namespace Forests {
diff -r 24aed880f704 Dependencies/PagedGeometry/source/PagedGeometry.cpp
--- a/Dependencies/PagedGeometry/source/PagedGeometry.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/PagedGeometry/source/PagedGeometry.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -158,7 +158,7 @@
 void PagedGeometry::setPageSize(Real size)
 {
 	if (!managerList.empty())
-		OGRE_EXCEPT(0, "PagedGeometry::setPageSize() cannot be called after detail levels have been added. Call removeDetailLevels() first.", "PagedGeometry::setPageSize()");
+      OGRE_EXCEPT(Exception::ExceptionCodes(0), "PagedGeometry::setPageSize() cannot be called after detail levels have been added. Call removeDetailLevels() first.", "PagedGeometry::setPageSize()");
 
 	pageSize = size;
 }
@@ -166,7 +166,7 @@
 void PagedGeometry::setInfinite()
 {
 	if (!managerList.empty())
-		OGRE_EXCEPT(0, "PagedGeometry::setInfinite() cannot be called after detail levels have been added. Call removeDetailLevels() first.", "PagedGeometry::setInfinite()");
+		OGRE_EXCEPT(Exception::ExceptionCodes(0), "PagedGeometry::setInfinite() cannot be called after detail levels have been added. Call removeDetailLevels() first.", "PagedGeometry::setInfinite()");
 
 	m_bounds = TBounds(0, 0, 0, 0);
 }
@@ -174,7 +174,7 @@
 void PagedGeometry::setBounds(TBounds bounds)
 {
 	if (!managerList.empty())
-		OGRE_EXCEPT(0, "PagedGeometry::setBounds() cannot be called after detail levels have been added. Call removeDetailLevels() first.", "PagedGeometry::setBounds()");
+		OGRE_EXCEPT(Exception::ExceptionCodes(0), "PagedGeometry::setBounds() cannot be called after detail levels have been added. Call removeDetailLevels() first.", "PagedGeometry::setBounds()");
 	if (!Math::RealEqual(bounds.width(), bounds.height(), 0.01f))
 		OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "Bounds must be square", "PagedGeometry::setBounds()");
 	if (bounds.width() <= 0 || bounds.height() <=0)
@@ -357,7 +357,7 @@
 
 	//Error check
 	if (maxRange <= minRange){
-		OGRE_EXCEPT(1, "Closer detail levels must be added before farther ones", "PagedGeometry::addDetailLevel()");
+		OGRE_EXCEPT(Exception::ExceptionCodes(1), "Closer detail levels must be added before farther ones", "PagedGeometry::addDetailLevel()");
 	}
 
 	//Setup the new manager
diff -r 24aed880f704 Dependencies/PagedGeometry/source/PropertyMaps.cpp
--- a/Dependencies/PagedGeometry/source/PropertyMaps.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/PagedGeometry/source/PropertyMaps.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -106,7 +106,7 @@
 			case CHANNEL_GREEN: channelOffset = rgba_shift[1] / 8; break;
 			case CHANNEL_BLUE: channelOffset = rgba_shift[2] / 8; break;
 			case CHANNEL_ALPHA: channelOffset = rgba_shift[3] / 8; break;
-			default: OGRE_EXCEPT(0, "Invalid channel", "GrassLayer::setDensityMap()"); break;
+         default: OGRE_EXCEPT(Exception::ERR_INVALID_STATE, "Invalid channel", "GrassLayer::setDensityMap()"); break;
 		}
 
 		//And copy that channel into the density map
@@ -272,7 +272,7 @@
 				channel = CHANNEL_RED;
 			break;
 		default:
-			OGRE_EXCEPT(0, "Unknown RenderSystem color format", "GrassLayer::setColorMap()");
+			OGRE_EXCEPT(Exception::ERR_CANNOT_WRITE_TO_FILE, "Unknown RenderSystem color format", "GrassLayer::setColorMap()");
 			break;
 	}
 
@@ -295,7 +295,7 @@
 			case CHANNEL_GREEN: channelOffset = 2; break;
 			case CHANNEL_BLUE: channelOffset = 1; break;
 			case CHANNEL_ALPHA: channelOffset = 0; break;
-			default: OGRE_EXCEPT(0, "Invalid channel", "ColorMap::ColorMap()"); break;
+			default: OGRE_EXCEPT(Exception::ERR_CANNOT_WRITE_TO_FILE, "Invalid channel", "ColorMap::ColorMap()"); break;
 		}
 
 		//And copy that channel into the density map
diff -r 24aed880f704 Dependencies/PagedGeometry/source/StaticBillboardSet.cpp
--- a/Dependencies/PagedGeometry/source/StaticBillboardSet.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/PagedGeometry/source/StaticBillboardSet.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -37,6 +37,8 @@
 #include <OgreHardwareBuffer.h>
 #include <OgreLogManager.h>
 #include <OgreEntity.h>
+#include <OgreTechnique.h>
+
 using namespace Ogre;
 
 namespace Forests {
diff -r 24aed880f704 Dependencies/PagedGeometry/source/TreeLoader2D.cpp
--- a/Dependencies/PagedGeometry/source/TreeLoader2D.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/PagedGeometry/source/TreeLoader2D.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -543,7 +543,7 @@
 {
 	//Out of bounds check
 	if (!hasMore)
-		OGRE_EXCEPT(1, "Cannot read past end of TreeIterator list", "TreeIterator::moveNext()");
+		OGRE_EXCEPT(Exception::ExceptionCodes(1), "Cannot read past end of TreeIterator list", "TreeIterator::moveNext()");
 
 	//Preserve the last tree
 	prevTreeDat = currentTreeDat;
diff -r 24aed880f704 Dependencies/PagedGeometry/source/TreeLoader3D.cpp
--- a/Dependencies/PagedGeometry/source/TreeLoader3D.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/PagedGeometry/source/TreeLoader3D.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -527,7 +527,8 @@
 {
 	//Out of bounds check
 	if (!hasMore)
-		OGRE_EXCEPT(1, "Cannot read past end of TreeIterator list", "TreeIterator::moveNext()");
+      abort(); // kpk tbd
+	// kpk tbd	OGRE_EXCEPT(1, "Cannot read past end of TreeIterator list", "TreeIterator::moveNext()");
 
 	//Preserve the last tree
 	prevTreeDat = currentTreeDat;
diff -r 24aed880f704 Dependencies/PagedGeometry/source/WindBatchPage.cpp
--- a/Dependencies/PagedGeometry/source/WindBatchPage.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/PagedGeometry/source/WindBatchPage.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -24,6 +24,7 @@
 #include <OgreRenderSystemCapabilities.h>
 #include <OgreHighLevelGpuProgram.h>
 #include <OgreHighLevelGpuProgramManager.h>
+#include <OgreTechnique.h>
 
 // to dump the shader source in a file
 #include <fstream>
diff -r 24aed880f704 Dependencies/PagedGeometry/source/WindBatchedGeometry.cpp
--- a/Dependencies/PagedGeometry/source/WindBatchedGeometry.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Dependencies/PagedGeometry/source/WindBatchedGeometry.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -175,9 +175,9 @@
 
 		}
 
-		Pass *p = material->getTechnique(0)->getPass(0);
+		// kpk tbd Pass *p = material->getTechnique(0)->getPass(0);
 
-		p->setVertexColourTracking(TVC_AMBIENT);
+		// kpk tbd p->setVertexColourTracking(TVC_AMBIENT);
 	}
 
 	std::string entityName;
diff -r 24aed880f704 Mac/plugins.cfg
--- a/Mac/plugins.cfg	Sun Jan 26 20:09:59 2014 +0100
+++ b/Mac/plugins.cfg	Wed Jan 14 17:02:57 2015 -0600
@@ -2,10 +2,16 @@
 PluginFolder=
 
 # Define plugins
-Plugin=libPlugin_CgProgramManager
-Plugin=libRenderSystem_GL
-Plugin=libPlugin_ParticleFX
-Plugin=libPlugin_OctreeSceneManager
+# KPK 2015 these are frameworks, not plugins (NOT dylibs)?? 
+#  Plugin=libPlugin_CgProgramManager
+#  Plugin=libRenderSystem_GL
+#  Plugin=libPlugin_ParticleFX
+#  Plugin=libPlugin_OctreeSceneManager
+   Plugin=Plugin_CgProgramManager
+   Plugin=RenderSystem_GL
+   Plugin=Plugin_ParticleFX
+   Plugin=Plugin_OctreeSceneManager
+
 Plugin=libOgreOfsPlugin
 
 
diff -r 24aed880f704 Ogitor/include/OgitorsDefinitions.h
--- a/Ogitor/include/OgitorsDefinitions.h	Sun Jan 26 20:09:59 2014 +0100
+++ b/Ogitor/include/OgitorsDefinitions.h	Wed Jan 14 17:02:57 2015 -0600
@@ -116,7 +116,7 @@
     typedef OgitorExport Ogre::vector<CBaseEditor*>::type ObjectVector;
 
     /// A Hashed by Name Storage Definition for All Editors
-    typedef OgitorExport HashMap<Ogre::String, CBaseEditor*> NameObjectPairList;
+    typedef OgitorExport OGRE_HashMap<Ogre::String, CBaseEditor*> NameObjectPairList;
 
     /** Load state enumeration */
     enum LoadState
diff -r 24aed880f704 Ogitor/include/OgitorsPrerequisites.h
--- a/Ogitor/include/OgitorsPrerequisites.h	Sun Jan 26 20:09:59 2014 +0100
+++ b/Ogitor/include/OgitorsPrerequisites.h	Wed Jan 14 17:02:57 2015 -0600
@@ -88,8 +88,9 @@
 
     class TiXmlElement;
 
-
+#ifndef Q_MOC_RUN
 #include <Ogre.h>
+#endif
 #include "OgitorsDefinitions.h"
 #include "StringId.h"
 #include "Event.h"
diff -r 24aed880f704 Ogitor/include/OgitorsRoot.h
--- a/Ogitor/include/OgitorsRoot.h	Sun Jan 26 20:09:59 2014 +0100
+++ b/Ogitor/include/OgitorsRoot.h	Wed Jan 14 17:02:57 2015 -0600
@@ -128,9 +128,9 @@
     };
 
     // A Hashed by Name Storage Definition for All Serializers
-    typedef OgitorExport HashMap<Ogre::String,CBaseSerializer*> SerializerMap;
+    typedef OgitorExport OGRE_HashMap<Ogre::String,CBaseSerializer*> SerializerMap;
 
-    typedef HashMap<Ogre::String, OgitorsScriptInterpreter*> ScriptInterpreterMap;
+    typedef OGRE_HashMap<Ogre::String, OgitorsScriptInterpreter*> ScriptInterpreterMap;
 
     typedef Ogre::map<unsigned int, CBaseEditor*>::type IDObjectPairList;
     
diff -r 24aed880f704 Ogitor/src/OgitorsRoot.cpp
--- a/Ogitor/src/OgitorsRoot.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Ogitor/src/OgitorsRoot.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -209,7 +209,7 @@
                         col);
                     solidColourMaterials[i]->load();
                 }
-                str.str(Ogre::StringUtil::BLANK);
+                str.str(Ogre::BLANKSTRING); // kpk http://www.ogre3d.org/forums/viewtopic.php?f=2&t=80907
                 str << "GesWireCol" << i;
                 wireColourMaterials[i] = Ogre::MaterialManager::getSingleton().getByName(str.str());
                 if (wireColourMaterials[i].isNull())
@@ -230,7 +230,7 @@
                         col);
                     wireColourMaterials[i]->load();
                 }
-                str.str(Ogre::StringUtil::BLANK);
+                str.str(Ogre::BLANKSTRING); // kpk http://www.ogre3d.org/forums/viewtopic.php?f=2&t=80907
                 str << "GesHiddenLineCol" << i;
                 hiddenLineColourMaterials[i] = Ogre::MaterialManager::getSingleton().getByName(str.str());
                 if (hiddenLineColourMaterials[i].isNull())
diff -r 24aed880f704 Ogitor/src/OgitorsRootRegExp.cpp
--- a/Ogitor/src/OgitorsRootRegExp.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Ogitor/src/OgitorsRootRegExp.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -33,7 +33,6 @@
 #include "OgitorsPrerequisites.h"
 #include "OgitorsRoot.h"
 #include "BaseEditor.h"
-
 #include <boost/regex.hpp>
 
 using namespace Ogre;
diff -r 24aed880f704 Ogitor/src/OgitorsRootUtilityFunctions.cpp
--- a/Ogitor/src/OgitorsRootUtilityFunctions.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/Ogitor/src/OgitorsRootUtilityFunctions.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -1475,7 +1475,7 @@
     mModelNames.clear();
     mModelNames.push_back(PropertyOption("",Ogre::Any(Ogre::String(""))));
 
-    HashMap<Ogre::String, int> tmpEntityList;
+    OGRE_HashMap<Ogre::String, int> tmpEntityList;
 
     Ogre::StringVectorPtr pList = Ogre::ResourceGroupManager::getSingleton().findResourceNames(PROJECT_RESOURCE_GROUP,"*.mesh",false);
 
@@ -1485,12 +1485,12 @@
         addstr.erase(addstr.find(".mesh"), 5);
 
         if(tmpEntityList.find(addstr) == tmpEntityList.end())
-            tmpEntityList.insert(HashMap<Ogre::String, int>::value_type(addstr, 0));
+            tmpEntityList.insert(OGRE_HashMap<Ogre::String, int>::value_type(addstr, 0));
     }
 
     pList.setNull();
 
-    HashMap<Ogre::String, int>::iterator eit = tmpEntityList.begin();
+    OGRE_HashMap<Ogre::String, int>::iterator eit = tmpEntityList.begin();
     while(eit != tmpEntityList.end())
     {
         mModelNames.push_back(PropertyOption(eit->first,Ogre::Any(eit->first)));
@@ -1663,7 +1663,7 @@
         mModelNames.clear();
         mModelNames.push_back(PropertyOption("", Ogre::Any(Ogre::String(""))));
 
-        HashMap<Ogre::String, int> tmpEntityList;
+        OGRE_HashMap<Ogre::String, int> tmpEntityList;
         
         Ogre::StringVectorPtr pList = Ogre::ResourceGroupManager::getSingleton().findResourceNames(PROJECT_RESOURCE_GROUP, "*.mesh", false);
     
@@ -1673,12 +1673,12 @@
             addstr.erase(addstr.find(".mesh"), 5);
 
             if(tmpEntityList.find(addstr) == tmpEntityList.end())
-                tmpEntityList.insert(HashMap<Ogre::String, int>::value_type(addstr, 0));
+                tmpEntityList.insert(OGRE_HashMap<Ogre::String, int>::value_type(addstr, 0));
         }
 
         pList.setNull();
 
-        HashMap<Ogre::String, int>::iterator eit = tmpEntityList.begin();
+        OGRE_HashMap<Ogre::String, int>::iterator eit = tmpEntityList.begin();
         while(eit != tmpEntityList.end())
         {
             mModelNames.push_back(PropertyOption(eit->first, Ogre::Any(eit->first)));
diff -r 24aed880f704 OgreOfsPlugin/CMakeLists.txt
--- a/OgreOfsPlugin/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/OgreOfsPlugin/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -1,5 +1,5 @@
 project(OgreOfsPlugin)
-
+	
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../Dependencies/OFS/include")
 include_directories(include)
 
diff -r 24aed880f704 OgreOfsPlugin/include/OfsFileSystem.h
--- a/OgreOfsPlugin/include/OfsFileSystem.h	Sun Jan 26 20:09:59 2014 +0100
+++ b/OgreOfsPlugin/include/OfsFileSystem.h	Wed Jan 14 17:02:57 2015 -0600
@@ -94,13 +94,13 @@
         void unload();
 
         /// @copydoc Archive::open
-        DataStreamPtr open(const String& filename, bool readOnly = true) const;
+        DataStreamPtr open(const String& filename, bool readOnly = true); // kpk 2015 remove const to match OgreArchive.h *sigh*
 
 		/// @copydoc Archive::create
-		DataStreamPtr create(const String& filename) const;
+       DataStreamPtr create(const String& filename); // kpk 2015 remove const to match OgreArchive.h *sigh*
 
 		/// @copydoc Archive::delete
-		void remove(const String& filename) const;
+       void remove(const String& filename); // kpk 2015 remove const to match OgreArchive.h *sigh*
 
 		/// @copydoc Archive::list
         StringVectorPtr list(bool recursive = true, bool dirs = false);
@@ -114,7 +114,7 @@
 
         /// @copydoc Archive::findFileInfo
         FileInfoListPtr findFileInfo(const String& pattern, bool recursive = true,
-            bool dirs = false) const;
+                                     bool dirs = false); // kpk 2015 remove const to match OgreArchive.h *sigh*
 
         /// @copydoc Archive::exists
         bool exists(const String& filename);
diff -r 24aed880f704 OgreOfsPlugin/src/OfsFileSystem.cpp
--- a/OgreOfsPlugin/src/OfsFileSystem.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/OgreOfsPlugin/src/OfsFileSystem.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -36,8 +36,8 @@
 #include "OgreException.h"
 #include "OgreStringVector.h"
 #include "OgreRoot.h"
-
 #include <boost/regex.hpp>
+#include "OgreArchive.h"
 
 namespace Ogre {
 
@@ -102,7 +102,7 @@
                 else if (detailList)
                 {
                     FileInfo fi;
-                    fi.archive = this;
+                    fi.archive = (Archive *)this;
                     fi.filename = directory + retList[i].name;
                     fi.basename = retList[i].name;
                     fi.path = directory;
@@ -132,7 +132,7 @@
                         else if (detailList)
                         {
                             FileInfo fi;
-                            fi.archive = this;
+                            fi.archive = (Archive *)this;
                             fi.filename = directory + retList[i].name;
                             fi.basename = retList[i].name;
                             fi.path = directory;
@@ -251,7 +251,7 @@
         mOfs.unmount();
     }
     //-----------------------------------------------------------------------
-    DataStreamPtr OFSArchive::open(const String& filename, bool readOnly) const
+    DataStreamPtr OFSArchive::open(const String& filename, bool readOnly) // kpk 2015 remove const to match OgreArchive.h *sigh*
     {
         String name = concatenate_path(mDir, filename);
 
@@ -280,7 +280,7 @@
         return DataStreamPtr(stream);
     }
 	//---------------------------------------------------------------------
-	DataStreamPtr OFSArchive::create(const String& filename) const
+	DataStreamPtr OFSArchive::create(const String& filename) // kpk 2015 remove const to match OgreArchive.h *sigh*
 	{
 		if (isReadOnly())
 		{
@@ -311,7 +311,7 @@
         return DataStreamPtr(stream);
 	}
 	//---------------------------------------------------------------------
-	void OFSArchive::remove(const String& filename) const
+	void OFSArchive::remove(const String& filename) // kpk 2015 remove const to match OgreArchive.h *sigh*
 	{
 		if (isReadOnly())
 		{
@@ -361,7 +361,7 @@
     }
     //-----------------------------------------------------------------------
     FileInfoListPtr OFSArchive::findFileInfo(const String& pattern, 
-        bool recursive, bool dirs) const
+        bool recursive, bool dirs) // kpk 2015 remove const to match OgreArchive.h *sigh*
     {
 		// Note that we have to tell the SharedPtr to use OGRE_DELETE_T not OGRE_DELETE by passing category
 		FileInfoListPtr ret(OGRE_NEW_T(FileInfoList, MEMCATEGORY_GENERAL)(), SPFM_DELETE_T);
diff -r 24aed880f704 Plugins/OgAngelDialogManager/CMakeLists.txt
--- a/Plugins/OgAngelDialogManager/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/Plugins/OgAngelDialogManager/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -5,7 +5,7 @@
 project(OgAngelDialogManager)
 
 set(QT_MIN_VERSION "4.5.0")
-find_package(Qt4 COMPONENTS QtSvg REQUIRED)
+find_package(Qt4 COMPONENTS QtSvg QtGui QtCore REQUIRED)
 
 if(NOT QT4_FOUND)
 	message(SEND_ERROR "Failed to find Qt 4.5 or greater.")
diff -r 24aed880f704 Plugins/OgMaterialEditor/CMakeLists.txt
--- a/Plugins/OgMaterialEditor/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/Plugins/OgMaterialEditor/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -5,7 +5,7 @@
 project(OgMaterialEditor)
 
 set(QT_MIN_VERSION "4.5.0")
-find_package(Qt4 COMPONENTS QtSvg REQUIRED)
+find_package(Qt4 COMPONENTS QtSvg QtGui QtCore REQUIRED)
 
 if(NOT QT4_FOUND)
 	message(SEND_ERROR "Failed to find Qt 4.5 or greater.")
diff -r 24aed880f704 Plugins/OgMaterialEditor/materialtexteditorcodec.hxx
--- a/Plugins/OgMaterialEditor/materialtexteditorcodec.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/Plugins/OgMaterialEditor/materialtexteditorcodec.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -38,9 +38,10 @@
 
 #include <QtGui/QAction>
 
+#ifndef Q_MOC_RUN
 #include <OgreString.h>
 #include <OgreScriptCompiler.h>
-
+#endif
 //----------------------------------------------------------------------------------------
 class MaterialTextEditorCodecToolBar : public QToolBar
 {
diff -r 24aed880f704 Plugins/OgModularZone/CMakeLists.txt
--- a/Plugins/OgModularZone/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/Plugins/OgModularZone/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -5,7 +5,7 @@
 project(OgModularZone)
 
 set(QT_MIN_VERSION "4.6.0")
-find_package(Qt4 COMPONENTS QtSvg REQUIRED)
+find_package(Qt4 COMPONENTS QtSvg QtGui QtCore REQUIRED)
 
 if(NOT QT4_FOUND)
 	message(SEND_ERROR "Failed to find Qt 4.5 or greater.")
@@ -48,7 +48,7 @@
 		portalsizedialog.hxx
 	)
 
-	qt4_wrap_cpp(MOC_SRCS ${MOC_SRCS2})
+   qt4_wrap_cpp(MOC_SRCS ${MOC_SRCS2} OPTIONS ${OGITOR_QT_PREPROCESSOR})
 	qt4_wrap_ui(UI_SRCS ${UI_FILES})
 
 	source_group("Moc Files" FILES ${MOC_SRCS})
diff -r 24aed880f704 Plugins/OgModularZone/ModularZoneToolbar.hxx
--- a/Plugins/OgModularZone/ModularZoneToolbar.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/Plugins/OgModularZone/ModularZoneToolbar.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -26,7 +26,9 @@
 #include <QtGui/QGroupBox>
 #include <QtGui/QComboBox>
 #include <QtGui/QAction>
+#ifndef Q_MOC_RUN
 #include <Ogre.h>
+#endif
 #include "ZoneListWidget.hxx"
 
 namespace MZP
diff -r 24aed880f704 Plugins/OgModularZone/exportzonedialog.hxx
--- a/Plugins/OgModularZone/exportzonedialog.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/Plugins/OgModularZone/exportzonedialog.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -3,8 +3,9 @@
 
 #include <QtGui/QDialog>
 #include "ui_exportzonedialog.h"
+#ifndef Q_MOC_RUN
 #include "OgreString.h"
-
+#endif
 //namespace Ui {
 //    class ExportZoneDialog;
 //}
diff -r 24aed880f704 Plugins/OgModularZone/portalsizedialog.hxx
--- a/Plugins/OgModularZone/portalsizedialog.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/Plugins/OgModularZone/portalsizedialog.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -3,7 +3,9 @@
 
 //#include <QtGui/QMainWindow>
 #include <QtGui/QDialog>
-#include "PortalEditor.h"
+#ifndef Q_MOC_RUN
+   #include "PortalEditor.h"
+#endif
 
 namespace Ui
 {
diff -r 24aed880f704 Plugins/OgQtExample/CMakeLists.txt
--- a/Plugins/OgQtExample/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/Plugins/OgQtExample/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -5,7 +5,7 @@
 project(ogQtExample)
 
 set(QT_MIN_VERSION "4.5.0")
-find_package(Qt4 COMPONENTS QtSvg REQUIRED)
+find_package(Qt4 COMPONENTS QtSvg QtGui QtCore REQUIRED)
 
 find_package(OGITOR REQUIRED)
 
diff -r 24aed880f704 Plugins/OgScreenEffectEditor/CMakeLists.txt
--- a/Plugins/OgScreenEffectEditor/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/Plugins/OgScreenEffectEditor/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -5,7 +5,7 @@
 project(OgScreenEffectEditor)
 
 set(QT_MIN_VERSION "4.5.0")
-find_package(Qt4 COMPONENTS QtSvg REQUIRED)
+find_package(Qt4 COMPONENTS QtSvg QtGui QtCore REQUIRED)
 
 if(NOT QT4_FOUND)
 	message(SEND_ERROR "Failed to find Qt 4.5 or greater.")
diff -r 24aed880f704 Plugins/OgScriptEditor/CMakeLists.txt
--- a/Plugins/OgScriptEditor/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/Plugins/OgScriptEditor/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -5,7 +5,7 @@
 project(OgScriptEditor)
 
 set(QT_MIN_VERSION "4.5.0")
-find_package(Qt4 COMPONENTS QtSvg REQUIRED)
+find_package(Qt4 COMPONENTS QtSvg QtGui QtCore REQUIRED)
 
 if(NOT QT4_FOUND)
 	message(SEND_ERROR "Failed to find Qt 4.5 or greater.")
diff -r 24aed880f704 Plugins/OgScriptEditor/scripttexteditorcodec.hxx
--- a/Plugins/OgScriptEditor/scripttexteditorcodec.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/Plugins/OgScriptEditor/scripttexteditorcodec.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -36,9 +36,10 @@
 #include "itexteditorcodec.hxx"
 #include "generictexteditor.hxx"
 
+#ifndef Q_MOC_RUN
 #include <OgreString.h>
 #include <OgreScriptCompiler.h>
-
+#endif
 //----------------------------------------------------------------------------------------
 class ScriptTextEditorCodecToolBar : public QToolBar
 {
diff -r 24aed880f704 qtOfs/CMakeLists.txt
--- a/qtOfs/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOfs/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -1,6 +1,6 @@
 project(QtOfs)
 set(QT_MIN_VERSION "4.5.0")
-find_package(Qt4 COMPONENTS QtSvg REQUIRED)
+find_package(Qt4 COMPONENTS QtSvg QtGui QtCore REQUIRED)
 
 if(NOT QT4_FOUND)
 	message(SEND_ERROR "Failed to find Qt 4.5 or greater.")
@@ -55,7 +55,9 @@
         TARGET_LINK_LIBRARIES(qtOfs ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} OFS)
 
         if(UNIX)
-            target_link_libraries(qtOfs optimized
+            # kpk 2015 remove 'optimized'.  Causes APPLE link error.
+            #   target_link_libraries(qtOfs optimized
+            target_link_libraries(qtOfs
             ${Boost_FILESYSTEM_LIBRARY}
             ${Boost_SYSTEM_LIBRARY}
             ${Boost_REGEX_LIBRARY}
diff -r 24aed880f704 qtOgitor/CMakeLists.txt
--- a/qtOgitor/CMakeLists.txt	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/CMakeLists.txt	Wed Jan 14 17:02:57 2015 -0600
@@ -210,13 +210,28 @@
         include(BundleUtilities)
         get_target_property(qtOgitorLocation qtOgitor LOCATION)
         get_dotapp_dir(${qtOgitorLocation} qtOgitorLocationAppdir)
-        set(MakeBundle
-            cp ${QtSolutions_PropertyBrowser_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libQtSolutions_PropertyBrowser*.dylib ${OGRE_LIBRARIES}/../../libOgreTerrain*.dylib ${OGRE_LIBRARIES}/../../libOgrePaging*.dylib ${qtOgitorLocationAppdir}/Contents/Components && 
-            cp ${OGRE_LIBRARIES}/../../libRenderSystem_GL*.dylib ${OGRE_LIBRARIES}/../../libPlugin_OctreeSceneManager*.dylib ${OGRE_LIBRARIES}/../../libPlugin_ParticleFX*.dylib ${OGRE_Plugin_CgProgramManager_LIBRARY_DBG} ${qtOgitorLocationAppdir}/Contents/Plugins && 
-            cp ../lib/${CMAKE_CFG_INTDIR}/libOgreOfsPlugin*.dylib ${qtOgitorLocationAppdir}/Contents/Plugins &&
-            cp -r ${OGRE_LIBRARY} ${qtOgitorLocationAppdir}/Contents/Frameworks && 
+        
+        # kpk 2015 tbd remove libOgreTerrain*.dylib, libOgrePaging*.dylib, libRenderSystem_GL*.dylib, libOgreOfsPlugin refs
+        # also fixup Dependencies/lib/Debug libs
+        #
+        # kpk 2015 set(MakeBundle
+        # kpk 2015     cp ${QtSolutions_PropertyBrowser_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libQtSolutions_PropertyBrowser*.dylib ${OGRE_LIBRARIES}/../../libOgreTerrain*.dylib ${OGRE_LIBRARIES}/../../libOgrePaging*.dylib ${qtOgitorLocationAppdir}/Contents/Components && 
+        # kpk 2015     cp ${OGRE_LIBRARIES}/../../libRenderSystem_GL*.dylib ${OGRE_LIBRARIES}/../../libPlugin_OctreeSceneManager*.dylib ${OGRE_LIBRARIES}/../../libPlugin_ParticleFX*.dylib ${OGRE_Plugin_CgProgramManager_LIBRARY_DBG} ${qtOgitorLocationAppdir}/Contents/Plugins && 
+        # kpk 2015     cp ../lib/${CMAKE_CFG_INTDIR}/libOgreOfsPlugin*.dylib ${qtOgitorLocationAppdir}/Contents/Plugins &&
+        # kpk 2015     cp -r ${OGRE_LIBRARY} ${qtOgitorLocationAppdir}/Contents/Frameworks && 
+        # kpk 2015     cp -r ../lib/${CMAKE_CFG_INTDIR}/Ogitor.framework ${qtOgitorLocationAppdir}/Contents/Frameworks && 
+        # kpk 2015     cp ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgCaelum*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgHydrax*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgModularZone*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgSkyX*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libDotSceneSerializer*.dylib ../Dependencies/lib/libGenericTextEditor*.dylib ../Dependencies/lib/libImageConverter*.dylib ../Dependencies/lib/libGenericImageEditor*.dylib ../Dependencies/lib/libOFS*.dylib ${qtOgitorLocationAppdir}/Contents/Plugins/Ogitor && 
+        # kpk 2015     cp -r ../../RunPath/Media ${qtOgitorLocationAppdir}/Contents/Resources && 
+        # kpk 2015     cp -r ../../RunPath/Plugins/Icons ${qtOgitorLocationAppdir}/Contents/Plugins && 
+        # kpk 2015     cp ../../Mac/plugins.cfg ../../Mac/resources.cfg ${qtOgitorLocationAppdir}/Contents/Resources
+        # kpk 2015 )
+        
+         set(MakeBundle
+            cp ${QtSolutions_PropertyBrowser_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libQtSolutions_PropertyBrowser*.dylib ${qtOgitorLocationAppdir}/Contents/Components && 
+            cp -r ${OGRE_LIBRARY}/../* ${qtOgitorLocationAppdir}/Contents/Frameworks && 
             cp -r ../lib/${CMAKE_CFG_INTDIR}/Ogitor.framework ${qtOgitorLocationAppdir}/Contents/Frameworks && 
-            cp ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgCaelum*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgHydrax*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgModularZone*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgSkyx*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libDotSceneSerializer*.dylib ../Dependencies/lib/libGenericTextEditor*.dylib ../Dependencies/lib/libImageConverter*.dylib ../Dependencies/lib/libGenericImageEditor*.dylib ../Dependencies/lib/libOFS*.dylib ${qtOgitorLocationAppdir}/Contents/Plugins/Ogitor && 
+            cp -r ${OGRE_Plugin_CgProgramManager_LIBRARY_DBG} ${qtOgitorLocationAppdir}/Contents/Frameworks &&             
+            cp ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgCaelum*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgHydrax*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgModularZone*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libOgSkyX*.dylib ../Plugins/lib/${CMAKE_CFG_INTDIR}/libDotSceneSerializer*.dylib ../Dependencies/lib/${CMAKE_CFG_INTDIR}/libGenericTextEditor*.dylib ../Dependencies/lib/${CMAKE_CFG_INTDIR}/libImageConverter*.dylib ../Dependencies/lib//${CMAKE_CFG_INTDIR}/libGenericImageEditor*.dylib ../Dependencies/lib//${CMAKE_CFG_INTDIR}/libOFS*.dylib ${qtOgitorLocationAppdir}/Contents/Plugins/Ogitor && 
             cp -r ../../RunPath/Media ${qtOgitorLocationAppdir}/Contents/Resources && 
             cp -r ../../RunPath/Plugins/Icons ${qtOgitorLocationAppdir}/Contents/Plugins && 
             cp ../../Mac/plugins.cfg ../../Mac/resources.cfg ${qtOgitorLocationAppdir}/Contents/Resources
@@ -231,14 +246,16 @@
         TARGET_LINK_LIBRARIES(qtOgitor QtSolutions_PropertyBrowser ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES} ${OGRE_LIBRARIES} ${OGRE_Paging_LIBRARY} ${OGRE_Terrain_LIBRARY} Ogitor ImageConverter GenericTextEditor GenericImageEditor ${Boost_REGEX_LIBRARY})
     endif(OGITOR_MESHMAGICK_INTERFACE)
 
-    if(UNIX AND NOT APPLE)
-        target_link_libraries(qtOgitor optimized QtSolutions_PropertyBrowser ${Boost_LIBRARIES})
-    elseif(APPLE)
+# kpk 2015 remove 'optimized'.  Causes APPLE link error.
+#   target_link_libraries(qtOfs optimized
+    # if(UNIX AND NOT APPLE)   # kpk why doesn't this check behave??
+    #     target_link_libraries(qtOgitor optimized QtSolutions_PropertyBrowser ${Boost_LIBRARIES})
+    # elseif(APPLE)
         find_package(Cocoa REQUIRED)
         target_link_libraries(qtOgitor QtSolutions_PropertyBrowser ${Cocoa_LIBRARIES})
-    elseif(WIN32)
-        target_link_libraries(qtOgitor optimized QtSolutions_PropertyBrowser)
-    endif()
+    # elseif(WIN32)
+    #    target_link_libraries(qtOgitor optimized QtSolutions_PropertyBrowser)
+    # endif()
 
     if(APPLE)
         install(TARGETS qtOgitor BUNDLE DESTINATION ${PREFIX}bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
diff -r 24aed880f704 qtOgitor/include/complexproperties.hxx
--- a/qtOgitor/include/complexproperties.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/include/complexproperties.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -37,7 +37,9 @@
 #include <QtVariantPropertyManager>
 #include "qteditorfactory.h"
 #include "qttreepropertybrowser.h"
+#ifndef Q_MOC_RUN
 #include <Ogre.h>
+#endif
 
 //-------------------------------------------------------------------------
 
diff -r 24aed880f704 qtOgitor/include/createterraindialog.hxx
--- a/qtOgitor/include/createterraindialog.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/include/createterraindialog.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -34,7 +34,9 @@
 #define CREATETERRAINDIALOG_HXX
 
 #include <QtGui/QDialog>
+#ifndef Q_MOC_RUN
 #include <Ogre.h>
+#endif
 #include "ui_createterraindialog.h"
 
 
diff -r 24aed880f704 qtOgitor/include/magickwidget.hxx
--- a/qtOgitor/include/magickwidget.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/include/magickwidget.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -40,7 +40,9 @@
 #include <QtGui/QAction>
 #include <QtGui/QPixmap>
 #include <QtCore/QSettings>
+#ifndef Q_MOC_RUN
 #include <Ogre.h>
+#endif
 #include "qttreepropertybrowser.h"
 
 class QtTreePropertyBrowser;
diff -r 24aed880f704 qtOgitor/include/manageTerrainDialog.hxx
--- a/qtOgitor/include/manageTerrainDialog.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/include/manageTerrainDialog.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -35,7 +35,9 @@
 
 #include <QtGui/QMainWindow>
 #include <QtGui/QDialog>
+#ifndef Q_MOC_RUN
 #include <Ogre.h>
+#endif
 
 #include <QtGui/QWidget>
 
diff -r 24aed880f704 qtOgitor/include/manageTerrainGraphicsView.hxx
--- a/qtOgitor/include/manageTerrainGraphicsView.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/include/manageTerrainGraphicsView.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -32,6 +32,12 @@
 
 #pragma once
 
+//#ifndef Q_MOC_RUN  // See: https://bugreports.qt-project.org/browse/QTBUG-22829
+//# include <boost/type_traits/detail/has_binary_operator.hp>
+//#endif
+
+
+
 #include <QtGui/QDialog>
 #include <QtGui/QToolBar>
 #include <QtGui/QGraphicsView>
@@ -40,7 +46,9 @@
 #include <QtGui/QMenu>
 #include <QtGui/QToolBar>
 #include <QtGui/QAction>
+#ifndef Q_MOC_RUN
 #include <Ogre.h>
+#endif
 
 class UITerrainSquare;
 class QMenu;
diff -r 24aed880f704 qtOgitor/include/propertiesviewcustom.hxx
--- a/qtOgitor/include/propertiesviewcustom.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/include/propertiesviewcustom.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -35,7 +35,9 @@
 
 #include <QtGui/QWidget>
 #include <QtGui/QPushButton>
+#ifndef Q_MOC_RUN
 #include <Ogre.h>
+#endif
 #include "qttreepropertybrowser.h"
 #include "OgitorsPrerequisites.h"
 
diff -r 24aed880f704 qtOgitor/include/propertiesviewgeneral.hxx
--- a/qtOgitor/include/propertiesviewgeneral.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/include/propertiesviewgeneral.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -35,7 +35,9 @@
 
 #include <QtGui/QWidget>
 #include <QtGui/QLabel>
+#ifndef Q_MOC_RUN
 #include <Ogre.h>
+#endif
 #include "qttreepropertybrowser.h"
 #include "OgitorsPrerequisites.h"
 
diff -r 24aed880f704 qtOgitor/include/uiterrainsquare.hxx
--- a/qtOgitor/include/uiterrainsquare.hxx	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/include/uiterrainsquare.hxx	Wed Jan 14 17:02:57 2015 -0600
@@ -35,7 +35,9 @@
 #include <QtGui/QtGui>
 #include <QtGui/QGraphicsItem>
 #include <QtCore/QtCore>
+#ifndef Q_MOC_RUN
 #include <Ogre.h>
+#endif
 #include "manageTerrainDialog.hxx"
 
 class UITerrainSquare : public QObject, public QGraphicsRectItem 
diff -r 24aed880f704 qtOgitor/src/createterraindialog.cpp
--- a/qtOgitor/src/createterraindialog.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/src/createterraindialog.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -29,7 +29,7 @@
 /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 /// THE SOFTWARE.
 ////////////////////////////////////////////////////////////////////////////////*/
-#include <../QtGui/qgraphicsitem.h>
+#include <QtGui/qgraphicsitem.h> // kpk 2015 add -framework QtGui to xcodeproj instead!
 
 #include "createterraindialog.hxx"
 #include "OgitorsPrerequisites.h"
diff -r 24aed880f704 qtOgitor/src/main.cpp
--- a/qtOgitor/src/main.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/src/main.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -98,6 +98,13 @@
         renderer = "OpenGL Rendering Subsystem";
 #endif
         settings.setValue("renderSystem", renderer);
+       
+       // kpk
+       //dllStartPlugin();
+       //mOgreRoot->installPlugin(Ogre::GLPlugin)
+       // manually register the gl renderer
+       //static GLPlugin *sGLPlugin = new Ogre::GLPlugin();
+       //sGLPlugin->install();
     }
 
     Ogre::RenderSystemList::const_iterator pRend = mOgreRoot->getAvailableRenderers().begin();
diff -r 24aed880f704 qtOgitor/src/settingsdialog.cpp
--- a/qtOgitor/src/settingsdialog.cpp	Sun Jan 26 20:09:59 2014 +0100
+++ b/qtOgitor/src/settingsdialog.cpp	Wed Jan 14 17:02:57 2015 -0600
@@ -360,7 +360,7 @@
 
     Ogre::String pathTo = mOptions->ProjectDir;
 
-    HashMap<Ogre::String, int> resDirMap;
+    OGRE_HashMap<Ogre::String, int> resDirMap;
 
     unsigned int i;
     unsigned int itemcount = mResourceListBox->count();
@@ -380,7 +380,7 @@
         }
     }
 
-    HashMap<Ogre::String, int>::const_iterator rit = resDirMap.begin();
+    OGRE_HashMap<Ogre::String, int>::const_iterator rit = resDirMap.begin();
     while(rit != resDirMap.end())
     {
         mOptions->ResourceDirectories.push_back(rit->first);

User avatar
jacmoe
OGRE Retired Moderator
OGRE Retired Moderator
Posts: 20570
Joined: Thu Jan 22, 2004 10:13 am
Location: Denmark
x 179
Contact:

Re: OGRE + Ogitor on Mac OS X 10.9

Post by jacmoe »

Thanks :)
I will take a look at your hacks.
/* Less noise. More signal. */
Ogitor Scenebuilder - powered by Ogre, presented by Qt, fueled by Passion.
OgreAddons - the Ogre code suppository.

Post Reply