674 Commits

Author SHA1 Message Date
loonycyborg
5164cd030f Fix #3809 : add option to control use of autorevision to scons 2018-12-27 14:39:31 +03:00
Martin Hrubý (hrubymar10)
ca7f7a2e93 Fix C-Make and Scons builds 2018-10-30 07:16:42 +02:00
Victor Sergienko
8716b8f9d0 #3634, #3557: Port from iOS: Compile with Apple crypto framework instead of OpenSSL. 2018-10-25 23:20:04 -07:00
Pentarctagon
6714ef32e0 Fixes #3518
Certain distro/compiler combinations will apparently warn about not optimizing when _FORTIFY_SOURCE is set.

(cherry-picked from commit 09fcc6b0519d458cbc3e16788576000a8484020b)
2018-10-07 03:24:57 +00:00
loonycyborg
790d13e937 scons: fix strict hardened builds on Gentoo
(cherry-picked from commit 0c3ba36d68754acc2328fd704e1b8df17383e8cd)
2018-10-07 03:23:46 +00:00
josteph
2b2b08431e Revert "Excluded data/test/ from tarball"
This reverts commit c93482560779c0e137d9598b9e7185338afe2b82.

Keep data/test/ in 'scons dist' tarballs to match official tarballs.

(cherry-picked from commit bad6897cbc75225624814b66c9226cf6233e95cf)
2018-10-07 03:22:54 +00:00
josteph
0b633badc5 Fix 'scons dist'
This makes 'scons dist' work, although the resulting tarballs are not
yet identical to cmake tarballs.

Remove awk usage made obsolete by the git transition
(7f85fa000c836c27cfe9d829db3b0e8aaeb49821).

Update src/revision.hpp reference to use src/revision.h.  The former
name is unused since at least 7625b1e079b470119d72ea67ce955104f464e4b8.

(cherry-picked from commit 0ee485415710288d27f7b766e48fe7451b03c9a4)
2018-10-07 03:22:53 +00:00
Pentarctagon
e405dc2bff Disabling hardening on Windows due to tdm-gcc's poor support.
As per sigurd's trial and error: RELRO's options are unknown entirely and -fstack-protector-strong results in compile errors.  Building with just PIE and _FORTIFY_SOURCE enabled does then compile, but results in a broken executable.

(cherry-picked from commit c9541176776aeb676e99f1804d123552430582ee)
2018-10-07 03:22:51 +00:00
Pentarctagon
9e78232e0e Fixup hardening options for Windows.
(cherry-picked from commit 277158222200d4131bbbb385e45a8c6993020b44)
2018-10-07 03:22:43 +00:00
Pentarctagon
bc3ad71f03 Fixup for osx hardening options.
(cherry-picked from commit da6ebc7423ea7b2e8a242ceb44f7bc72f2d08426)
2018-10-07 03:22:37 +00:00
Pentarctagon
6be6646a4e Enabled hardened executables by default.
The result of running "hardening-check wesnoth" now shows:
* Position Independent Executable: yes
* Stack protected: yes
* Fortify Source functions: yes (some protected functions found)
* Read-only relocations: yes
* Immediate binding: yes

(cherry-picked from commit 3290961db2eb00221c94f88f02f77ab640f497a4)
2018-10-07 03:22:36 +00:00
Pentarctagon
39785177e2 Fix stack protection with LTO.
(cherry-picked from commit 5a2d1bc992a4527eeee60f8624880a34d84be57c)
2018-10-07 03:22:33 +00:00
loonycyborg
b3bd32a936 scons: add missing winapi lib dependencies to mingw build
(cherry-picked from commit d96d5c506c2d8c8f47984b2e1d4bf13111e195a2)
2018-10-07 03:22:10 +00:00
loonycyborg
ffb078c119 scons: don't let pkg-config to add prefix on msys2
This is workaround for windows style path confusing scons if they appear
in CPPATH etc. Paths without prefix still happen to be valid and they
start with "/", not "c:".

(cherry-picked from commit b347bc70b163a572751b7ac72f23e472c3ac9238)
2018-10-07 03:22:09 +00:00
loonycyborg
f7ad6de3fd Enable ASLR and NX bit security features for mingw builds
(cherry-picked from commit 8b1a5c0dde9e1a36531e6d104737b40531e59cd0)
2018-10-07 03:22:06 +00:00
Charles Dang
848062fde6 Remove the CMake/Scons compile-time check for IEEE 754 compliance
Now handled by a static assertion.

