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

90 commits

Author SHA1 Message Date
loonycyborg
cefa806bf5 scons: fixup python3 backport 2018-03-21 23:42:35 +03:00
Alexander van Gessel
2cba6c2cdb Rename gettext scons module to avoid naming conflict 2018-03-21 23:07:54 +03:00
Alexander van Gessel
cf017dc168 Don't use comma-separated arguments to print function 2018-03-21 23:06:22 +03:00
Alexander van Gessel
39d3933073 Further python3 compatibility updates. 
This has been tested with scons2, but not with scons3.
2to3 runs perform no further useful transformations.
 2018-03-21 23:05:43 +03:00
Alexander van Gessel
6af2eb00df Basic 2to3 fixes 2018-03-21 23:04:01 +03:00
loonycyborg
72fe6a38a0 scons: fix out-of-tree builds without using python's operator % 2017-06-08 17:24:18 +03:00
aquileia
74e1a11b45 gitignore: Include more rules from subdirectories 
That is: data/lua/, scons/, and utils/
 2015-01-13 19:28:11 +01:00
loonycyborg
9bc5b15d5f 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-26 18:51:26 +03:00
Chris Beck
45d7882fa7 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.

Conflicts:
	SConstruct
 2014-12-22 22:25:23 -05:00
gfgtdf
b0b42c45b7 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

Conflicts:
	.travis.yml
	SConstruct
	src/save_index.cpp

The second conflict list is from the cherry-pick, the
first is from gfgtdf's original merge.

For me there was additional conflict in
filesystem_boost.cpp, because the
"treat_failure_as_error" flag does not exist in 1.12
branch, it was introduced to accomodate unit tests.

Additionally, dirsize was added even though its not
needed in 1.12 (I removed it), and the change

remove -> filesystem::delete_file

which appear in save_index.cpp in master needed to be
recreated in savegame.cpp in 1.12.
 2014-10-25 23:07:46 -04:00
loonycyborg
af4a0c1c04 Escape >= in pkg-config command in cross-platform way 2014-07-01 14:03:15 +04:00
loonycyborg
26cddd3a73 scons: link statically against libstdc++ and libgcc for mingw32 cross-compile 2014-04-13 20:22:26 +04: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
Sergey Popov
e723064d2c Use " instead of ' to quote package names when invoking pkg-config. 
Since ' breaks on windows.
 2009-03-25 15:06:14 +00:00
Sergey Popov
758d64adf5 Clarified message in lua check. 2009-03-24 14:05:11 +00:00
Sergey Popov
e94dcecf17 Added a custom check for lua. 2009-03-23 01:26:52 +00:00
Sergey Popov
36b0a414be Refactoring. 2009-03-22 22:31:40 +00:00
Sergey Popov
738ddee7b9 Made pkgconfig check add '' around package's name 
to relieve check's caller from this responsibility.
 2009-03-22 19:53:11 +00:00
Sergey Popov
45e1f336a1 Use env.AddMethod to add custom methods. 2009-03-20 20:49:23 +00:00
Sergey Popov
31b4593e56 Fixed installation of translations. 
Made localedirname option actually affect the directory where
translations are installed.
 2009-01-11 13:15:27 +00:00
Sergey Popov
15e0575116 Rewritten InstallFiltered builder. 
Made it have semantics similar to env.InstallAs and operate only on
directories.
 2009-01-11 13:15:16 +00:00
Sergey Popov
f89f6d9bdd Fixed "scons install" with gui=tiny. 2009-01-11 01:12:58 +00:00
Sergey Popov
13a9d22cc3 Implemented a custom check for gettext's libintl. 2008-11-14 12:10:49 +00:00
Sergey Popov
9721409c98 Added env.InstallBinary wrapper method and made use of it. 2008-11-02 18:10:48 +00:00
Sergey Popov
1e0cdc6cd4 Committed Shadow_Master's fix for failure of boost::test check with boost 1.33 2008-11-01 21:52:17 +00:00
Sergey Popov
50e7c63d04 Really fixed install with scons 0.96.93 2008-10-17 08:26:53 +00:00
Sergey Popov
74413860e0 Fixed install with scons 0.96.93 2008-10-16 22:55:24 +00:00
Sergey Popov
647d3e71e0 Fixed breakage with scons 0.96.93 2008-10-16 22:37:34 +00:00
Sergey Popov
b087aec475 Converted remaining installation productions to use InstallData. 2008-10-16 21:58:53 +00:00