From 231be8f38165960856cb5dc6f038a759d8dc78a1 Mon Sep 17 00:00:00 2001
From: athile <athile.g@gmail.com>
Date: Tue, 31 May 2011 21:55:08 -0600
Subject: [PATCH 1/2] Add BULLET_ROOT for the prebuilt binaries.  Fix a minor
 VS2010 compile issue (missing header file).

---
 CMakeLists.txt                          | 3 ++-
 components/files/multidircollection.hpp | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5001a894..8e0c0c463 100644
--- a/CMakeLists.txt
+++ b/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()
diff --git a/components/files/multidircollection.hpp b/components/files/multidircollection.hpp
index bd0304e40..a04c12c22 100644
--- a/components/files/multidircollection.hpp
+++ b/components/files/multidircollection.hpp
@@ -4,6 +4,8 @@
 #include <map>
 #include <vector>
 #include <string>
+#include <locale>
+#include <cctype>
 
 #include <boost/filesystem/path.hpp>
 

From d59856af5c98d993e56a5c1dbb75b9f08cd177d4 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 8 Jun 2011 00:52:25 +0200
Subject: [PATCH 2/2] minor performance improvement

---
 components/bsa/bsa_archive.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/bsa/bsa_archive.cpp b/components/bsa/bsa_archive.cpp
index ba7be5bfd..68c47a0ed 100644
--- a/components/bsa/bsa_archive.cpp
+++ b/components/bsa/bsa_archive.cpp
@@ -162,7 +162,7 @@ class DirArchive: public Ogre::FileSystemArchive
 
     //std::transform(file.begin(), file.end(), file.begin(), tolower);
       //boost::filesystem::path folderpath = folder;
-      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++)
        {