mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Changes due to boost locale:
- Updated README.linux - Fixed missing boost locale include when compiling with unit tests - Updated RPM spec (increased minimum boost version, added boost locale requirement)
This commit is contained in:
parent
6cb3cb006d
commit
9ebd4a5c00
@ -71,7 +71,7 @@ endif()
|
||||
if(ENABLE_TEST)
|
||||
# find_package overwrites BOOST_* variables which are already set, so all components have to be
|
||||
# included again
|
||||
find_package(Boost 1.46.0 COMPONENTS program_options filesystem system thread unit_test_framework REQUIRED)
|
||||
find_package(Boost 1.46.0 COMPONENTS program_options filesystem system thread locale unit_test_framework REQUIRED)
|
||||
endif()
|
||||
|
||||
if(NOT WIN32)
|
||||
|
@ -31,7 +31,7 @@ On Debian-based systems (e.g. Ubuntu) run:
|
||||
sudo apt-get install cmake g++ libsdl1.2debian libsdl-image1.2-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev zlib1g-dev libavformat-dev libswscale-dev libboost-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev
|
||||
|
||||
On RPM-based distributions (e.g. Fedora) run:
|
||||
sudo yum install cmake gcc-c++ SDL-devel SDL_image-devel SDL_ttf-devel SDL_mixer-devel boost boost-devel boost-filesystem boost-system boost-thread boost-program-options zlib-devel ffmpeg-devel ffmpeg-libs
|
||||
sudo yum install cmake gcc-c++ SDL-devel SDL_image-devel SDL_ttf-devel SDL_mixer-devel boost boost-devel boost-filesystem boost-system boost-thread boost-program-options boost-locale zlib-devel ffmpeg-devel ffmpeg-libs
|
||||
|
||||
II. Getting the sources
|
||||
|
||||
|
@ -18,13 +18,14 @@ BuildRequires: SDL-devel
|
||||
BuildRequires: SDL_image-devel
|
||||
BuildRequires: SDL_ttf-devel
|
||||
BuildRequires: SDL_mixer-devel >= 1.2.8
|
||||
BuildRequires: boost >= 1.44
|
||||
BuildRequires: boost-devel >= 1.44
|
||||
BuildRequires: boost-filesystem >= 1.44
|
||||
BuildRequires: boost-iostreams >= 1.44
|
||||
BuildRequires: boost-system >= 1.44
|
||||
BuildRequires: boost-thread >= 1.44
|
||||
BuildRequires: boost-program-options >= 1.44
|
||||
BuildRequires: boost >= 1.51
|
||||
BuildRequires: boost-devel >= 1.51
|
||||
BuildRequires: boost-filesystem >= 1.51
|
||||
BuildRequires: boost-iostreams >= 1.51
|
||||
BuildRequires: boost-system >= 1.51
|
||||
BuildRequires: boost-thread >= 1.51
|
||||
BuildRequires: boost-program-options >= 1.51
|
||||
BuildRequires: boost-locale >= 1.51
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: ffmpeg-devel
|
||||
BuildRequires: ffmpeg-libs
|
||||
|
Loading…
Reference in New Issue
Block a user