Merged with shua

INSTALL

@@ -2,8 +2,15 @@ Pseudoform INSTALL
 ============================
 
 To install the game, just extract it to somewhere and run
-Linux: ./pseudoform_linux.sh
-Windows: pseudoform_win.bat
+Linux: 
+cmake .
+make
+./pseudoform_linux.sh
+
+Windows: 
+run cmake in root dir
+run make in root dir
+pseudoform_win.bat
 
 Except for working 3D drivers, no dependencies should be required in either case. 
 Please excuse the improper installation as of now.

data/scripts/root.xml

@@ -1,5 +1,5 @@
 <renderer lib="ogl"
-    plugins="/usr/local/lib/OGRE/"
+    plugins="/usr/lib/OGRE/"
     width="1024"
     height="768"
     fullscreen="0"

src/game/level.cpp

@@ -16,7 +16,7 @@
 #include "script/bindings.hpp"
 #include "script/script.hpp"
 
-#include "gui/sheet.hpp"
+//#include "gui/sheet.hpp"
 
 #include "level.hpp"
 #include "types.hpp"

src/game/trigger.hpp

@@ -11,7 +11,6 @@
 
 #include <list>
 
-// TODO: include script.hpp
 #include "script/script.hpp"
 #include "generic_prop.hpp"
 

src/gfx/root.cpp

@@ -25,6 +25,8 @@
 #include "log.hpp"
 #include "fs_ops.hpp"
 
+#include <boost/filesystem.hpp>
+
 #include "txml/txml.hpp"
 
 namespace engine
@@ -91,22 +93,22 @@ namespace engine
             }
             else
             {
-                #ifdef _DEBUG
-                _root->loadPlugin(plugins + "RenderSystem_GL_d");
-                #else
+                //#ifdef _DEBUG
+                //_root->loadPlugin(plugins + "RenderSystem_GL_d");
+                //#else
                 _root->loadPlugin(plugins + "RenderSystem_GL");
-                #endif
+                //#endif
                 renderLib = RL_OGL;
             }
 
             // Load CG shader manager and particle manager
-            #ifdef _DEBUG
-            _root->loadPlugin(plugins + "Plugin_CgProgramManager_d");
-            _root->loadPlugin(plugins + "Plugin_ParticleFX_d");
-            #else
+            //#ifdef _DEBUG
+            //_root->loadPlugin(plugins + "Plugin_CgProgramManager_d");
+            //_root->loadPlugin(plugins + "Plugin_ParticleFX_d");
+            //#else
             _root->loadPlugin(plugins + "Plugin_CgProgramManager");
             _root->loadPlugin(plugins + "Plugin_ParticleFX");
-            #endif
+            //#endif
 
             // Get full list of available renderers
             const Ogre::RenderSystemList& availRenderers = _root->getAvailableRenderers();
@@ -177,8 +179,10 @@ namespace engine
 
             // Manage project resources
             Ogre::ResourceGroupManager &rgm = Ogre::ResourceGroupManager::getSingleton();
-            rgm.addResourceLocation(engine::DATA_DIR, "FileSystem", "data", true);
-            rgm.initialiseResourceGroup("data");
+            rgm.addResourceLocation(engine::DATA_DIR, "FileSystem", "General", true);
+            rgm.addResourceLocation(engine::DATA_DIR + "/media", "FileSystem", "General", true);
+            rgm.addResourceLocation(engine::DATA_DIR + "/media/MyGUI_Media", "FileSystem", "General", true);
+            rgm.initialiseResourceGroup("General");
 
             Ogre::MaterialManager::getSingleton().setDefaultAnisotropy(16);
             Ogre::MaterialManager::getSingleton().setDefaultTextureFiltering(Ogre::TFO_ANISOTROPIC);