Commit Graph

85 Commits

Author SHA1 Message Date
Rémi Verschelde
de48ef1b3c SCons: Do not enforce clang on posix, allowing use of GCC
The compiler can now be defined with `scons CC=clang CXX=clang++`
and/or with the `CC` and `CXX` environment variables.

The build will pick the default C and C++ compilers of the user's
system, so probably GCC on most, and Clang and some of them (e.g. on
Travis which is configured to use Clang).

Also cleaned up unnecessary definitions which are already part of the
base environment, and removed the unnecessary (default on Linux) and
Clang-only -stdlib=libstdc++ definition (still needed on macOS).
2018-04-07 16:01:34 +02:00
Rémi Verschelde
539664ecd6 SCons: Use list in Append() to ensure proper argument spacing
Otherwise we can end up with `scons CXXFLAGS="some-arg"` giving
a `some-arg-std=c++11` argument when `-std=c++11` is Append()'ed.
2018-04-07 16:01:34 +02:00
Rémi Verschelde
3909d80360 SCons: Use Variables for command line option and help output
Also add options to configure the compilers for C and C++ (no C code yet
but C libraries may be added in the future, and we wouldn't to mix e.g.
gcc for C and clang++ for C++).
2018-04-07 16:01:34 +02:00
Rémi Verschelde
cb0054d68a SCons: Fix warning on posix build
`build/pkg/SConscript` only exists for darwin or for win32 when
makensis is available, so it should not be added inconditionally.
2018-04-05 10:10:03 +02:00
Michael Bonfils
69589afff7 Fix travis for Linux build
Several issues was detected with linux build:
- travis_wait raise timeout
- --jobs=2 sometimes fails
- add flag BOOST_NO_CXX11_SCOPED_ENUMS to fix compilation with old boost filesystme
- add missing tool xmllint
2018-03-11 12:07:20 -04:00
Michael Bonfils
12c3ce26f8 Fix compilation of linux 2018-02-10 17:08:33 +01:00
Michael Bonfils
d940f2c39d Merge branch 'linux' into merge_linux 2018-02-08 20:36:46 +01:00
51c6bdd5ea Minor scons improvements and fix an error in MinGW build 2017-09-16 22:36:43 -04:00
39f11dddb5 Fix scons+cl build 2017-09-16 13:12:36 -04:00
beadb49217 Fix scons build
Tested on Mac only, but probably also works on Windows/Linux
2017-09-04 20:45:45 -04:00
1bfaab8afc fixup scons script 2017-08-31 22:06:43 -04:00
a31797582a Some fixups, mainly to support MinGW builds 2017-08-27 23:29:00 -04:00
absquatulate
b6b6871f86 Added X11 to scons build and implemented file save and load using zenity. 2017-04-04 19:17:31 +12:00
absquatulate
1406e3dcac Added a debug argument to scons script. 2017-04-04 19:16:47 +12:00
4ee6371f15 Travis: Fix Linux build and disallow failures 2017-01-30 16:42:12 -05:00
823e96f637 Stuff to make linux build work 2017-01-26 22:56:07 -05:00
ultra
057aade18b Get it building and launching something 2017-01-26 17:17:25 -05:00
ultra
ffa2d0e950 Hacked scons scripts and got it building on Ubuntu with clang.
Minor changes to support building on recent clang
Addition of some headers for non-compiling files
2017-01-26 17:16:38 -05:00
df54ee1757 scons: Set default include paths just to be sure 2015-12-20 00:56:19 -05:00
Ben Scott
0e2aac36fe added homebrew includes & libraries 2015-12-20 00:23:59 -05:00
2d1bd5158e scons: tweak configuration steps 2015-09-30 19:33:19 -04:00
e40a220638 scons: Remove entire build folder when cleaning 2015-09-30 19:02:51 -04:00
3a57b65a7a scons: Don't configure when cleaning 2015-09-30 18:59:46 -04:00
0c8d69c48e scons: Match README 2015-09-14 02:45:01 -04:00
43e057949d scons: Generate Windows installer
Also:
- scons: Fix copying wrong scenario graphics on Windows
- MSVC: Fix output filenames for release builds
2015-09-14 02:15:40 -04:00
19197a64e7 scons: Improve validation of XML dialogs, and make it work on Windows if xmllint is installed 2015-09-13 23:55:32 -04:00
73543caf49 Rename file to reflect its Mac-specific status 2015-09-13 11:56:13 -04:00
f1b097a54c scons: Whoops, left a useless comment there. 2015-09-13 10:36:28 -04:00
f3e602747e scons: Try to auto-detect MSVC lib directory 2015-09-13 00:37:56 -04:00
853c270146 scons: Get working on Windows with MSVC 2015-09-13 00:15:28 -04:00
67a7eaf9ca scons: Auto-detect package manager and repo-local path prefixs 2015-09-12 04:37:59 -04:00
a744468658 scons: Bundle required libraries in Mac app packages 2015-09-12 03:57:46 -04:00
b9ccbcd2dd scons: Add some basic configure checks for Boost/SFML/zlib 2015-09-12 00:47:10 -04:00
167e3b7a30 Incorporate the generation of gitrev.hpp into the scons build script 2015-09-11 23:30:59 -04:00
832b8b5f91 Set up scons build system
- In its current state, it produces a valid, launchable Mac application package, though one that's not redistributable (relies on system-installed libraries)
- Partial support is already in-place for a Windows build
2015-09-11 23:10:37 -04:00