Commit Graph

474 Commits (cb2db50a649ee737ea0f79c4e355cb2ec6e7c5bf)

Author SHA1 Message Date
lethosor e664f4aa7b
CMake: fix find_package(Python) when inactive pyenv Python installations are present
`find_package(Python)`'s default behavior is to attempt to use any `python3.x`
executables it finds before `python3`. This is problematic when using tools such
as pyenv, where `python3.x` executables may be present in a user's PATH but not
be functional.

Setting the `Python_FIND_UNVERSIONED_NAMES` hint to `FIRST` causes `python3` to
be attempted first, if it exists.

Note that this option was introduced in CMake 3.20:
https://cmake.org/cmake/help/latest/module/FindPython.html#hints
2023-05-09 21:56:07 -04:00
Myk Taylor f61d25bdeb
bump to 50.08-r1 2023-04-29 18:46:13 -07:00
Myk Taylor fef7919c08
bump version to 50.08-beta4 2023-04-26 16:19:26 -07:00
Myk b1ae39764b
Merge branch '5008-beta1' into myk_nosdlreal 2023-04-26 15:48:13 -07:00
Myk Taylor e4d84e50e8
Merge branch 'develop' into 5008-beta1 2023-04-24 15:43:32 -07:00
Myk Taylor 54ea391b1d
bump to 50.07-r2rc3 2023-04-24 15:26:33 -07:00
Kelly Kinkade eaf2efee05 update dfhack version 2023-04-18 23:32:54 -05:00
Myk Taylor 93aaa5d19f
bump beta version to 50.07-r2rc2 2023-04-18 21:01:49 -07:00
Kelly Kinkade 337c5eea2a changes to build process for dflaunch
only build dflaunch on steam-specific builds
only download steamworks SDK when building dflaunch
get steam account from environment when downloading steamworks SDK
2023-04-18 22:27:49 -05:00
Kelly Kinkade f336771284 launchdf rewrite
this rewrites launchdf so that the dfhack launcher attempts to linger while df is running
2023-04-18 22:27:49 -05:00
Kelly Kinkade 150708f21d build lanchdf with steam sdk 2023-04-18 22:27:49 -05:00
Myk Taylor 2dbfa37f54
set version number for feedback release 2023-04-16 22:33:24 -07:00
Myk Taylor b9d95c5a0b
bump version to 50.08-rc1 2023-04-13 18:53:11 -07:00
Myk Taylor f13548a47d
continue to ship SDL.dll until DF moves to SDL2 2023-04-13 01:16:22 -07:00
Myk Taylor 21784568bd
migrate from SDL interposing to the hooks API 2023-04-12 21:34:16 -07:00
Myk Taylor f7e3973da8
bump to 50.07-r1, scrub changelog 2023-04-12 01:45:42 -07:00
Myk Taylor 6c1740e2ca
re-version to rc1 2023-04-11 17:13:56 -07:00
Myk Taylor 49d55b2f07
bump version for beta 2023-04-11 12:31:27 -07:00
Myk Taylor 38d4eea7ac
bump to 50.07-beta2 2023-03-31 05:02:02 -07:00
Myk Taylor 779b9bfb6a
bump to 50.07-beta1 2023-03-17 10:08:16 -07:00
Myk Taylor a5de0fef3e
bump to 50.07-alpha3 2023-03-11 13:56:55 -08:00
Myk Taylor f974ac043f
add launchdf binary so steam has an exe to launch 2023-03-07 22:13:08 -08:00
Myk Taylor b8fdc985ec
bump version and changelog to 50.07-alpha2 2023-02-24 15:41:54 -08:00
PopnROFL 7901fdf6ec Update CMakeLists.txt
N++ defaulted to tabs. Fixing.
2023-02-22 07:26:00 -06:00
PopnROFL 15b00587a0 Update CMakeLists.txt
Increased MSVC version to the latest, and updated the error messaging so you know what version you have (if it's installed at all)
2023-02-22 07:26:00 -06:00
Myk Taylor 5100a7ea40
bump to 50.07-alpha1 2023-02-10 10:26:37 -08:00
lethosor 468e9875e5
Update DFHack version to 50.07-alpha0, update xml 2023-02-08 00:00:31 -05:00
Myk Taylor 71deeb7a48
bump version to 50.05-alpha3.1 2023-02-03 15:48:09 -08:00
Myk Taylor 4a21b0843f
bump to 50.05-alpha3 2023-02-03 14:28:17 -08:00
Myk Taylor bb16009f49
bump version to 50.05-alpha2 2023-01-20 17:13:28 -08:00
Kelly Kinkade 27ba25cdbb remove compatibility with msvc express
because it's not 2017 anymore
2023-01-17 12:37:42 -06:00
Myk Taylor 3958d37684
update changelog and submodules for 50.05-alpha1 2023-01-16 16:56:31 -08:00
Kelly Kinkade 9de09ac779
bump version to 50.05 2023-01-06 08:50:10 -06:00
Myk Taylor c70c4131bd
don't include dfhack-config/ in release tarball
create it at runtime
move files around so no dfhack-owned files are in there
2023-01-04 19:41:58 -08:00
Myk Taylor 4789637625
implement new dfhooks API 2022-12-25 18:15:55 -08:00
lethosor c4b31c6fc9
Bump project version to 50.04, try removing leading 0. 2022-12-23 00:01:46 -05:00
Kelly Kinkade 57e599a4d9 comment out barracks reference
barracks appears to have gone away in 50.03
2022-12-17 13:07:37 -06:00
Kelly Kinkade 48ca5eb66d makefile changes 2022-12-15 03:42:23 -06:00
Myk Taylor 2ebd38e400
don't stick compiler options in the definitions 2022-12-11 09:42:25 +00:00
Myk Taylor 2ef36b9ccc
clarify logic for selecting 32 vs 64 bit 2022-12-10 18:13:19 -08:00
Myk Taylor e5f0668afd
fix error message for VS version requirement 2022-12-10 18:11:32 -08:00
Myk Taylor 96e56c3676
make tree minimally compatible with VS2022 2022-12-10 07:09:48 +00:00
myk002 fed9f763c9
update version string in CMake and changelog 2022-12-02 10:18:26 -08:00
Myk Taylor cf24fc7829
ugh unit tests don't work on our OSX build either 2022-11-30 06:57:11 -08:00
Myk Taylor 5d08a0f765
skip unit tests on windows until build env updated
otherwise we get fatal error C1902: Program database manager mismatch; please check your installation

revert this commit once windows is updated
2022-11-30 05:34:39 -08:00
Myk Taylor cf8bcbd424
remove unnecessary warning message 2022-11-30 05:08:53 -08:00
myk002 d0a6a3e930
remove unnecessary target modifications 2022-11-28 17:43:55 -08:00
myk002 ae035d5836
simplify unit testing setup 2022-11-28 17:16:48 -08:00
Josh Cooper 72ad7a1b01 Adds googletest/include for test targets only 2022-11-25 09:43:04 -08:00
Josh Cooper b11b1c3d5f Updates build.yml & moves TEST variable setup 2022-11-25 09:43:04 -08:00