upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-23 22:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,942 Commits 56 Branches 373 Tags
Commit Graph

749 Commits

Author SHA1 Message Date
loonycyborg
bb02ce7c72 scons: add option to enable using c++14 features 2016-04-01 19:46:02 +03:00
loonycyborg
af7286c421 scons: add check for boost.thread since it's a dependency now 2016-03-31 00:46:06 +03:00
loonycyborg
0795ad879b scons: due to switch to std c++11 always pass -std=c++11 2016-03-31 00:10:32 +03:00
Andreas Löf
5c6e7c7d20 Remove SDL1 from SCons and CMake 
This makes SDL2 the only build alternative for Wesnoth. Any
conditionals are removed, leaving only the settings that rely on SDL2.
 2016-03-13 11:34:29 +13:00
anatoly techtonik
015cb9b3d9 SConstruct: Mention how to build Windows installer 2016-03-01 17:16:36 +03:00
loonycyborg
7666030367 Merge branch 'master' into asio_wesnothd 2016-01-19 15:21:06 +03:00
Andreas Löf
9b5870e14b Correct SDL2 versions for linux/win32/osx in build scripts 
Codify the requirements set forth in the INSTALL file in scons and
cmake as they are used on other platforms that Linux and * BSD.
 2016-01-17 10:41:36 +13:00
Andreas Löf
9ed01599ee Drop requiered SDL2 version to 2.0.2 on Linux and *BSD 
This drops the required version to 2.0.2 on Linux and *BSD, as there are no known bugs that require us to have a later version on these platforms. Windows and Os X remains as 2.0.4.
 2016-01-17 09:28:18 +13:00
Andreas Löf
4650202390 Update build requirements to SDL 2.0.4 2016-01-17 08:26:14 +13:00
loonycyborg
a48be105f7 scons: pass -isystem instead of -I for third party library includes 2016-01-04 20:25:49 +03:00
loonycyborg
f709b8ee8f scons: Added an option to support using multilib gcc in 32-bit mode 
multilib_arch=32 will pass -m32 to both compiler and linker causing multilib gcc to produce 32bit binaries.
 2015-12-02 16:58:43 +03:00
loonycyborg
4456dcbfaf scons: added ctool option to specify c compiler command 
if cxxtool option is unspecified it will be derived from ctool
 2015-12-02 16:58:40 +03:00
loonycyborg
879ab58e39 Remove dependency on SDL from wesnothd 2015-11-15 17:14:11 +03:00
loonycyborg
5c42f3d13b Merge branch 'master' into asio_wesnothd 2015-10-29 14:54:16 +03:00
loonycyborg
e961b087e7 Remove dependency of wesnothd on SDL_net updating scons accordingly 2015-10-28 12:08:26 +03:00
Andreas Löf
e8c3e99dad Make SDL2 the default in cmake and scons 
This changes the default settings in the cmake and scons to make all
targets be compiled with SDL2 as opposed to SDL1.
 2015-09-15 20:45:27 +12:00
anatoly techtonik
63c355b635 SConstruct: Check all SDL libs together 
This speeds up troubleshooting of OGG dependencies
 2015-09-03 22:19:45 +03:00
aquileia
4a272b301d Windows installer: Use FILE /oname to avoid copying files 2015-08-08 03:53:04 +02:00
Ignacio R. Morelle
b756c19dd3 scons: Require SDK defs for Windows XP and later instead of 2000 and later 
1.13.1 does away with Windows 2000 compatibility by requiring the
AttachConsole function from kernel32.dll, introduced in Windows XP.
 2015-07-23 21:07:40 -03:00
Ignacio R. Morelle
88811d9bf1 scons: Clean up warning message 2015-07-22 02:04:47 -03:00
loonycyborg
980434ce96 Windows installer: added a start menu shortcut to run wesnoth with console 2015-07-14 19:03:40 +03:00
Ignacio R. Morelle
3a4c11a2e7 scons: Propagate HAVE_FRIBIDI to all files 
How does doing otherwise even help reduce compile times unless you are
changing your build environment every time? It's just a liability that
makes it harder to do feature detection from other files. It's also
asymmetrical with regards to the CMake recipe.
 2015-07-13 05:12:26 -03:00