(cherry-picked from commit d9315199ee44dfa8a36e4e01a9332ef21505df3c)
2018-10-07 03:21:31 +00:00
Charles Dang
ee2b9d242e Bump min required Windows version to 7
Technically, all this code should work on Vista, (including the recent switch to using
SHGetKnownFolderPath), but since we're also considering requiring Visual Studio 2017
for building, we need Windows 7.

(cherry-picked from commit 2a585118d8b6c4b37d0ff9446a72ca20419ff7f7)
2018-10-07 03:20:45 +00:00
Pentarctagon
e2501940a0 Warn about use of trampolines for nested functions.
Use of this feature with GCC in particular causes the stack to become marked as executable.

(cherry-picked from commit 96b43a9af4ec76882afe6924e9c3dafb5b8beac5)
2018-10-07 03:20:41 +00:00
pentarctagon
36eae8c771 Add option to build wesnoth with hardening options.
(cherry-picked from commit 6c5fc82b1baa0fc7b40beaccd975d595c5db728f)
2018-10-07 03:20:23 +00:00
pentarctagon
a040d521a4 Updates cmake and scons to be able to compile with OGL.
Scons OpenGL/GLEW test taken mostly verbatim from 3e2eba22a96cb2c6c69ee5109059b806f22a372f

(cherry-picked from commit 5e36a90039ddde3625690ace5259198e1932a7f8)
2018-10-07 03:20:04 +00:00
Matthias Krüger
4c5e74b2da cmake/scons: if sanitizers are enabled, also add -fno-omit-frame-pointer and -fno-optimize-sibling-calls.
Otherwise, if we build with sanitizers and optimizations, the sanitizer stacktraces can become quite hard to read.

(cherry-picked from commit 29089a47369c32d4eabb93ac7f5b33222c047670)
2018-10-07 03:19:54 +00:00
Martin Hrubý (hrubymar10)
75d6df374d Remove rest of Growl things which I forgot before
(cherry-picked from commit 783738b2f52f12c998a94ae9483803eeace89b38)
2018-10-07 03:19:36 +00:00
pentarctagon
754b8a6221 Print the value of STRICT and build_timeout.
(cherry-picked from commit 96c41271d80937da778d05477b0e1caadc6def10)
2018-10-07 03:19:35 +00:00
pentarctagon
1ef1704fd9 Adds the opt/OPT option to scons/cmake.
Travis now also makes use of this to set the optimization level for the -O0 builds, rather than extra_flags_*.  This additionally fixes an issue where using -O0 in the release build with LTO resulted in the individual *.o files being compiled with -O0, but LTO then still linked with release's default -O3.

(cherry-picked from commit 63ff641662d4192401a49f9a002d7872000a3f02)
2018-10-07 03:19:35 +00:00
Charles Dang
31e6c40653 Removed OpenMP-related code
After some discussion, we concluded that this code was unmaintained, not even used in
some places (display.cpp, units/frame.cpp), leaving the only area that really used it
at all the image surface cache. Considering there was never really a conclusive benchmark
of its benefits and because said surface cache will be used a lot less going forward,
we're just removing it and simplifying everything for everyone.

Closes #1260 since it's now irrelevant.

(cherry-picked from commit 3792612fb759942e6eb5de51364c2cca4ed16b40)
2018-10-07 03:19:30 +00:00
loonycyborg
a0c91ac41e Fix build against static libboost
(cherry-picked from commit c51065e39c85bfd8e4705cefa381451385c29bf8)
2018-10-07 03:19:28 +00:00
pentarctagon
b32ce37de5 Allow setting c++17 in scons.
(cherry-picked from commit 7aeca70cb04f1990aeef0213b88ec80b0f4d24f8)
2018-10-07 03:19:14 +00:00
Charles Dang
32da54b059 Removed Boost Thread as a built-time dependency
We use std::thread now.

(cherry-picked from commit 9de7aff9044b1aae7fc56c4b78a400d93c0f6750)
2018-10-07 03:19:10 +00:00
Iris Morelle
6f5f1482d2 cmake, scons: Drop option to enable or disable the removed SDL_SavePNG code
Commit dfc42e8a8dd550ca04ae16e2d2d7ebffbba0bc21 removed said code since
Wesnoth can use IMG_SavePNG() from SDL_image 2.0 instead. However, the
author left the build-time configuration options intact, and also part
of the necessary code for CMake to link Wesnoth against libpng.

Note that this change also eliminates an unnecessary direct link-time
dependency on libpng when using both CMake and SCons.

