Merge upstream

.gitignore

@@ -1,5 +1,6 @@
 screenshot*.png
 *.o
+*.a
 *~
 data
 CMakeFiles
@@ -13,4 +14,5 @@ build
 plugins.cfg
 openmw.cfg
 Doxygen
-
+.thumbnails
+resources

CMakeLists.txt

@@ -8,8 +8,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 
 # source directory: apps
 
-set(GAME apps/openmw/main.cpp apps/openmw/engine.cpp)
-set(GAME_HEADER apps/openmw/mwinput/inputmanager.hpp apps/openmw/engine.hpp)
+set(GAME 
+    apps/openmw/main.cpp 
+    apps/openmw/engine.cpp)
+set(GAME_HEADER 
+    apps/openmw/mwinput/inputmanager.hpp 
+    apps/openmw/engine.hpp)
 source_group(game FILES ${GAME} ${GAME_HEADER})
 
 set(GAMEREND 
@@ -26,7 +30,8 @@ set(GAMEREND_HEADER
 source_group(game_renderer FILES ${GAMEREND} ${GAMEREND_HEADER})    
 
 # set(GAMEINPUT)
-set(GAMEINPUT_HEADER apps/openmw/mwinput/inputmanager.hpp)
+set(GAMEINPUT_HEADER 
+    apps/openmw/mwinput/inputmanager.hpp)
 source_group(game_input FILES ${GAMEINPUT} ${GAMEINPUT_HEADER})    
 
 set(APPS ${GAME} ${GAMEREND} ${GAMEINPUT})
@@ -34,48 +39,80 @@ set(APPS_HEADER ${GAME_HEADER} ${GAMEREND_HEADER} ${GAMEINPUT_HEADER})
 
 # source directory: components
 
-set(BSA components/bsa/bsa_archive.cpp components/bsa/bsa_file.cpp)
-set(BSA_HEADER components/bsa/bsa_archive.hpp components/bsa/bsa_file.hpp)
+set(BSA 
+    components/bsa/bsa_archive.cpp 
+    components/bsa/bsa_file.cpp)
+set(BSA_HEADER 
+    components/bsa/bsa_archive.hpp 
+    components/bsa/bsa_file.hpp)
 source_group(bsa FILES ${BSA} ${BSA_HEADER})
 
-set(NIF components/nif/nif_file.cpp)
-set(NIF_HEADER components/nif/controlled.hpp components/nif/effect.hpp
-    components/nif/nif_types.hpp  components/nif/record.hpp
-    components/nif/controller.hpp components/nif/extra.hpp components/nif/node.hpp
+set(NIF 
+    components/nif/nif_file.cpp)
+set(NIF_HEADER 
+    components/nif/controlled.hpp 
+    components/nif/effect.hpp
+    components/nif/nif_types.hpp  
+    components/nif/record.hpp
+    components/nif/controller.hpp 
+    components/nif/extra.hpp 
+    components/nif/node.hpp
     components/nif/record_ptr.hpp
-    components/nif/data.hpp components/nif/nif_file.hpp components/nif/property.hpp)
+    components/nif/data.hpp 
+    components/nif/nif_file.hpp 
+    components/nif/property.hpp)
 source_group(nif FILES ${NIF} ${NIF_HEADER})    
 
-set(NIFOGRE components/nifogre/ogre_nif_loader.cpp)
-set(NIFOGRE_HEADER components/nifogre/ogre_nif_loader.hpp)
+set(NIFOGRE 
+    components/nifogre/ogre_nif_loader.cpp)
+set(NIFOGRE_HEADER 
+    components/nifogre/ogre_nif_loader.hpp)
 source_group(nifogre FILES ${NIFOGRE} ${NIFOGRE_HEADER})    
 
-set(ESM_STORE components/esm_store/store.cpp components/esm_store/cell_store.cpp)
-set(ESM_STORE_HEADER components/esm_store/cell_store.hpp
-    components/esm_store/reclists.hpp components/esm_store/store.hpp)
+set(ESM_STORE 
+    components/esm_store/store.cpp 
+    components/esm_store/cell_store.cpp)
+set(ESM_STORE_HEADER 
+    components/esm_store/cell_store.hpp
+    components/esm_store/reclists.hpp 
+    components/esm_store/store.hpp)
 source_group(esm_store FILES ${ESM_STORE} ${ESM_STORE_HEADER})
 
 file(GLOB ESM_HEADER components/esm/*.hpp)
 source_group(esm_header FILES ${ESM_HEADER}) 
 
-set(OGRE components/engine/ogre/renderer.cpp)
-set(OGRE_HEADER components/engine/ogre/renderer.hpp)
+set(OGRE 
+    components/engine/ogre/renderer.cpp)
+set(OGRE_HEADER 
+    components/engine/ogre/renderer.hpp)
 source_group(ogre FILES ${OGRE} ${OGRE_HEADER})
 
-set(INPUT components/engine/input/oismanager.cpp)
-set(INPUT_HEADER components/engine/input/oismanager.hpp components/engine/input/listener.hpp
-    components/engine/input/func_binder.hpp components/engine/input/dispatch_map.hpp
-    components/engine/input/dispatcher.hpp components/engine/input/poller.hpp)
+set(INPUT 
+    components/engine/input/oismanager.cpp)
+set(INPUT_HEADER 
+    components/engine/input/oismanager.hpp 
+    components/engine/input/listener.hpp
+    components/engine/input/func_binder.hpp 
+    components/engine/input/dispatch_map.hpp
+    components/engine/input/dispatcher.hpp 
+    components/engine/input/poller.hpp)
 source_group(input FILES ${INPUT} ${INPUT_HEADER})
 
+set(MISC 
+    components/misc/stringops.cpp 
+    components/misc/fileops.cpp)
+set(MISC_HEADER 
+    components/misc/fileops.hpp 
+    components/misc/slice_array.hpp
+    components/misc/stringops.hpp)
+source_group(misc FILES ${MISC} ${MISC_HEADER})   
+
 set(COMPONENTS ${BSA} ${NIF} ${NIFOGRE} ${ESM_STORE} ${OGRE} ${INPUT} ${MISC})
 set(COMPONENTS_HEADER ${BSA_HEADER} ${NIF_HEADER} ${NIFOGRE_HEADER} ${ESM_STORE_HEADER}
     ${ESM_HEADER} ${OGRE_HEADER} ${INPUT_HEADER} ${MISC_HEADER})
     
 # source directory: libs
 
-ADD_SUBDIRECTORY( libs/platform )
-
 set(MANGLE_VFS libs/mangle/vfs/servers/ogre_vfs.cpp)
 source_group(mangle_vfs FILES ${MANGLE_VFS})
 
@@ -145,7 +182,6 @@ target_link_libraries(openmw
   ${OGRE_LIBRARIES}
   ${OIS_LIBRARIES}
   ${Boost_LIBRARIES}
-  platform
   caelum)
 
 if (APPLE)

apps/openmw/engine.cpp

@@ -7,7 +7,7 @@
 #include "components/esm_store/cell_store.hpp"
 #include "components/bsa/bsa_archive.hpp"
 #include "components/engine/ogre/renderer.hpp"
-#include "libs/platform/fileops.hpp"
+#include "components/misc/fileops.hpp"
 
 #include "apps/openmw/mwrender/interior.hpp"
 #include "mwinput/inputmanager.hpp"
@@ -104,7 +104,7 @@ void OMW::Engine::go()
 
     const char* plugCfg = "plugins.cfg";
 
-    mOgre.configure(!OMW::Platform::isFile("ogre.cfg"), plugCfg, false);
+    mOgre.configure(!isFile("ogre.cfg"), plugCfg, false);
 
     addResourcesDirectory (mDataDir / "Meshes");
     addResourcesDirectory (mDataDir / "Textures");

apps/openmw/mwrender/sky.cpp

@@ -35,7 +35,7 @@ namespace MWRender
 
         // Load the Caelum resources
         //
-        ResourceGroupManager::getSingleton().addResourceLocation("resources\\caelum", "FileSystem", "Caelum");
+        ResourceGroupManager::getSingleton().addResourceLocation("resources/caelum", "FileSystem", "Caelum");
         ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
 
         // Load the Caelum resources

components/esm/esm_reader.hpp

@@ -12,7 +12,7 @@
 #include <libs/mangle/stream/stream.hpp>
 #include <libs/mangle/stream/servers/file_stream.hpp>
 #include <libs/mangle/tools/str_exception.hpp>
-#include "libs/platform/stringops.hpp"
+#include <components/misc/stringops.hpp>
 
 #ifdef __APPLE__
 // need our own implementation of strnlen
@@ -218,8 +218,6 @@ public:
   /// parse the header.
   void openRaw(Mangle::Stream::StreamPtr _esm, const std::string &name)
   {  
-    using namespace OMW::Platform;
-    
     close();
     esm = _esm;
     c.filename = name;

components/nif/nif_file.cpp

@@ -23,7 +23,7 @@
 
 #include "nif_file.hpp"
 #include "record.hpp"
-#include "libs/platform/stringops.hpp"
+#include "components/misc/stringops.hpp"
 
 #include "extra.hpp"
 #include "controlled.hpp"
@@ -44,8 +44,6 @@ using namespace Nif;
 
 void NIFFile::parse()
 {
-  using namespace OMW::Platform;
-
   // Check the header string
   const char* head = getString(40);
   if(!begins(head, "NetImmerse File Format"))

components/nif/nif_file.hpp

@@ -27,8 +27,7 @@
 #include <libs/mangle/stream/stream.hpp>
 #include <libs/mangle/stream/filters/buffer_stream.hpp>
 #include <libs/mangle/tools/str_exception.hpp>
-
-#include "libs/platform/slice_array.hpp"
+#include <components/misc/slice_array.hpp>
 
 #include <vector>
 #include <string>

libs/platform/strings.h

@@ -6,6 +6,8 @@
 #pragma warning(disable: 4996)
 #define strcasecmp stricmp
 #define snprintf _snprintf
+#else
+#include <strings.h>
 #endif
 
 #endif