Merge pull request RigsOfRods#794 from AnotherFoxGuy/mapbin-fix1.8

[Fix] Fixed compiling with ogre 1.8
grahamjamesaddis · Feb 22, 2016 · feec33d · feec33d
2 parents c147638 + e8c9106
commit feec33d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/source/main/resources/ContentManager.cpp b/source/main/resources/ContentManager.cpp
@@ -217,7 +217,12 @@ bool ContentManager::init(void)
 	// streams path, to be processed later by the cache system
 	LOG("RoR|ContentManager: Loading filesystems");
 
-	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path", "")+"cache", "FileSystem", "cache",false,false);
+#if OGRE_VERSION_MAJOR >= 1 && OGRE_VERSION_MINOR >= 9
+	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path", "") + "cache", "FileSystem", "cache", false, false);
+#else
+	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path", "") + "cache", "FileSystem", "cache");
+#endif
+
 	// config, flat
 	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path", "")+"config", "FileSystem", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path", "")+"alwaysload", "FileSystem", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);