loonycyborg
dc7fb0b951 Update SConstruct to reflect rename of README 2015-06-20 16:18:01 +03:00
Ignacio R. Morelle
4c7b7b5a15 scons: 'test' is also built by the 'all' target 2015-04-05 21:56:32 -03:00
Chris Beck
66f69529b0 Merge pull request #351 from cbeck88/remove_bfs_option_ii 
scons: remove boostfilesystem build option, replace with "libintl"
 2015-01-02 14:34:40 -05:00
Chris Beck
bcc5be9f50 Merge pull request #348 from techtonik/sdl1215 
Require SDL 1.2.15, which has important bug fix for Wesnoth
 2014-12-30 20:18:53 -05:00
anatoly techtonik
951b0b7f1f Bump hard SDL requirement to SDL 1.2.10 and soft to 1.2.15 
SDL 1.2.15 contains important bug fix for Wesnoth:
  https://bugzilla.libsdl.org/show_bug.cgi?id=894
  http://forums.wesnoth.org/viewtopic.php?f=5&t=41237

Further discussion:
 https://github.com/wesnoth/wesnoth/pull/348
 2014-12-30 11:57:27 +03:00
Chris Beck
f9a593fcb4 scons: refactor, introduce fcn have_i18n_prereqs() 
This makes the script a bit more readable
 2014-12-29 22:12:02 -05:00
Chris Beck
c62d53239c scons: remove boostfilesystem build option, replace with "libintl" 
This option cleans up some of the compatability path code from the
1.12 release. After this commit:

- boost::filesystem becomes a hard dependency, for scons
- boost::locale is a soft dependency, a build flag "libintl"
allows to swap boost::locale out for libintl.
- the libintl flag cannot be used when compiling for windows
 2014-12-27 16:11:47 -05:00
