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

156 commits

Author SHA1 Message Date
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
Sergey Popov
857f238fbd Don't use pkg-config's --atleast-version arg when checking for pango 
It doesn't seem to work with some versions of pkg-config, e.g. the one
found on Ubuntu 10.04
 2013-02-16 14:30:22 +00:00
Sergey Popov
61997d771c Added version check for pango to scons 2013-02-16 12:09:50 +00:00
Alexander van Gessel
3ae335c5fe Merge branch 'bzip2' 2012-10-08 15:30:56 +01:00
Alexander van Gessel
c772a63de7 typo 2012-09-16 21:56:06 +01:00
Sergey Popov
fe6e89b563 Fix install if the binary has a suffix due to build=debug etc. 2012-05-01 16:19:51 +00:00
Sergey Popov
6ab1b1c5ab scons: made boost autodetection look for lib files in prefix/lib64 too 
This will make it unnecessary to pass boost_suffix=-mt on 64-bit Fedora
 2012-02-24 09:41:00 +00:00
Timotei Dolean
35c7faa5d5 Add /opt and /opt/local to the scons prefixes list 2012-02-07 15:49:47 +00:00
Mark de Wever
6c6bf6e3a2 Added the NativeClient port code. 
Thanks to Evgeniy Stepanov for providing the patch.
 2011-12-17 16:37:19 +00:00
Sergey Popov
e0093253bb Made msgfmt no longer perform a troublesome check. 2011-03-20 15:18:57 +00:00
Sergey Popov
b10560cc58 Made config check for boost.thread add -pthread to compile and link flags. 
This should fix asio check failing with undefined references to libpthread
on some systems.
 2011-02-26 20:50:50 +00:00
Sergey Popov
74463ee619 Remove the install part of tinygui option 2011-02-15 13:30:14 +00:00
Sergey Popov
5805befe7a Made string.Template module optional, 
...it's required only for 'windows-installer' scons target.
 2010-03-28 21:02:55 +00:00
Sergey Popov
7c7b8684a2 Prevent pkg-config from using native packages during cross-compile. 2009-07-11 14:06:53 +00:00
Sergey Popov
cf831db47b Fixed lua check 
The test program was missing #include <lauxlib.h> but
used luaL_newstate() which is defined in it.
 2009-06-23 00:53:35 +00:00
Sergey Popov
640e5aff7c Fixed a mistake in autodetection of versioned installation boost. 2009-06-09 13:25:40 +00:00
Iurii Chernyi
af320fc046 Improved lua detection to work on FreeBSD7... 
...(which uses lua-5.1.pc) Now scons can compile trunk on FreeBSD7
without any os-specific patches.
 2009-04-25 15:47:25 +00:00
Sergey Popov
6afce6a362 scons wasn't installing locales and translations... 
...if those dirs didn't exist at SConscript parse time. Fixed.
 2009-04-17 16:08:05 +00:00
Sergey Popov
01de0050e6 Added some diagnostic output to lua and pkg-config checks. 
(written to build/config.log)
 2009-03-27 13:48:45 +00:00
Sergey Popov
f19234e833 Silence pkg-config errors. 2009-03-27 12:26:19 +00:00
Sergey Popov
b2829b1a1a Added support for finding lua without pkg-config. 2009-03-27 12:26:14 +00:00
Sergey Popov
c42a66d370 Prevent lua check from adding flags to env when it fails. 2009-03-26 20:23:30 +00:00