CB build system update

changes (including commit 571b8ed1e4)
(other than adding/removing/moving/renaming files)

-updated boost headers and libs to 1.57
-added defines _WIN32_WINNT=0x0501 and DWINVER=0x0501 since otherwise
a boost header from asio doesn't compile
solution found here:
http://stackoverflow.com/questions/18793605/boost-asio-netbeans-error
It is the minimum target system of the created application, 0x0501 means
windows XP, the lowest officially by wesnoth supported windows OS.

Modified my existing package using Pentarctagon's thread (and .bat file)
http://forums.wesnoth.org/viewtopic.php?f=5&t=40694&sid=84843537e1f713bf9805db75f0a4f94b
until I got 1.12 and master to build and execute with it.
CodeBlocks uses the recent boost filesystem fix now.
The package is available at
http://sourceforge.net/projects/wesnoth/files/unofficial/Windows%20Compile%20Stuff/
This commit is contained in:
anonymissimus 2014-11-29 00:00:28 +01:00
parent 721fda8fcf
commit e9c1b5acb3
2 changed files with 20 additions and 16 deletions

View file

@ -39,6 +39,8 @@
<Add option="-DHAVE_PYTHON" />
<Add option="-DUSE_GZIP" />
<Add option="-D_WIN32_WINDOWS" />
<Add option="-D_WIN32_WINNT=0x0501" />
<Add option="-DDWINVER=0x0501" />
<Add directory="..\..\src" />
<Add directory="..\..\src\sdl_ttf" />
<Add directory="..\..\src\serialization" />
@ -57,7 +59,6 @@
<Add library="SDL_ttf" />
<Add library="freetype" />
<Add library="intl" />
<Add library="z" />
<Add library="ws2_32" />
<Add library="pango-1.0" />
<Add library="pangocairo-1.0" />
@ -66,13 +67,14 @@
<Add library="fontconfig" />
<Add library="libglib-2.0" />
<Add library="liblua" />
<Add library="libboost_iostreams-mgw45-mt-1_46_1" />
<Add library="libboost_program_options-mgw45-mt-1_46_1" />
<Add library="libboost_regex-mgw45-mt-1_46_1" />
<Add library="libboost_system-mgw45-mt-1_46_1" />
<Add library="libboost_thread-mgw45-mt-1_46_1" />
<Add library="libz.dll" />
<Add library="libbz2" />
<Add library="libboost_filesystem-mgw45-mt-1_57.a" />
<Add library="libboost_iostreams-mgw45-mt-1_57.a" />
<Add library="libboost_locale-mgw45-mt-1_57.a" />
<Add library="libboost_program_options-mgw45-mt-1_57.a" />
<Add library="libboost_regex-mgw45-mt-1_57.a" />
<Add library="libboost_system-mgw45-mt-1_57.a" />
<Add library="libboost_zlib-mgw45-mt-1_57.a" />
<Add library="libboost_bzip2-mgw45-mt-1_57.a" />
<Add directory=".\" />
</Linker>
<Unit filename="..\..\packaging\windows\wesnoth.rc">
@ -292,8 +294,8 @@
<Unit filename="..\..\src\exceptions.hpp" />
<Unit filename="..\..\src\filechooser.cpp" />
<Unit filename="..\..\src\filechooser.hpp" />
<Unit filename="..\..\src\filesystem.cpp" />
<Unit filename="..\..\src\filesystem.hpp" />
<Unit filename="..\..\src\filesystem_boost.cpp" />
<Unit filename="..\..\src\filesystem_common.cpp" />
<Unit filename="..\..\src\filesystem_win32.ii" />
<Unit filename="..\..\src\flg_manager.cpp" />
@ -363,8 +365,8 @@
<Unit filename="..\..\src\generators\mapgen_dialog.hpp" />
<Unit filename="..\..\src\generic_event.cpp" />
<Unit filename="..\..\src\generic_event.hpp" />
<Unit filename="..\..\src\gettext.cpp" />
<Unit filename="..\..\src\gettext.hpp" />
<Unit filename="..\..\src\gettext_boost.cpp" />
<Unit filename="..\..\src\global.hpp" />
<Unit filename="..\..\src\gui\auxiliary\canvas.cpp" />
<Unit filename="..\..\src\gui\auxiliary\canvas.hpp" />

View file

@ -49,23 +49,25 @@
<Add library="intl" />
<Add library="SDL_net" />
<Add library="ws2_32" />
<Add library="z" />
<Add library="libboost_iostreams-mgw45-mt-1_46_1" />
<Add library="libz.dll" />
<Add library="libbz2" />
<Add library="libboost_filesystem-mgw45-mt-1_57.a" />
<Add library="libboost_system-mgw45-mt-1_57.a" />
<Add library="libboost_iostreams-mgw45-mt-1_57.a" />
<Add library="libboost_locale-mgw45-mt-1_57.a" />
<Add library="libboost_bzip2-mgw45-mt-1_57.a" />
<Add library="libboost_zlib-mgw45-mt-1_57.a" />
</Linker>
<Unit filename="..\..\src\about.hpp" />
<Unit filename="..\..\src\color_range.cpp" />
<Unit filename="..\..\src\config.cpp" />
<Unit filename="..\..\src\config.hpp" />
<Unit filename="..\..\src\filesystem.cpp" />
<Unit filename="..\..\src\filesystem.hpp" />
<Unit filename="..\..\src\filesystem_boost.cpp" />
<Unit filename="..\..\src\filesystem_common.cpp" />
<Unit filename="..\..\src\filesystem_win32.ii" />
<Unit filename="..\..\src\game_config.cpp" />
<Unit filename="..\..\src\game_config.hpp" />
<Unit filename="..\..\src\gettext.cpp" />
<Unit filename="..\..\src\gettext.hpp" />
<Unit filename="..\..\src\gettext_boost.cpp" />
<Unit filename="..\..\src\global.hpp" />
<Unit filename="..\..\src\loadscreen.hpp" />
<Unit filename="..\..\src\loadscreen_empty.cpp" />