anatoly techtonik
2a7b1f912c SConstruct: Link with iconv on Windows to fix GetACP error on MinGW: 
i686-w64-mingw32/lib/../lib/libiconv.a(localcharset.o):localcharset.c:(.text+0x7): undefined reference to `_imp__GetACP@0'

https://stackoverflow.com/questions/16558813/link-error-with-getacp-under-mingw64-mingw-builds
 2014-12-26 17:06:19 +03:00
anatoly techtonik
005f11b759 SConstruct: Do not link with libintl - Wesnoth now uses boost::locale 
http://forums.wesnoth.org/viewtopic.php?f=10&p=577648

This fixes compilation error on MinGW:
...
g++ -o wesnothd.exe -mwindows -mthreads build\release\sd... -lboost_locale-mgw49-mt-1_57 -lwsock32 -lintl -lz
../lib/gcc/i686-w64-mingw32/4.9.2/../../../../i686-w64-mingw32/bin/ld.exe: cannot find -lintl
collect2.exe: error: ld returned 1 exit status
scons: *** [wesnothd.exe] Error 1
scons: building terminated because of errors.
 2014-12-26 17:00:11 +03:00
Chris Beck
ea3da43e66 add documentation, scons check for jpg support in sdl_image 
It was reported on Dec 22 2014 in irc that the game is broken if
this is missing, and a search shows that bigmaps and many campaign
story screens use jpg images.

It makes more sense imo to document this as an official dependency
now, and if we decide to change everything to png's then we can go
back and disable the jpg check then.
 2014-12-22 22:07:14 -05:00
Chris Beck
aedb0dce33 lua console history feature uses "history" instead of "readline" 
This is the correct and more minimal interpretation of the optional
dependency.
 2014-11-22 21:56:27 -05:00
Chris Beck
4281c602f2 add cruft to SConstruct to help cross-compiling with readline 2014-11-22 19:46:49 -05:00
Chris Beck
2152b48a14 scons, cmake: by default, search for GNU readline support 2014-11-22 00:03:30 -05:00
Chris Beck
ba46cc80b1 add command history and history expansion to lua console 
Adds an optional dependency on the readline library.
 2014-11-21 21:08:47 -05:00
Chris Beck
da4074e882 use boost mersenne twister rng, add boost::random dependency 
This is a squash of work done in april, see closed github pull
request. #160
 2014-11-03 11:24:24 -05:00
Chris Beck
20dbcff99c fixup SConstruct in case there is no terminal in the environment 2014-11-02 01:08:06 -04:00
Chris Beck
8f93e0ebb0 scons: add OS_ENV option, to forward all of OS environment to scons 2014-11-01 23:13:23 -04:00
Chris Beck
d9ecc0a9f7 scons: don't depend on libintl if boost filesystem enabled 
since we use boost locale instead then.
 2014-11-01 13:30:02 -04:00
Chris Beck
22b7a3932e Merge branch 'save_png' 
Conflicts:
	CMakeLists.txt
 2014-10-31 09:00:26 -04:00
Chris Beck
19548b4e5d add CheckPNG again to the SConstruct 2014-10-29 22:03:03 -04:00
Chris Beck
bdd109ebcb Fixup boost filesystem options for cmake, scons 
The option should control the compilation, in wesnoth-core, of
filesystem_boost.cpp, and gettext_boost.cpp, vs. the old versions.

Using the new code is now the default option, you must explicitly
deactivate with both cmake and scons to get the old stuff back.
 2014-10-25 18:53:43 -04:00
Chris Beck
8dfdc6b185 add SDL_SavePNG, write files as png if possible, unless ending .bmp 
This commit adds a "minimal interface to lib png to support writing
png files from SDL surfaces", to the codebase. It adds a save_image
function to namespace image, and this checks compiler flags to see
if lib png is available. The function will save as a png if png
support is included and save file name doesn't have bmp extension,
and otherwise it will save as a BMP as usual.

We already had lib png as a dependency to build the tools, just not
the main game. This commit changes cmake and scons but makes the
dependency only optional, changing nothing if lib png is not
available.

See here: https://github.com/driedfruit/SDL_SavePNG
 2014-10-22 21:34:38 -04:00
gfgtdf
782c36d800 add scons check for boost_locale for windows 
TODO: maybe the file scons/boost.py should also be changed?
 2014-10-18 20:23:05 +02:00
Alexander van Gessel
ab9baacf6e Change SDL resource loading to use our filesystem functions 
SDL 1.2's own filesystem functions have very limited unicode support,
so provide an SDL_RWops struct to let them use ours.
This also bumps the minimum required SDL_mixer version to 1.2.12

Conflicts:
	SConstruct
	src/filesystem.hpp
 2014-10-17 16:15:09 -04:00
gfgtdf
e038938a73 Merge branch 'boost_filesystem' of https://github.com/AI0867/wesnoth into AI-boost_filesystem_3 
Conflicts:
	.travis.yml
	SConstruct
	src/campaign_server/campaign_server.cpp
	src/create_engine.cpp
	src/editor/map/map_context.cpp
	src/game_config_manager.cpp
	src/gui/dialogs/screenshot_notification.cpp
	src/gui/dialogs/wml_error.cpp
	src/savegame.cpp
 2014-10-17 16:40:45 +02:00
anatoly techtonik
4bb97904e1 scons: show OK status when base prerequisites are met 2014-08-10 16:56:08 +03:00
anatoly techtonik
78b1481af7 scons: make SDL availability flags functions that evaluate lazily on demand 
This moves messages about optional SDL libs checks below
potential warning about missing base dependencies and
makes SCons check GCC compiler before SDL.
 2014-08-10 16:54:56 +03:00
anatoly techtonik
339513900c scons: use full condition evaluation when checking dependencies 2014-08-10 16:54:24 +03:00