diff --git a/CMakeLists.txt b/CMakeLists.txt index b18eb5f0..3d53e762 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ IF (CMAKE_HOST_SYSTEM_NAME MATCHES "Linux") set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,windows") ENDIF () - set (BOSS_LIBS ${BOSS_LIBS} zlibstatic loadorder yaml-cpp boost_locale boost_filesystem boost_system boost_regex) + set (BOSS_LIBS ${BOSS_LIBS} zlibstatic loadorder yaml-cpp boost_log boost_locale boost_thread_win32 boost_chrono boost_date_time boost_filesystem boost_system boost_regex) ENDIF () # Settings when compiling on Windows. diff --git a/README.md b/README.md index 619f05b6..66d2f3a6 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ BOSS uses [CMake](http://cmake.org) v2.8.9 or later for cross-platform building BOSS requires the following libraries: * [Alphanum](http://www.davekoelle.com/files/alphanum.hpp) -* [Boost](http://www.boost.org) v1.53.0 or later. +* [Boost](http://www.boost.org) v1.54.0 or later. * [Libespm](http://github.com/WrinklyNinja/libespm) * [Libloadorder](http://github.com/WrinklyNinja/libloadorder) * [PugiXML](http://code.google.com/p/pugixml/) v1.2 or later. @@ -64,7 +64,7 @@ Put the following binaries into ```resources/svn/``` in the BOSS repository root ``` ./bootstrap.sh echo "using gcc : 4.6.3 : i686-w64-mingw32-g++ : i686-w64-mingw32-windres i686-w64-mingw32-ar i686-w64-mingw32-ranlib ;" > tools/build/v2/user-config.jam -./b2 toolset=gcc-4.6.3 target-os=windows link=static runtime-link=static variant=release address-model=32 cxxflags=-fPIC --with-filesystem --with-locale --with-regex --with-program_options --with-system --stagedir=stage-mingw-32 +./b2 toolset=gcc-4.6.3 target-os=windows threadapi=win32 link=static runtime-link=static variant=release address-model=32 cxxflags=-fPIC --with-thread --with-filesystem --with-locale --with-regex --with-program_options --with-system --stagedir=stage-mingw-32 ``` ### wxWidgets