Made includes more portable + minor optimization fix.

This commit is contained in:
Nicolay Korslund 2010-06-10 14:26:03 +02:00
parent f346adb6e1
commit 293c7c29c4
10 changed files with 21 additions and 21 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -9,7 +9,7 @@ using namespace Ogre;
using namespace ESMS; using namespace ESMS;
// Inserts one mesh into the scene // 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 const CellRef &ref) // Reference information
{ {
// Create and place scene node for this object // Create and place scene node for this object

View file

@ -24,7 +24,7 @@ namespace MWRender
/// cell. /// cell.
Ogre::SceneNode *base; 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 const ESMS::CellRef &ref); // Reference information
template<typename T> template<typename T>

View file

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

View file

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

View file

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