upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 02:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,885 Commits 60 Branches 374 Tags
Commit Graph

560 Commits

Author SHA1 Message Date
Chris Beck
d9ecc0a9f7 scons: don't depend on libintl if boost filesystem enabled 
since we use boost locale instead then.
 2014-11-01 13:30:02 -04:00
Chris Beck
22b7a3932e Merge branch 'save_png' 
Conflicts:
	CMakeLists.txt
 2014-10-31 09:00:26 -04:00
Chris Beck
19548b4e5d add CheckPNG again to the SConstruct 2014-10-29 22:03:03 -04:00
Chris Beck
bdd109ebcb 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.
 2014-10-25 18:53:43 -04:00
Chris Beck
8dfdc6b185 add SDL_SavePNG, write files as png if possible, unless ending .bmp 
This commit adds a "minimal interface to lib png to support writing
png files from SDL surfaces", to the codebase. It adds a save_image
function to namespace image, and this checks compiler flags to see
if lib png is available. The function will save as a png if png
support is included and save file name doesn't have bmp extension,
and otherwise it will save as a BMP as usual.

We already had lib png as a dependency to build the tools, just not
the main game. This commit changes cmake and scons but makes the
dependency only optional, changing nothing if lib png is not
available.

See here: https://github.com/driedfruit/SDL_SavePNG
 2014-10-22 21:34:38 -04:00
gfgtdf
782c36d800 add scons check for boost_locale for windows 
TODO: maybe the file scons/boost.py should also be changed?
 2014-10-18 20:23:05 +02:00
Alexander van Gessel
ab9baacf6e Change SDL resource loading to use our filesystem functions 
SDL 1.2's own filesystem functions have very limited unicode support,
so provide an SDL_RWops struct to let them use ours.
This also bumps the minimum required SDL_mixer version to 1.2.12

Conflicts:
	SConstruct
	src/filesystem.hpp
 2014-10-17 16:15:09 -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
4bb97904e1 scons: show OK status when base prerequisites are met 2014-08-10 16:56:08 +03:00
anatoly techtonik
78b1481af7 scons: make SDL availability flags functions that evaluate lazily on demand 
This moves messages about optional SDL libs checks below
potential warning about missing base dependencies and
makes SCons check GCC compiler before SDL.
 2014-08-10 16:54:56 +03:00
anatoly techtonik
339513900c scons: use full condition evaluation when checking dependencies 2014-08-10 16:54:24 +03:00
Alexander van Gessel
7960e4746f Fix SDL2 compilation with scons 2014-06-11 12:35:19 +02:00
anatoly techtonik
81510068e4 scons: Explain out-of-tree build and Repository 2014-05-02 16:30:30 +03:00
anatoly techtonik
1ee1b16499 scons: Replace ERROR: prefix with WARN: 
As noted by @loonycyborg in pr#161 failed Configure tests
are acceptable for some kind of builds.
 2014-05-02 15:29:37 +03:00
anatoly techtonik
e780569f82 scons: Format output for readability 
Add separators between configure and build phases, prepend
failed prerequisite checks with ERROR: suffix and reformat
code a little.
 2014-05-02 03:54:03 +03: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
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 2b939cebc7a4eea6ec6adae40c8396f836122940.
 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