Commit Graph

63 Commits

Author SHA1 Message Date
86df5e0c53 Release build squashed 2024-09-08 15:42:06 -05:00
ec0cc25a86 bundle .frameworks from deps/lib 2024-09-07 20:02:30 -04:00
43346df516 stricter check for whether lib is a .framework 2024-09-07 20:02:30 -04:00
d60a12c070 Fix include path in SConstruct
Fix the use-case where header files are put directly in deps/include, which was straight-up broken
2024-09-07 19:25:21 -04:00
d74b11aa31 Reform command-line handling to use Clara, which is bundled with Catch 2024-08-22 23:21:29 -04:00
5b686595f3 mac don't try to install resources to excluded partial build targets 2024-08-01 20:08:09 -04:00
31dcb26d9d WIP encode and decode save files in action logs 2024-07-28 17:07:33 -04:00
b37c8e8532 add cppcodec header library for base64 2024-07-28 17:07:33 -04:00
9e3a50597b all scons platforms add src include directories 2024-07-28 17:07:33 -04:00
73fc5be123 More homebrew search paths in Mac Scons 2024-06-19 21:13:55 -06:00
4a7d145168 Fix win scons (#359)
* fix a link flag
* another hack to find weirdly named libraries
* Fix handling VCRedistInstall.exe
* add src folders to win-scons include paths
* use path.join
* more weird library suffixes
* fix old python syntax in an SConscript file
* find vcpkg libraries and headers
* add icon dir to windows include paths
* remove non-recursive os.listdir line
* remove bad lib paths
* tools build with env["bits"]
* hard-code vcvarsall.bat path, with a note
* pass in other lib paths
* fix syntax without trying to use f-strings
* more bundled libs on windows
* add bin folders for windows installation to find dlls
* fix CheckLib stuff
* test scons pass X86 correctly
* make 64-bit builds the default for scons
* add package flag for building installers
2024-06-12 13:52:19 -04:00
cfea88d59c use path.join instead of + 2024-05-30 20:37:22 -06:00
11451a731d print a note about .sconsign.dblite on clean 2024-05-30 20:15:45 -06:00
bceb8f478d use correct debug build flags (fix #343) 2024-05-30 20:15:45 -06:00
1249f4b21d when building tests, make sure to clone Catch2 2024-05-30 20:15:45 -06:00
826ca1bc95 allow specifying partial build targets (fix #52) 2024-05-30 20:15:23 -06:00
ee538ca30d linux: clone and build TGUI submodule if necessary 2024-05-30 20:02:43 -06:00
8af5a9e1ca Update and fix Mac CI builds
- GitHub discontinued Actions runners for macos-10 and macos-11, so we
  build cboe on macos-12 now
- The path to Xcode.app has changed
- mac scons build wanted a new include statement for vector
- hint scons to look for boost 1.85, not 1.58.
2024-05-29 19:39:03 -04:00
1bb0927ecb Update and fix Windows CI builds
- boost-spirit dependency needed to be installed
- Visual Studio wanted boost/filesystem.hpp included in more places
- a deprecated enum was removed from new versions of boost, so we use
  its replacement enum now
- vcpkg repository is now pinned to a commit where boost 1.84 libraries
  work smoothly, there should be no more surprises
- vcpkg dependencies now cache, so successive CI runs are dramatically
  faster
- for win-scons, we need to use 'call' in our batch script to source
  vcvarsall.bat
- I updated the includepath and libpath we pass to win-scons to match
  reality, but it still can't find any vcpkg libraries. This will need
  further sleuthing
2024-05-29 19:39:03 -04:00
5c0e60711c CI: Enable the mac-scons build 2023-01-21 15:55:58 -05:00
e1d6fe1d12 scons: Missed some things in the Python2to3 update 2023-01-21 15:55:58 -05:00
88b756ab50 scons: Don't treat all source dirs as part of include path 2023-01-05 19:29:16 -05:00
4b336d06fb add Catch2 to scons build 2023-01-05 02:10:20 -05:00
x-qq
55a105a0f6 make the game buildable on linux (#283)
- Scons -> python3
- include issues
2022-03-13 15:38:22 -04:00
xq
1ca0002d19 remove usage of boost threads in SConstruct 2020-02-10 08:23:20 +02:00
29ef8b9c1e Refactor the game event loop and add menus to the Linux build
Patch from @x-qq
Addresses #195
2020-01-25 17:57:32 -05:00
6d5b484ecd Scons: debug builds should be unoptimized 2020-01-19 15:39:42 -05:00
45bbc12208 Linux builds require linking to pthread 2019-12-29 12:25:44 -05:00
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