mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 15:15:31 +00:00
Code Issues Releases Wiki Activity

merge

Browse source
This commit is contained in:
Jason Hooks 2011-06-15 13:24:37 -04:00
commit 2132488408
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -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()

3
components/bsa/bsa_archive.cpp
View file

@ -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++)
{

1
components/files/multidircollection.hpp
View file

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