games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Fix build

Browse Source
This commit is contained in:
AlexVinS 2015-09-24 11:55:23 +03:00
parent 6b45f323ea
commit 108d4c39b5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -115,7 +115,7 @@ endif()
set(SYSTEM_LIBS ${SYSTEM_LIBS} ${CMAKE_DL_LIBS}) set(SYSTEM_LIBS ${SYSTEM_LIBS} ${CMAKE_DL_LIBS})
set(FFmpeg_FIND_COMPONENTS AVFORMAT SWSCALE) set(FFmpeg_FIND_COMPONENTS AVFORMAT SWSCALE)
find_package(Boost 1.48.0 COMPONENTS filesystem locale program_options system thread REQUIRED) find_package(Boost 1.48.0 COMPONENTS date_time filesystem locale program_options system thread REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(FFmpeg REQUIRED) find_package(FFmpeg REQUIRED)
find_package(Minizip) find_package(Minizip)
@ -150,7 +150,7 @@ endif()
if(ENABLE_TEST) if(ENABLE_TEST)
# find_package overwrites BOOST_* variables which are already set, so all components have to be included again # find_package overwrites BOOST_* variables which are already set, so all components have to be included again
find_package(Boost 1.48.0 COMPONENTS program_options filesystem system thread locale unit_test_framework REQUIRED) find_package(Boost 1.48.0 COMPONENTS date_time program_options filesystem system thread locale unit_test_framework REQUIRED)
endif() endif()
if(CMAKE_COMPILER_IS_GNUCXX OR NOT WIN32) #so far all *nix compilers support such parameters if(CMAKE_COMPILER_IS_GNUCXX OR NOT WIN32) #so far all *nix compilers support such parameters

3
lib/VCMI_lib.cbp
View File

@ -30,6 +30,7 @@
<Add option="-lboost_thread$(#boost.libsuffix)" /> <Add option="-lboost_thread$(#boost.libsuffix)" />
<Add option="-lboost_chrono$(#boost.libsuffix)" /> <Add option="-lboost_chrono$(#boost.libsuffix)" />
<Add option="-lboost_locale$(#boost.libsuffix)" /> <Add option="-lboost_locale$(#boost.libsuffix)" />
<Add option="-lboost_date_time$(#boost.libsuffix)" />
<Add option="-liconv" /> <Add option="-liconv" />
<Add option="-ldbghelp" /> <Add option="-ldbghelp" />
<Add directory="$(#sdl2.lib)" /> <Add directory="$(#sdl2.lib)" />
@ -59,6 +60,7 @@
<Add option="-lboost_thread$(#boost.libsuffix)" /> <Add option="-lboost_thread$(#boost.libsuffix)" />
<Add option="-lboost_chrono$(#boost.libsuffix)" /> <Add option="-lboost_chrono$(#boost.libsuffix)" />
<Add option="-lboost_locale$(#boost.libsuffix)" /> <Add option="-lboost_locale$(#boost.libsuffix)" />
<Add option="-lboost_date_time$(#boost.libsuffix)" />
<Add option="-liconv" /> <Add option="-liconv" />
<Add option="-ldbghelp" /> <Add option="-ldbghelp" />
<Add directory="$(#sdl2.lib)" /> <Add directory="$(#sdl2.lib)" />
@ -89,6 +91,7 @@
<Add option="-lboost_thread$(#boost.libsuffix)" /> <Add option="-lboost_thread$(#boost.libsuffix)" />
<Add option="-lboost_chrono$(#boost.libsuffix)" /> <Add option="-lboost_chrono$(#boost.libsuffix)" />
<Add option="-lboost_locale$(#boost.libsuffix)" /> <Add option="-lboost_locale$(#boost.libsuffix)" />
<Add option="-lboost_date_time$(#boost.libsuffix)" />
<Add option="-liconv" /> <Add option="-liconv" />
<Add option="-ldbghelp" /> <Add option="-ldbghelp" />
<Add directory="$(#sdl2.lib64)" /> <Add directory="$(#sdl2.lib64)" />