0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
70547 commits 51 branches 369 tags 4.7 GiB
Commit graph

127 commits

Author SHA1 Message Date
sigurdfdragon
65cf6eb6af Fixup c4d78f8 2017-11-03 22:45:00 -04:00
loonycyborg
6163285ae0 Made ogg vorbis support check use dummy SDL audio driver 2017-11-01 19:54:17 +11:00
Gregory A Lundberg
c4d78f8fc6 Fix Scons for SDL2_mixer 2.0.2 
With the change from SDL_mixer 2.0.1 to 2.0.2, we cannot simply check if SDL_mixer can open an OGG/Vorbis file, we must first open an audio device. [This is probably a mistake, since the documentation implies simply initializing the codec should be enough.] To avoid future problems, upgrade the feature-test program to perform a full initialization and shut-down; everything except actually playing the sound.

Closes #2137
 2017-11-01 19:54:17 +11:00
loonycyborg
a180e09bb6 Made build with scons 3.0.0 work fixing issue #2093 2017-10-11 16:36:20 +03:00
loonycyborg
414659200d scons: ensure that if /usr/include is added to CPPPATH it won't be used with -isystem option 2017-09-22 19:18:38 +03:00
Alexander van Gessel
071b3635b7 Rename gettext scons module to avoid naming conflict 2017-09-21 15:33:48 +02:00
Alexander van Gessel
8d516df25b Don't use comma-separated arguments to print function 2017-09-21 11:45:00 +02:00
Alexander van Gessel
72fdcd78d4 Further python3 compatibility updates. 
This has been tested with scons2, but not with scons3.
2to3 runs perform no further useful transformations.
 2017-09-20 16:51:33 +02:00
Alexander van Gessel
6c3f774390 Basic 2to3 fixes 2017-09-20 15:04:50 +02:00
Alexander van Gessel
5e231ba190 Fix mix of tabs/spaces 2017-09-20 14:53:23 +02:00
Celtic Minstrel
f26fbe9aba Prevent gettext from checking format strings, since we don't use the printf family of functions 2017-05-29 22:50:35 -04:00
loonycyborg
691db62ecf scons: Add support for pkg-config files in custom path to cairo check 2017-05-07 03:40:24 +03:00
Jyrki Vesterinen
6b8273e003 Require Cairo 1.10 or above 
This is needed because the CAIRO_STATUS_INVALID_SIZE constant was added in
that version.

1.10 is old enough that this change shouldn't cause problems for anyone.
For example, Debian Wheezy (2013) has Cairo 1.12.2.
 2017-05-02 19:49:13 +03:00
