merge

CMakeLists.txt

@@ -56,7 +56,8 @@ IF(EXISTS "${CMAKE_SOURCE_DIR}/prebuilt/vc100-mt-gd/ogre_1_7_1")
     set(AUDIERE_LIBRARY "${PREBUILT_DIR}/audiere-1.9.4/lib/audiere.lib")
 
     set(ENV{OPENALDIR} "${PREBUILT_DIR}/OpenAL 1.1 SDK")
-
+    
+    set(BULLET_ROOT "${PREBUILT_DIR}/bullet")
 ELSE()
     message (STATUS "OpenMW pre-built binaries not found.  Using standard locations.")
 ENDIF()

components/bsa/bsa_archive.cpp

@@ -151,7 +151,8 @@ class DirArchive: public Ogre::FileSystemArchive
       }
 
       std::string folder = copy.substr(0, i);                              //folder with no slash
-      std::vector<std::string> current = m[folder];
+
+      std::vector<std::string>& current = m[folder];
 
        for(std::vector<std::string>::iterator iter = current.begin(); iter != current.end(); iter++)
        {

components/files/multidircollection.hpp

@@ -5,6 +5,7 @@
 #include <vector>
 #include <string>
 #include <locale>
+#include <cctype>
 
 #include <boost/filesystem/path.hpp>