upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-24 17:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,581 Commits 56 Branches 373 Tags
Commit Graph

745 Commits

Author SHA1 Message Date
Jyrki Vesterinen
eac2c0791d SCons: don't try to pass GCC specific switches to other compilers 
9ad78036 follow-up. Requested by @CelticMinstrel .
 2016-12-24 06:22:51 +02:00
Jyrki Vesterinen
9ad78036b5 Attempted fix for builds failing with compilers older than GCC 6 2016-12-23 00:26:01 +02:00
Jyrki Vesterinen
5fc50bf9ae SCons version of commit 7968f7ba 2016-12-22 22:27:30 +02:00
pentarctagon
9f79398ecf Deletes unused, unbuildable tools 
Deletes create_images, cuter, exploder, schema_generator, schema_validator, and wesmage
 2016-12-18 23:07:11 -05:00
loonycyborg
60329a87a1 Rename Optimize build variant to Optimized for clarity 2016-11-26 14:59:42 +03:00
Sergey Popov
dd1351dc14 Merge pull request #847 from Pentarctagon/Pentarctagon-optimize-build 
Add build which uses higher level of optimization
 2016-11-26 01:18:22 +03:00
pentarctagon
e4b95ae2fe Use BoolVariable instead of EnumVariable for enable_lto 2016-11-25 10:45:10 -06:00
Celtic Minstrel
dc24fa16f7 Remove option to link libintl instead of Boost.Locale 2016-11-18 12:09:56 -05:00
pentarctagon
9de1f61924 Add -s flag, fix $OPT_FLAGS evaluating as an empty string, and correctly pass the arch needed by Windows with -O3 to the optimize build 2016-11-18 01:27:40 -06:00
Pentarctagon
8ea76ce432 Fix compiling with TDM-GCC-64 and -O3 
By default, TDM-GCC-64 was using -march=x86-64, which for whatever reason caused issues when compiling with -O3.  This makes scons force it to use -march=pentiumpro, the same as TDM-GCC-32.  This also changes the release build to use -O3 instead of -O2, which matches the release build default used by cmake and code::blocks.

Added -march=pentiumpro on Windows for -O3 build

m5
 2016-11-18 01:27:40 -06:00
Pentarctagon
0d419cdc36 Check if LTO is enabled 
Check if LTO is enabled

Add LTO flag

Added a flag to enable/disable LTO.  Also pass optimization options to the linker, since older versions of gcc may not automatically use the same options for linking and compiling, and it seems likely clang doesn't do this either.

m3
 2016-11-18 01:27:40 -06:00
Pentarctagon
84ab6fabf1 Get clang as close to working as possible 
additional fixup

m2
 2016-11-18 01:27:40 -06:00
Pentarctagon
458b9ce62d Update SConstruct 
Update SConscript

Update SConscript

m
 2016-11-18 01:27:40 -06:00
Pentarctagon
8b0fe5109a Remove leftover nacl stuff 
Delete some leftover nacl stuff apparently missed by pull #868
 2016-11-14 15:07:48 -05:00
Celtic Minstrel
70326f371c scons: Finish incomplete wesnoth-bundle target 
Note: The target still omits creating the Frameworks directory
required for a distributable bundle.
 2016-11-13 00:43:12 -05:00
Celtic Minstrel
cdb164052a fixup! Travis hack: Don't require vorbis on OSX 2016-11-12 18:41:03 -05:00
Celtic Minstrel
5bc16e2544 Travis hack: Don't require vorbis on OSX 2016-11-12 15:20:04 -05:00
Gregory A Lundberg
f23127e65a Remove LOW_MEM compile-time option 
Per @Vultraz
 2016-11-11 09:20:56 -06:00
Gregory A Lundberg
75c7f9ec39 Delete support for Google Native Client (Nacl). 
This is Chrome-only and W3C is said to be working on a portable alternative.

There is an x86-64/i686 version 1.10 of BfW on the Chrome web store. There appears to be no interest in upgrading to curret versions of NaCL and supporting the Chrome-only plugin.
 2016-11-09 11:34:32 -06:00
Ignacio R. Morelle
bd9fea0fd3 scons: Drop C-isms 2016-11-03 18:12:13 -03:00
Ignacio R. Morelle
4bc38856ce scons: Refactor and reword Info()/Warning() message presentation 2016-11-03 18:12:13 -03:00
Ignacio R. Morelle
3c5332fd05 scons: Make compiler and Boost version requirements match INSTALL 2016-11-03 18:12:13 -03:00
Celtic Minstrel
ffe9182fb3 scons: Mac builds should link Cocoa, not Carbon 2016-11-03 14:46:50 -04:00
Gregory A Lundberg
fb715ec518 SCons Fix bug: Git Hash 
SCons failed to rebuild game_config when the Git hash changes. The newer version was not copied into the source tree.
 2016-10-29 18:50:36 -05:00
