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

676 commits

Author SHA1 Message Date
Ignacio R. Morelle
4c7b7b5a15 scons: 'test' is also built by the 'all' target 2015-04-05 21:56:32 -03:00
Chris Beck
66f69529b0 Merge pull request #351 from cbeck88/remove_bfs_option_ii 
scons: remove boostfilesystem build option, replace with "libintl"
 2015-01-02 14:34:40 -05:00
Chris Beck
bcc5be9f50 Merge pull request #348 from techtonik/sdl1215 
Require SDL 1.2.15, which has important bug fix for Wesnoth
 2014-12-30 20:18:53 -05:00
anatoly techtonik
951b0b7f1f Bump hard SDL requirement to SDL 1.2.10 and soft to 1.2.15 
SDL 1.2.15 contains important bug fix for Wesnoth:
  https://bugzilla.libsdl.org/show_bug.cgi?id=894
  http://forums.wesnoth.org/viewtopic.php?f=5&t=41237

Further discussion:
 https://github.com/wesnoth/wesnoth/pull/348
 2014-12-30 11:57:27 +03:00
Chris Beck
f9a593fcb4 scons: refactor, introduce fcn have_i18n_prereqs() 
This makes the script a bit more readable
 2014-12-29 22:12:02 -05:00
Chris Beck
c62d53239c scons: remove boostfilesystem build option, replace with "libintl" 
This option cleans up some of the compatability path code from the
1.12 release. After this commit:

- boost::filesystem becomes a hard dependency, for scons
- boost::locale is a soft dependency, a build flag "libintl"
allows to swap boost::locale out for libintl.
- the libintl flag cannot be used when compiling for windows
 2014-12-27 16:11:47 -05:00
anatoly techtonik
2a7b1f912c SConstruct: Link with iconv on Windows to fix GetACP error on MinGW: 
i686-w64-mingw32/lib/../lib/libiconv.a(localcharset.o):localcharset.c:(.text+0x7): undefined reference to `_imp__GetACP@0'

https://stackoverflow.com/questions/16558813/link-error-with-getacp-under-mingw64-mingw-builds
 2014-12-26 17:06:19 +03:00
anatoly techtonik
005f11b759 SConstruct: Do not link with libintl - Wesnoth now uses boost::locale 
http://forums.wesnoth.org/viewtopic.php?f=10&p=577648

This fixes compilation error on MinGW:
...
g++ -o wesnothd.exe -mwindows -mthreads build\release\sd... -lboost_locale-mgw49-mt-1_57 -lwsock32 -lintl -lz
../lib/gcc/i686-w64-mingw32/4.9.2/../../../../i686-w64-mingw32/bin/ld.exe: cannot find -lintl
collect2.exe: error: ld returned 1 exit status
scons: *** [wesnothd.exe] Error 1
scons: building terminated because of errors.
 2014-12-26 17:00:11 +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
Chris Beck
aedb0dce33 lua console history feature uses "history" instead of "readline" 
This is the correct and more minimal interpretation of the optional
dependency.
 2014-11-22 21:56:27 -05:00
Chris Beck
4281c602f2 add cruft to SConstruct to help cross-compiling with readline 2014-11-22 19:46:49 -05:00
Chris Beck
2152b48a14 scons, cmake: by default, search for GNU readline support 2014-11-22 00:03:30 -05:00
Chris Beck
ba46cc80b1 add command history and history expansion to lua console 
Adds an optional dependency on the readline library.
 2014-11-21 21:08:47 -05:00
Chris Beck
da4074e882 use boost mersenne twister rng, add boost::random dependency 
This is a squash of work done in april, see closed github pull
request. #160
 2014-11-03 11:24:24 -05:00
Chris Beck
20dbcff99c fixup SConstruct in case there is no terminal in the environment 2014-11-02 01:08:06 -04:00
Chris Beck
8f93e0ebb0 scons: add OS_ENV option, to forward all of OS environment to scons 2014-11-01 23:13:23 -04:00
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 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