loonycyborg
0801402dcf Fix out of tree build issue in scons/ieee_754.py 2017-01-17 04:22:47 +03:00
Jyrki Vesterinen
5fc50bf9ae SCons version of commit 7968f7ba 2016-12-22 22:27:30 +02:00
Celtic Minstrel
dc24fa16f7 Remove option to link libintl instead of Boost.Locale 2016-11-18 12:09:56 -05:00
Ignacio R. Morelle
c28e3b633c scons: Exclude Clang from GCC version checks 
SCons stupidly treats Clang as if it were GCC (hint: it's not) and that
causes the config check to fail due to the version symbols being
absent/not what we expect. So just ignore the GCC version when Clang is
detected, in the config test program; we can probably expect whoever is
using Clang to be able to deal with any issues that may arise from
attempting to use a Clang version we don't support.

As for why we don't test the Clang version number, according to
<http://clang.llvm.org/docs/LanguageExtensions.html#builtin-macros>,
"marketing version numbers should not be used to check for language
features, as different vendors use different numbering schemes." And
indeed, it is the case with the versions of Clang shipped with XCode
that they do not accurately reflect the upstream version they correspond
to and have weird version numbers such as 5 (as of this writing upstrema
hasn't even released version 4.0 yet). Such is life.
 2016-11-03 18:12:13 -03:00
loonycyborg
4b536bb0bc scons: compare paths in a different way to avoid error about /usr/include on macos 2016-08-05 21:27:58 +03:00
loonycyborg
35b9d7d5ed scons: fix logic error breaking compile on windows 2016-06-18 22:29:31 +03:00
loonycyborg
5a7b555d3a scons: don't add redundant include path for /usr/include 2016-06-10 21:54:08 +03:00
loonycyborg
8bff4829e6 scons: pass --backup=none --previous -U to msgmerge 2016-03-05 04:21:45 +03:00
loonycyborg
b34b289928 scons: change -I to -isystem for fast=true option in boost.py 2016-01-04 20:26:36 +03:00
loonycyborg
a48be105f7 scons: pass -isystem instead of -I for third party library includes 2016-01-04 20:25:49 +03:00
loonycyborg
296c217e5d scons: change sdl check so it sets up pkg-config and PATH if passed non-empty sdldir 
Needed for specifying local installs of sdl on non-windows platforms.
 2015-11-17 15:32:08 +03:00
loonycyborg
627acb9b0b scons: Add SDL calls to SDL test program 2015-11-15 17:54:28 +03:00
anatoly techtonik
c001f661f0 scons/sdl.py: Escape backslashes on path substitution 
This clears warnings on Windows
https://github.com/wesnoth/wesnoth/pull/481#issue-104760195
 2015-10-10 20:11:47 +03:00
Chris Beck
ef27b9b42c scons: for sdl checks, fall back to old mechanism if new fails 
This should accomodate everyone, unless they are trying to do out-
of-tree builds and also have unicode in their file paths.

Works for me anyways.
 2015-04-07 13:57:22 -04:00
loonycyborg
2fca959437 scons: fix out-of-tree builds without using python's operator % 2015-04-07 16:33:51 +03:00
loonycyborg
ff80a64ebb Revert "scons: fix config checks that require running test programs for out-of-tree builds" 
This reverts commit 3c7a3e6484.
 2015-04-07 15:46:12 +03:00
loonycyborg
a52cc353df scons: Fix blowing up with OS_ENV=true 
If PKG_CONFIG_PATH was unset it was effectively trying to set this
os.environ variable to None which os.environ doesn't allow.
 2015-04-07 15:42:34 +03:00
loonycyborg
3c7a3e6484 scons: fix config checks that require running test programs for out-of-tree builds 2015-04-04 16:49:03 +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
loonycyborg
8a8bc9041b scons: fix mingw32 cross-compile 
Made check for PNG support in SDL always succeed for cross-compile scenarios
because it requires running a test program.
 2014-12-21 22:49:44 +03:00
Chris Beck
8e2191efd9 Revert "scons: don't ignore PKG_CONFIG_LIBDIR environment variable" 
This reverts commit 9f93831a23.
 2014-11-02 01:43:14 -04:00
Chris Beck
9f93831a23 scons: don't ignore PKG_CONFIG_LIBDIR environment variable 
This is an attempt to fixup our scons pkg-config code, following
issue raised here:

https://github.com/Homebrew/homebrew-games/pull/165#issuecomment-61391362
 2014-11-01 22:35:15 -04:00
Chris Beck
a60c7efd9e fixup b88d2af26f 2014-10-27 17:05:41 -04:00
Chris Beck
b88d2af26f scons: add selected headers for boost libs locale, random 2014-10-27 16:54:25 -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
0d750e528b scons: find bzip2 statically compiled into Boost (windows) 2014-08-10 19:43:16 +03:00
loonycyborg
bae75f5c4b Escape >= in pkg-config command in cross-platform way 2014-06-30 15:56:03 +04:00
Alexander van Gessel
07a6ba695e Merge pull request #199 from aquileia/ignore 
Restructure and merge .gitignore files
 2014-06-13 16:27:01 +02:00
aquileia
1715ab3145 gitignore: Include more rules from subdirectories 
That is: data/lua/, scons/, and utils/
 2014-06-09 01:00:45 +02:00
anatoly techtonik
5e3ee31a99 scons: find_include simplify API 2014-06-08 15:49:00 +03:00
anatoly techtonik
8b614c9ed6 scons: find_include expand comprehension for debug 2014-06-08 15:48:52 +03:00
anatoly techtonik
e40196f89e scons: Fix imports 2014-06-03 01:37:26 +03:00
loonycyborg
cf8f786546 scons: link statically against libstdc++ and libgcc for mingw32 cross-compile 2014-04-13 17:35:39 +04:00
Alexander van Gessel
67d462e21b Merge branch 'master' into boost_filesystem 
Conflicts:
	.travis.yml
	SConstruct
	src/addon/manager.cpp
	src/campaign_server/campaign_server.cpp
	src/editor/map/context_manager.cpp
	src/editor/map/map_context.cpp
	src/filesystem.cpp
	src/filesystem.hpp
	src/game.cpp
	src/game_config_manager.cpp
	src/gui/dialogs/editor/custom_tod.cpp
	src/gui/dialogs/lobby/lobby_data.cpp
	src/gui/dialogs/mp_create_game.cpp
	src/gui/widgets/settings.cpp
	src/hotkeys.cpp
	src/multiplayer_create_engine.cpp
	src/multiplayer_lobby.cpp
	src/network.cpp
	src/savegame.cpp
	src/serialization/preprocessor.cpp
	src/widgets/button.cpp
	src/windows_tray_notification.hpp
 2014-04-08 17:42:32 +02:00
Boldizsár Lipka
7b6c125ffd Add an sdl2 option to SCons. 
It allows building Wesnoth with SDL2. False by default. The SDL2 versions of
SDL_image, SDL_mixer, SDL_net and SDL_ttf are required, too.
 2014-03-08 21:30:04 +01:00
Alexander van Gessel (AI0867)
6f2c048e2e Add filesystem_boost.cpp, a boost::filesystem implementation of filesystem.hpp 2013-11-27 13:19:53 +01:00
Charles Dang
485629d0e6 Updated path to testimage 2013-05-30 21:16:09 +11:00