From 69aaf6d4f9e6e79fd0149bf1761f2cdcc9c661d7 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Tue, 19 Nov 2024 22:12:17 -0800 Subject: [PATCH] windows fix --- .efrocachemap | 48 +++++++++++------------ CHANGELOG.md | 2 +- Makefile | 3 +- src/assets/ba_data/python/babase/_meta.py | 2 +- src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/shared/ballistica.cc | 2 +- 6 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 490871584..175a3c7f9 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4099,22 +4099,22 @@ "build/assets/windows/Win32/ucrtbased.dll": "bfd1180c269d3950b76f35a63655e9e1", "build/assets/windows/Win32/vc_redist.x86.exe": "15a5f1f876503885adbdf5b3989b3718", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "d80015d5c99619938a2e627d53ac5864", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "aff410422f7d29bda3dfcec42f7dc737", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "e7ed11250d1f4d1d27e669557f25b8ec", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "862efb702f9380faad0a18b8508005da", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "f40c265219d3506bb58d246e792eb67c", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "a50c6ed069c6251a1df383cb5992c16c", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "e2cccc17a9908efeed257c034f2c15fd", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "fc2130ec257a107c32f4a0e64cb5d571", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "d55ae00e13b66a3e3a541a376f0b2359", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "5779299c37221ada7cba971e83ec7d81", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "b9ee0d4ff328e4e47968a58ded05d46d", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "d264fcfea3483ddbac19df6e89ef98ba", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "9b130271daeb479f98c03a15f9834a23", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "b32b31e25d2fda4e8463578ec287b0f5", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "8094b1d13e3c5680762a6984fffe3da3", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "ecb1c290a5a071a11f858551b06f482a", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "f2b4a48180ab14d238b41e1530381393", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "e89a3f4680e8800f94a47ba00fda82e9", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "9e58df7e8dc622d0e07bcc2e5e01980b", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "76e0ee141fc138b015e466b876ca5c40", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "dc69ff22b10a69bd68551921e80e6d4f", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "382f41634994e64aef25cbd89ad30608", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "99b67d89e72156fecf82728f3ca9023e", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "9e123048c9a937623bf8a9049fe52a68", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "0bb1ebf96216318b97f624ca01515319", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "fe741b2e775639b715245a6397ce0f01", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "463e5220f0987196df4b74433eb6b533", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "fcdcc5a4214eff648234f0f6ad8db286", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "71eb60bca0efb35b5519359f32701ef0", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "4409110d1107f9ec6ea314574b963092", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "8287610eeae417260ef3891d09526366", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "07783dd9ef83a4417d9e7b8769e704e1", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "9f68628128b83900865751c347964c77", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "0ad4775fc4ff5cd2e3b63ecf7823daa4", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "9f68628128b83900865751c347964c77", @@ -4127,14 +4127,14 @@ "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "41f933cc9a7c6cb748ff2fb0d5237b4d", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "28b13d45428184f0715565c54f23b115", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "41f933cc9a7c6cb748ff2fb0d5237b4d", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "07f4205482e7e90e60f36acd7424f52a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "ddfe00fe33cebfed592c06fe52866995", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "48c0fdc7b606eb211b48ceaaefa06431", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "3e0d9bf058c59087006df668a8cedbfc", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "621e2598aa8cca9af188b838f103695b", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "847204a7d32dbbf21858f7de32ed2836", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "13983ea5c18d7cde170d5bb7758aee2f", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "8bfe1218083ab60808e234142525778f", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "d31f476fe2587f891662739d5cf66498", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "42d34950f26b92cf25b190868f53a20f", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "98912594ab71b0f9f64a24e8234b7a6a", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "7475905e88c2a39f34c4bd216b9efffd", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "d9ceb775128672c17f00e2b2c01c6e4e", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "5546313b197639b7ec6d02a69297ef26", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "4f0e09828aaa10b9a5ad9693ecc9d269", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "028fdd9f3d6434b2779f94eafc6f82f1", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad", "src/ballistica/base/mgen/pyembed/binding_base.inc": "3a583e7e03bd4907b21adc3bf5729d15", diff --git a/CHANGELOG.md b/CHANGELOG.md index b2a1572b9..480e8ed41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.37 (build 22103, api 9, 2024-11-19) +### 1.7.37 (build 22105, api 9, 2024-11-19) - Bumping api version to 9. As you'll see below, there's some UI changes that will require a bit of work for any UI mods to adapt to. If your mods don't touch UI stuff at all you can simply bump your api version and call it a day. diff --git a/Makefile b/Makefile index a7eb61931..56006a214 100644 --- a/Makefile +++ b/Makefile @@ -930,7 +930,8 @@ test-rpc: tests/test_efro/test_rpc.py # Tell make which of these targets don't represent files. -.PHONY: test test-verbose test-full test-message test-dataclassio test-rpc +.PHONY: test test-fast test-verbose test-full test-fast-full \ + test-message test-dataclassio test-rpc ################################################################################ diff --git a/src/assets/ba_data/python/babase/_meta.py b/src/assets/ba_data/python/babase/_meta.py index db54f5bcb..f0ad39e7b 100644 --- a/src/assets/ba_data/python/babase/_meta.py +++ b/src/assets/ba_data/python/babase/_meta.py @@ -387,7 +387,7 @@ def _process_module_meta_tags( # Make an exception for this specific file, otherwise we # get lots of warnings about ba_meta showing up in weird # places here. - if str(subpath) not in ('babase/_meta.py',): + if subpath.as_posix() != 'babase/_meta.py': logging.warning( 'metascan: %s:%d: malformed ba_meta statement.', subpath, diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 52c304f10..a7b287b67 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -53,7 +53,7 @@ # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 22103 +TARGET_BALLISTICA_BUILD = 22105 TARGET_BALLISTICA_VERSION = '1.7.37' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 75d47f222..7569c6c66 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 22103; +const int kEngineBuildNumber = 22105; const char* kEngineVersion = "1.7.37"; const int kEngineApiVersion = 9;