Commit graph

745 commits

Author SHA1 Message Date
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
loonycyborg
7116ccf9ef scons: Made out-of-tree builds with -Y option work 2014-03-22 17:45:21 +04:00
loonycyborg
d58589797b scons: relocate config.h and revision.h to build directory 2014-03-21 06:39:50 +04: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
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
Alexander van Gessel (AI0867)
6f2c048e2e Add filesystem_boost.cpp, a boost::filesystem implementation of filesystem.hpp 2013-11-27 13:19:53 +01: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
Sergey Popov
e57fbec3f5 Added a scons option to enable openmp support using gcc's GOMP
openmp=true to enable.
2011-02-28 22:47:44 +00:00
Mark de Wever
ff422edc9c Remove the editor option.
This changes causes the editor to be always build. It also sorts the
file entries in the build systems.

loonycyborg please review the scons changes.
2011-02-19 12:25:05 +00:00
Sergey Popov
452de587cc Comment cleanup/fix 2011-02-12 16:52:50 +00:00
Sergey Popov
95f0164168 Removed gui=tiny option from SConstruct. 2011-02-12 16:44:11 +00:00
Guillaume Melquiond
2279bc0e77 Ported C++0x performance improvements from Autotools to Scons.
Since Scons was forcefully setting the compiler in C++98 mode, this
behavior has been preserved: C++0x features are not automatically
detected (as they were with Autotools) but rather require an
explicitly setting by the user.

Removed strict-aliasing disabling, since it has been fixed for several months already.
2011-02-06 13:23:05 +00:00
Sergey Popov
96e204957c Split CXXFLAGS and LDFLAGS when reading them from system environment. 2011-01-03 23:27:17 +00:00
Sergey Popov
306cccfef5 Made scons not pass -DPREFERENCES_DIR= by default.
Pass it only if prefsdir or version_suffix is set. That is consistent
with other buildsystems and enables XDG compliant locations for user
configuration, user data and cache if prefsdir/version_suffix are not
set.
2010-10-15 01:24:24 +00:00
Sergey Popov
74f1cb1928 When compiling for windows set appropriate define to target windows 2000.
This fixes a compile warning from asio.
2010-08-24 14:44:04 +00:00
Sergey Popov
725c567339 Switch scons to use internal lua. 2010-07-30 12:04:28 +00:00
Sergey Popov
0f55fad9ee Removed some cruft. 2010-07-22 20:24:44 +00:00
Sergey Popov
20e6cf420e asio requires linking against libws2_32 on mingw 2010-07-22 19:43:07 +00:00
Guillermo Biset
b74b332561 Switched ana's default flag in SCons back to true. 2010-07-22 18:37:29 +00:00
Alexander van Gessel
ed56bdce55 revert 2010-07-09T23:11:14Z!ai0867@gmail.com, ANA isn't ready yet 2010-07-10 00:40:42 +01:00
Alexander van Gessel
5ae6f07445 Flip the 'use ana' switch's default to true for scons and autotools 2010-07-10 00:11:14 +01:00
Sergey Popov
5514c4e952 Add use_network_ana option to scons. 2010-06-22 00:05:01 +00:00
Guillaume Melquiond
e6ab1f0c1a Removed explicit disabling of compiler warning,
...as the current codebase compiles fine with it.
2010-05-26 20:19:07 +00:00
Mark de Wever
4cc313daf2 Fix compilation for g++ 4.5 2010-04-25 09:43:12 +00:00
Sergey Popov
339b67f937 Do not build regression tests by default. 2010-03-27 01:34:49 +00:00