Made includes more portable + minor optimization fix.

bsa/bsa_archive.cpp

@@ -27,7 +27,7 @@
 #include <OgreArchiveFactory.h>
 #include <OgreArchiveManager.h>
 #include "bsa_file.hpp"
-#include "../mangle/stream/clients/ogre_datastream.hpp"
+#include <mangle/stream/clients/ogre_datastream.hpp>
 
 using namespace Ogre;
 using namespace Mangle::Stream;

bsa/bsa_file.cpp

@@ -23,9 +23,9 @@
 
 #include "bsa_file.hpp"
 
-#include "../mangle/stream/servers/file_stream.hpp"
-#include "../mangle/stream/filters/slice_stream.hpp"
-#include "../mangle/tools/str_exception.hpp"
+#include <mangle/stream/servers/file_stream.hpp>
+#include <mangle/stream/filters/slice_stream.hpp>
+#include <mangle/tools/str_exception.hpp>
 
 #include <stdlib.h>
 #include <assert.h>

bsa/bsa_file.hpp

@@ -24,7 +24,7 @@
 #ifndef _BSA_FILE_H_
 #define _BSA_FILE_H_
 
-#include "../mangle/stream/stream.hpp"
+#include <mangle/stream/stream.hpp>
 
 #include <stdint.h>
 #include <strings.h>

esm/esm_reader.hpp

@@ -9,10 +9,10 @@
 #include <sstream>
 #include <iomanip>
 
-#include "../mangle/stream/stream.hpp"
-#include "../mangle/stream/servers/file_stream.hpp"
-#include "../mangle/tools/str_exception.hpp"
-#include "../tools/stringops.hpp"
+#include <mangle/stream/stream.hpp>
+#include <mangle/stream/servers/file_stream.hpp>
+#include <mangle/tools/str_exception.hpp>
+#include "tools/stringops.hpp"
 
 #ifdef __APPLE__
 // need our own implementation of strnlen

esm_store/cell_store.hpp

@@ -12,7 +12,7 @@
 
 #include "store.hpp"
 #include "esm/records.hpp"
-#include "mangle/tools/str_exception.hpp"
+#include <mangle/tools/str_exception.hpp>
 #include <list>
 
 namespace ESMS

game/mwrender/cell.cpp

@@ -9,7 +9,7 @@ using namespace Ogre;
 using namespace ESMS;
 
 // Inserts one mesh into the scene
-void CellRender::insertMesh(const std::string mesh,   // NIF file
+void CellRender::insertMesh(const std::string &mesh, // NIF file
                            const CellRef &ref)       // Reference information
 {
   // Create and place scene node for this object

game/mwrender/cell.hpp

@@ -24,7 +24,7 @@ namespace MWRender
     /// cell.
     Ogre::SceneNode *base;
 
-    void insertMesh(const std::string mesh,    // NIF file
+    void insertMesh(const std::string &mesh,   // NIF file
                     const ESMS::CellRef &ref); // Reference information
                    
     template<typename T>   

nif/nif_file.cpp

@@ -23,7 +23,7 @@
 
 #include "nif_file.hpp"
 #include "record.hpp"
-#include "../tools/stringops.hpp"
+#include "tools/stringops.hpp"
 
 #include "extra.hpp"
 #include "controlled.hpp"

nif/nif_file.hpp

@@ -24,9 +24,9 @@
 #ifndef _NIF_FILE_H_
 #define _NIF_FILE_H_
 
-#include "../mangle/stream/stream.hpp"
-#include "../mangle/stream/filters/buffer_stream.hpp"
-#include "../mangle/tools/str_exception.hpp"
+#include <mangle/stream/stream.hpp>
+#include <mangle/stream/filters/buffer_stream.hpp>
+#include <mangle/tools/str_exception.hpp>
 
 #include "../tools/slice_array.hpp"
 

nifogre/ogre_nif_loader.cpp

@@ -25,11 +25,11 @@
 #include <Ogre.h>
 #include <stdio.h>
 
-#include "../mangle/vfs/servers/ogre_vfs.hpp"
-#include "../nif/nif_file.hpp"
-#include "../nif/node.hpp"
-#include "../nif/data.hpp"
-#include "../nif/property.hpp"
+#include <mangle/vfs/servers/ogre_vfs.hpp>
+#include "nif/nif_file.hpp"
+#include "nif/node.hpp"
+#include "nif/data.hpp"
+#include "nif/property.hpp"
 
 // For warning messages
 #include <iostream>