Commit graph

513 commits

Author SHA1 Message Date
Jyrki Vesterinen
406893963f Explicitly link to GObject (should fix #3840) 2019-01-05 19:59:53 +01:00
loonycyborg
cefa806bf5 scons: fixup python3 backport 2018-03-21 23:42:35 +03:00
loonycyborg
5a6df3d253 Made build with scons 3.0.0 work fixing issue #2093 2018-03-21 23:13:37 +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
3776c57877 Get rid of commands module
This module is deprecated and not available in python3
2018-03-21 23:05:14 +03:00
Alexander van Gessel
6af2eb00df Basic 2to3 fixes 2018-03-21 23:04:01 +03:00
loonycyborg
09a1aeb0ab scons: added ctool option to specify c compiler command
if cxxtool option is unspecified it will be derived from ctool
2017-09-21 17:53:47 +02:00
aquileia
dbe397cf20 Windows installer: Use FILE /oname to avoid copying files 2015-08-08 04:20:50 +02:00
Ignacio R. Morelle
ae58d70d03 scons: Clean up warning message 2015-07-22 02:06:10 -03:00
loonycyborg
0394aebee3 Update SConstruct to reflect rename of README 2015-06-20 16:50:03 +03:00
Ignacio R. Morelle
eb2a30bacc scons: 'test' is also built by the 'all' target 2015-04-05 21:58:41 -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
Chris Beck
5ebf88d2c3 fixup SConstruct in case there is no terminal in the environment 2014-11-02 01:50:21 -05:00
Chris Beck
b0f7a3c41f scons: add OS_ENV option, to forward all of OS environment to scons
Conflicts:
	SConstruct
2014-11-02 01:50:01 -05:00
Chris Beck
d11f51cbcc scons: don't depend on libintl if boost filesystem enabled
since we use boost locale then instead
2014-11-01 13:33:39 -04:00
Chris Beck
433798acb1 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.

Conflicts:
	CMakeLists.txt
	SConstruct

Also I squash in this commit, adding boost locale to travis:
48217f8da0
2014-10-26 15:57:42 -04:00
gfgtdf
25f6e2c807 add scons check for boost_locale for windows
TODO: maybe the file scons/boost.py should also be changed?
Conflicts:
	SConstruct
2014-10-26 03:26:11 -04:00
Chris Beck
55e7ebdfd7 cherry-pick of ab9baacf6e -SDL_RWops
Also adds a saucy repository to travis
2014-10-26 00:27:45 -04: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
e0426095fd scons: Made out-of-tree builds with -Y option work 2014-06-12 17:34:22 -04:00
loonycyborg
574a9a6416 scons: relocate config.h and revision.h to build directory 2014-03-24 16:57:17 +04:00
anatoly techtonik
4b2ea950de SConstruct: small typo 2014-02-27 09:55:54 +02:00
loonycyborg
5e731bcba9 Scrub -DNDEBUG from flags returned by mysql_config 2014-02-08 15:20:35 +04:00
Ignacio R. Morelle
0742f1c970 scons: Pass -Qunused-arguments to clang to skip warnings about unused -I paths
Step 1/2 in making it possible to build in strict mode with clang 3.3
and scons here.
2014-01-25 23:51:24 -03:00
Alexander van Gessel
7a1e639ca2 Make the clang test actually work 2014-01-19 00:28:38 +01:00
Alexander van Gessel
eb86ebabfc Don't error out clang with unknown warning options 2014-01-18 23:52:28 +01:00
loonycyborg
fb31727f77 scons: Handle missing environment variables properly when forwarding. 2013-12-10 06:29:11 +04:00
Andrius Silinskas
ed0178adba Update Scons script to work with colorgcc. 2013-09-05 18:33:34 +01:00
loonycyborg
634b0039f8 Fixed scons configure checks for ming32 cross-compile
Removed option for ANA because it isn't used to my knowledge and was
making configure checks more complex.
2013-08-18 21:01:31 +04:00
loonycyborg
b19311db12 Made location of .scons-option-cache modifiable from command line. 2013-06-11 15:33:36 +04:00
Mark de Wever
dfef23aebc Decreases the pango cairo dependency.
The dependency's version is decreased to version 1.21.3. This is the
version currently used in XCode (on the Mac). Upgrading there is
troublesome.

This partly reverts 2b939cebc7.
2013-06-03 21:32:07 +02:00
Alexander van Gessel
58263d1e73 boost::asio depends on pthread 2013-05-23 17:26:30 +02:00
Alexander van Gessel
d412ac181b Don't depend on boost::thread when not using libANA 2013-05-22 02:52:53 +02:00
fendrin
3440218c0f Show the ogg's title (metadata) in the playlist menu. 2013-05-20 11:21:06 +02:00
Eric S. Raymond
7f85fa000c The git transition.
Most references to and dependencies on Subversion have been removed.
"+svn" is now "+dev". Files that can't be fixed yet have a FIXME-GIT
comment in them; most of these are in the website tests.
2013-03-26 10:44:47 -04:00
Sergey Popov
0a2fa1575a Added support for autorevision to scons 2013-03-17 00:38:13 +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
231576cb99 Don't use exec if it's not needed 2012-09-04 00:22:49 +01:00
Sergey Popov
c62cccd0ab Added support for installing a systemd unit file for wesnothd 2012-08-24 15:55:19 +00:00
Sergey Popov
6376cee85a Add -Wno-unused-local-typedefs to scons scrict compile options
That supposed to silence a warning from gcc 4.8, as in 
2012-06-09T21:41:05Z!koraq@xs4all.nl
2012-06-09 22:13:40 +00:00
Alexander van Gessel
c2b3426af9 Do not install libsvn.py, it's not used by anything 2012-04-14 03:08:25 +01:00
Jérémy Rosen
9ec70dabc5 patch #3092 : Allow to specify default system-wide preferences by lipk 2012-03-05 22:36:26 +00:00
Ignacio R. Morelle
20bcf49f3e Remove custom pool memory allocator per wesnoth-dev mailing list discussion
This affects the cmake and scons scripts, and various project files in
projectfiles/. I have only tested my changes to scons (and loonycyborg
might still want to review the diff regarding a line in src/SConscript
involving game.cpp).
2012-02-19 18:43:20 +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
34481784d5 Disable ANA by default in scons since servers are broken with it.
That should fix bug #18295
2011-07-24 12:27:40 +00:00
Sergey Popov
301427f778 Started working on the new asio based network subsystem. 2011-06-18 23:10:55 +00:00
Lukasz Dobrogowski
91435494d8 Created new command_options object,
...which will be responsible for commandline parsing. Introduces
Boost.Program_options dependency.
2011-05-29 17:31:07 +00:00