Gregory A Lundberg
34dcd0657f Test for Travis and only require SDL 2.0.2 2016-10-16 03:36:57 -05:00
Gregory A Lundberg
907eb5bf7e Require SDL2 2.0.4 on all target platforms. 2016-10-16 00:55:24 -05:00
Ignacio R. Morelle
ea9d077b89 fs: Add utility functions for the new file dialog 
These include an alternate mode of normalize_path() that enforces the
platform's preferred path delimiter (i.e. backslash on Windows) on the
output, and a function to detect whether a path refers to a root
directory.

Unfortunately, the last bit requires introducing a new link-time
dependency on Windows, against a system library. It's guaranteed to be
always there but it seems kind of a waste. The alternative would be to
hand-parse the string but that seems even more of a waste. And no,
Boost.Filesystem can't do this in a straightforward fashion right now.
 2016-10-05 03:06:43 -03:00
loonycyborg
fd1c94b2f8 scons: clean up unused sdl_net helper 2016-10-03 13:41:45 +03:00
loonycyborg
5a75a242c5 scons: remove obsolete raw_sockets option 2016-10-03 13:34:30 +03:00
loonycyborg
c16adcd8c9 Merge branch 'campaignd_asio' 2016-09-15 16:34:09 +03:00
Ignacio R. Morelle
3a925c85e3 scons: Fix compiler switch typo 
Accidentally introduced in 2483fc80e4a57f7cdc0ff9fbeaed08d85699d0d6,
oops. Didn't become evident unless hitting other compiler errors,
though.
 2016-09-13 19:42:08 -03:00
loonycyborg
1c90221527 Merge branch 'master' into campaignd_asio 2016-09-13 16:37:36 +03:00
Ignacio R. Morelle
2483fc80e4 scons: Don't pass a C++ compiler flag to C compilers 
Needed since 0180a72573a482683485821c8d43a82a546a86c6 introduces the
requirement of a C compiler in the building process. Otherwise we get
this from GCC 6.1.1:

  cc1: error: command line option ‘-Wold-style-cast’ is valid for C++/ObjC++ but not for C [-Werror]
 2016-09-11 02:11:22 -03:00
loonycyborg
31bbedd94e Merge branch 'master' into campaignd_asio 2016-06-17 21:59:37 +03:00
loonycyborg
44fa6651c8 scons: help text clarification for extra_flags_* variables 2016-06-17 13:22:54 +03:00
loonycyborg
fccf4f067f scons: add an option to enable clang/GCC sanitizer functionality 2016-06-17 12:51:46 +03:00
loonycyborg
358bf3f9f8 Switch campaignd to use asio by reusing wesnothd code via server_base class 2016-06-15 22:14:29 +03:00
loonycyborg
550fa9086b Revert "scons: remove SDL_net dependency from unit tests" 
This reverts commit 101e5d36ef3c799bf43668cdd901f2e4080914c3.
 2016-06-09 12:29:08 +03:00
loonycyborg
101e5d36ef scons: remove SDL_net dependency from unit tests 2016-06-09 12:04:27 +03:00
loonycyborg
3ee7fe2e59 scons: no longer link client against SDL_net 2016-06-08 17:20:59 +03:00
loonycyborg
0f9e04501f Remove obsolete and unused HAVE_CXX0X macro from buildsystems 2016-06-01 22:14:09 +03:00
loonycyborg
67479e4074 scons: properly move asio check to serverside checks 2016-06-01 17:30:43 +03:00
Andreas Löf
d350d91c40 Make strict compilation under scons behave like cmake 
This adds -Wold-style-cast to the CCFLAGS when compiling everything
but lua. Lua requires an exception from the flags and there's thus a
workaround added.
 2016-06-01 20:57:43 +12:00
loonycyborg
37688d57d6 Remove redundant SDL check 2016-05-07 11:27:36 +03:00
loonycyborg
94c8533e1f Merge branch 'master' into asio_wesnothd 2016-04-07 17:17:21 +03:00
gfgtdf
479f1b3d52 also allow c++1y in SConstruct 2016-04-03 02:38:54 +02:00
loonycyborg
bb02ce7c72 scons: add option to enable using c++14 features 2016-04-01 19:46:02 +03:00
loonycyborg
af7286c421 scons: add check for boost.thread since it's a dependency now 2016-03-31 00:46:06 +03:00
loonycyborg
0795ad879b scons: due to switch to std c++11 always pass -std=c++11 2016-03-31 00:10:32 +03:00
Andreas Löf
5c6e7c7d20 Remove SDL1 from SCons and CMake 
This makes SDL2 the only build alternative for Wesnoth. Any
conditionals are removed, leaving only the settings that rely on SDL2.
 2016-03-13 11:34:29 +13:00