(cherry-picked from commit 4799ca05fe40838c41814433780d0464d9b8f071)
2018-10-07 03:18:33 +00:00
Iris Morelle
cdae5011bf scons: Sort help text with a custom function that will run on Python 3
(cherry-picked from commit 6b67c18d8927cf7f982a1feac867c301211a186e)
2018-10-07 03:18:30 +00:00
Iris Morelle
2584a21716 Sort scons --help output
(cherry-picked from commit a31b5ebcba90787eb9d0de8ceecfbc5293dd2eb3)
2018-10-07 03:18:30 +00:00
Iris Morelle
d0c9a02189 Revert "Revert "Bump min Boost version to 1.56.0""
This reverts commit cdf9b465c668648721c4638ce117da130ad36284.

May this noise be my vengeance.

(cherry-picked from commit f6a128579ad6d94cc7c8a57bebd1fc2bb0f735a0)
2018-10-07 03:18:08 +00:00
Iris Morelle
777eb9ef2d Revert "Bump min Boost version to 1.56.0"
This reverts commit c82c1ff9059aa19adda6a527f41595a18b8c0a1f.

(cherry-picked from commit cdf9b465c668648721c4638ce117da130ad36284)
2018-10-07 03:18:08 +00:00
Gregory A Lundberg
cc5fe2adc1 Change SCons and CMake to C++14
(cherry-picked from commit 2a17ecccfcbf30f0d966db74c176cae87648c6d6)
2018-10-07 03:17:57 +00:00
Celtic Minstrel
c82c1ff905 Bump min Boost version to 1.56.0 2018-03-18 01:59:36 -04:00
loonycyborg
0eb314c4b5 scons: reorder boost checks to avoid linker errors with static libboost 2018-03-13 21:51:47 +03:00
loonycyborg
e637c55d50 scons: added a check for icu support in boost locale 2018-03-13 18:23:32 +03:00
Charles Dang
471c9e876a Addressed a large chunk of the whitespace issues from #2613
[ci skip]
2018-03-09 11:37:00 +11:00
pentarctagon
6f02d1bebb Make scons' mysql handling more normal. 2018-03-02 13:55:22 -06:00
Charles Dang
5c570841d3 Bump required Pango version from 1.21.3 to 1.22.0
Just enough to get rid of that conditional use of pango_cairo_font_map_create_context.
2018-02-17 12:18:17 +11:00
Jyrki Vesterinen
1d47c23efe Revert "Enable LTO by default."
This reverts commit 44f567c6a3252992907d320e38bb93ab14ff7359.

Enabling LTO by default causes too many problems, inclusing build
failures for @doofus-01 and link failures with Clang for me.

Players and packagers can still amanually enable LTO in case it
works fine for them.
2018-02-12 08:11:50 +02:00
Jyrki Vesterinen
a5a9f6ab19 Revert "Fix release builds with Clang and SCons"
This reverts commit a1e821fb953f401b5d7f23a7a5d4fa80cd367866.

This won't be necessary with the next commit.
2018-02-12 08:08:01 +02:00
pentarctagon
bdd5089dd7 CC should be checked for gcc, not CXX. 2018-02-11 10:46:11 +02:00
Jyrki Vesterinen
a1e821fb95 Fix release builds with Clang and SCons
The detection for when Clang is used was incorrect, resulting in GCC-only
parameter being passed to Clang.

In addition, at least on my system LTO+Clang caused linking errors even
with that fixed. As an emergency fix, I completely disabled LTO for Clang.
2018-02-11 01:27:22 +02:00
pentarctagon
c8200093b2 Fixes LTO/PGO options not being used when ccache is enabled.
When ccache is enabled, env["CC"] becomes - 'CC': '$CCACHE gcc'
2018-02-09 19:33:47 +02:00
Severin Glöckner
3777a5b307 add an appdata file for appstream software centers
(closes #1831 & #2160)
2018-02-02 23:46:59 +01:00
pentarctagon
44f567c6a3 Enable LTO by default.
LTO for Windows is disabled for now, as TDM-GCC does not work well with it.
LTO for Travis is also disabled, due to the extra time linking with LTO takes.
2018-02-02 17:56:07 +11:00
pentarctagon
73a3e3cc63 Adds cmake's pedantic option to scons. 2017-12-04 09:23:33 -06:00
pentarctagon
817e9dbb33 Remove the scons workaround for Travis only having SDL 2.0.2 2017-12-04 09:35:58 +11:00
pentarctagon
49b6ede463 Move most strict warning flags to the default build flags.
This moves all the warnings flags from the strict build to the regular build, except for -Werror. This means that the only difference between strict builds and non-strict builds will be if warnings are turned into errors.
2017-12-03 15:30:52 -06:00