diff --git a/.efrocachemap b/.efrocachemap index a3536a99..c0c92410 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4072,50 +4072,50 @@ "build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/5c/81/461b88dcd868f050d85aa8ac3bc1", "build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/1c/02/97064ab6cd7f4e0018c4e7fa8282", "build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/68/b6/f21cabe2df5f604ef02fee02082e", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/74/32/3753792e68f5dcc0a6e21178b79e", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/4c/df/7ad49eb63fd93903a561639f0464", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/55/e3/053ff9dc235170fcf431d69ee4d2", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ea/c0/cd7b9932a75e88c5531dd677c083", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/71/f0/aeadd7f99b8dc64b48bc9c926ebe", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/00/49/e47efddc17c6668697ad9779615c", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e4/e7/3ec91b98817f29d17c95ee7bdee3", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/4a/45/0299b8fe6a228b7ae3bd91edc606", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/40/b6/9c6e33f8bfa0bbdfd68aede5f8ca", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/fa/47/e5979c9a446e163af5758605d3ef", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e8/07/e40311e5306d447c08e05d63e559", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/09/52/fce56e0d6da0d2017b577a625eb5", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/62/43/2bd3f0e12e3f670bf15b093307a6", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/68/7c/74c09ec913597f35144b96053009", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/89/9d/87cf3cdc2c240ec8e25fcd61ed57", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ba/f7/a86319927e51b179754b69acd857", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c3/6c/3061d2ebe6e14ec7d2ebd18c827b", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/95/a3/95dfe918215819d40876ee12b3dc", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/e7/28/c8cf8efae1495a92de677778bb6d", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/cb/09/12fe948541ac3f6f6283dbf0ad0b", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/51/43/2f684a1118da9e4f9ee432ec8c26", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/d4/87/a6271a09560cd91044e7f79834fd", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/2a/95/5328b86298e1b57fb85e426b013a", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/76/74/ecc7d5f6a5ed7a0afab7afbb5b91", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/04/8b/124c760f2fd24d4e4a9a17fdf4e6", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/20/9a/29a1009635cd8923db9cade71b13", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/83/ee/5e815a581095bc5cc4e9f4b0c520", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/0a/e5/cb69528ecf87221a13be2068149e", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/be/b3/c5305d1412d213cd773dcb85c068", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/36/17/ea670f5195251b7b926b7b271488", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/be/4c/e1390993bd591c2f72487f7ad499", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/92/53/50f85bb587002ca6f23e93629dfa", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/a2/09/66a0de265e9d2bd592f319a071bd", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/17/29/557fc61220ade6bdf4ffdc91bccf", - "build/prefab/lib/linux_arm64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/df/11/f2087bd3edce7376be6e6113bfe0", - "build/prefab/lib/linux_arm64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/aa/29/08d7c589821a466b966f79249394", - "build/prefab/lib/linux_arm64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/97/f2/7c6e1c10b9677759ee72d73added", - "build/prefab/lib/linux_arm64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/a5/9d/24b5abd63de894c4096b24265648", - "build/prefab/lib/linux_x86_64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/41/e3/f96e9c1d349d602f66325e85f435", - "build/prefab/lib/linux_x86_64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/8d/be/b718641a2c1c3f931dcf0d88065c", - "build/prefab/lib/linux_x86_64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/01/f0/9e76e99a3284dfdde4cfc6622273", - "build/prefab/lib/linux_x86_64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/7d/92/b9df2f5c52fd94a0c23d1ae98f3b", - "build/prefab/lib/mac_arm64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/a9/4e/87c56e3ce65dd27bc8a446475e10", - "build/prefab/lib/mac_arm64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/7c/15/629fd97be2cd9765da062ac74224", - "build/prefab/lib/mac_arm64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/90/e6/7e488e65e5f6bbaf513ac93610dd", - "build/prefab/lib/mac_arm64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/cb/ce/d167f9973a701af55e3d5cbc9ef8", - "build/prefab/lib/mac_x86_64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/7d/46/4026492e6490314f1bf84dce63fc", - "build/prefab/lib/mac_x86_64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/d7/c4/ff0ab9a031720bd1889970f95f94", - "build/prefab/lib/mac_x86_64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/00/23/6094e9f386f10c2608835d0d46bc", - "build/prefab/lib/mac_x86_64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/61/2a/d5ed8af50aaa5093fa93f45db8fc", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.lib": "https://files.ballistica.net/cache/ba1/32/00/2f820519f60d87c78c75f1201eb1", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/ae/fa/ff9c4ce2a18dccb13758d5b7db91", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/c6/81/b6fc433b6e2065bf4163d7b0bea5", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/10/cd/70464c6e0583c5085eb0a8e0d1f5", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.lib": "https://files.ballistica.net/cache/ba1/11/6e/e98e8544a67540d747ce2c8fb898", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/f0/2c/729ec720e45c73bbd5854cfb1633", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/e2/83/79b65ca69a24ab1e25dd3dd314ae", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/99/73/5ff3f5fc347a579cd0b1cbbb16f7", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/96/1a/f93a21b95491173b164a7cd01baf", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/fe/0b/f35d87df25f40f23fb2b5fb93761", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/f8/97/01818b4ad16c448391b95c2004d9", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/ed/b2/33919181729b50a7ecac78f09492", + "build/prefab/lib/linux_arm64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/dc/91/77662ff3e58d11094603c3b8e303", + "build/prefab/lib/linux_arm64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/1f/c5/5a2395414d21346171dae3e72067", + "build/prefab/lib/linux_arm64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/c5/74/f37ea38be58d445217bfa88a5c3c", + "build/prefab/lib/linux_arm64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/ac/9c/6dc16d4174635eeb7c916fe23878", + "build/prefab/lib/linux_x86_64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/fa/79/0d67fbb9e833ff62a1a806737394", + "build/prefab/lib/linux_x86_64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/9b/4a/0c7236caba4af58d15b12d457143", + "build/prefab/lib/linux_x86_64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/54/65/a037ac1a73d762fe799565e80c6d", + "build/prefab/lib/linux_x86_64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/87/06/b904d91b4e626b2d86ce71195ddc", + "build/prefab/lib/mac_arm64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/21/a5/dc2068e1ef6a612677378e012fed", + "build/prefab/lib/mac_arm64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/a9/e6/ccae60dae0635f5395ed28e71e5d", + "build/prefab/lib/mac_arm64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/c8/fc/445867c82da1f97b564311ad2e2c", + "build/prefab/lib/mac_arm64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/72/5f/1f7fc31a970053a0df9b59c2e1ab", + "build/prefab/lib/mac_x86_64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/62/e1/c1c636605d7463120de9be515109", + "build/prefab/lib/mac_x86_64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/47/cc/f9f14c3cca969fa0f68ca710d0ef", + "build/prefab/lib/mac_x86_64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/44/17/d7986eea4cfa67bc4807e625336c", + "build/prefab/lib/mac_x86_64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/b9/75/bc30ec3c5809f50c7fcfeeb22366", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.lib": "https://files.ballistica.net/cache/ba1/95/e2/5ea3c13f415acac9305957e52a83", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/2f/4e/e70a4ed89c0a141869731f5e4f3d", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/a5/05/b81eebf9967c1fd384491aa6d7b5", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/14/89/ef3fccc36104c981cbdbe63922c2", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.lib": "https://files.ballistica.net/cache/ba1/37/46/201fd9dd8664196208630a914e3a", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/40/f4/dca259b6584a5bc4e30db2d32672", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/67/90/01bbdbd77eca2f7bdc5b23620490", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/4f/eb/956ea5233f189d9d623b96408b04", "src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa", "src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1", "src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/b4/3d/e352190a0e5673d101c0f3ee3ad2", diff --git a/ballisticakit-cmake/CMakeLists.txt b/ballisticakit-cmake/CMakeLists.txt index 1d1c3e84..2663e90e 100644 --- a/ballisticakit-cmake/CMakeLists.txt +++ b/ballisticakit-cmake/CMakeLists.txt @@ -373,21 +373,12 @@ add_executable(ballisticakit ${BA_SRC_ROOT}/ballistica/base/networking/network_writer.h ${BA_SRC_ROOT}/ballistica/base/networking/networking.cc ${BA_SRC_ROOT}/ballistica/base/networking/networking.h - ${BA_SRC_ROOT}/ballistica/base/platform/android/amazon/base_plat_andr_amazon.cc - ${BA_SRC_ROOT}/ballistica/base/platform/android/amazon/base_plat_andr_amazon.h - ${BA_SRC_ROOT}/ballistica/base/platform/android/base_platform_android.cc - ${BA_SRC_ROOT}/ballistica/base/platform/android/base_platform_android.h - ${BA_SRC_ROOT}/ballistica/base/platform/android/cardboard/base_pl_an_cardboard.cc - ${BA_SRC_ROOT}/ballistica/base/platform/android/cardboard/base_pl_an_cardboard.h - ${BA_SRC_ROOT}/ballistica/base/platform/android/google/base_plat_andr_google.cc - ${BA_SRC_ROOT}/ballistica/base/platform/android/google/base_plat_andr_google.h ${BA_SRC_ROOT}/ballistica/base/platform/apple/base_platform_apple.cc ${BA_SRC_ROOT}/ballistica/base/platform/apple/base_platform_apple.h ${BA_SRC_ROOT}/ballistica/base/platform/base_platform.cc ${BA_SRC_ROOT}/ballistica/base/platform/base_platform.h ${BA_SRC_ROOT}/ballistica/base/platform/linux/base_platform_linux.cc ${BA_SRC_ROOT}/ballistica/base/platform/linux/base_platform_linux.h - ${BA_SRC_ROOT}/ballistica/base/platform/oculus/main_rift.cc ${BA_SRC_ROOT}/ballistica/base/platform/support/min_sdl_key_names.h ${BA_SRC_ROOT}/ballistica/base/platform/windows/base_platform_windows.cc ${BA_SRC_ROOT}/ballistica/base/platform/windows/base_platform_windows.h diff --git a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj index 5f89f951..45654711 100644 --- a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj +++ b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj @@ -364,21 +364,12 @@ - - - - - - - - - diff --git a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters index 4ea8019d..1e7f4f7f 100644 --- a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters +++ b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj.filters @@ -526,30 +526,6 @@ ballistica\base\networking - - ballistica\base\platform\android\amazon - - - ballistica\base\platform\android\amazon - - - ballistica\base\platform\android - - - ballistica\base\platform\android - - - ballistica\base\platform\android\cardboard - - - ballistica\base\platform\android\cardboard - - - ballistica\base\platform\android\google - - - ballistica\base\platform\android\google - ballistica\base\platform\apple @@ -568,9 +544,6 @@ ballistica\base\platform\linux - - ballistica\base\platform\oculus - ballistica\base\platform\support @@ -1908,13 +1881,8 @@ - - - - - diff --git a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj index 5abdb89d..944c1614 100644 --- a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj +++ b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj @@ -359,21 +359,12 @@ - - - - - - - - - diff --git a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj.filters b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj.filters index 4ea8019d..1e7f4f7f 100644 --- a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj.filters +++ b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj.filters @@ -526,30 +526,6 @@ ballistica\base\networking - - ballistica\base\platform\android\amazon - - - ballistica\base\platform\android\amazon - - - ballistica\base\platform\android - - - ballistica\base\platform\android - - - ballistica\base\platform\android\cardboard - - - ballistica\base\platform\android\cardboard - - - ballistica\base\platform\android\google - - - ballistica\base\platform\android\google - ballistica\base\platform\apple @@ -568,9 +544,6 @@ ballistica\base\platform\linux - - ballistica\base\platform\oculus - ballistica\base\platform\support @@ -1908,13 +1881,8 @@ - - - - - diff --git a/tools/batools/metamakefile.py b/tools/batools/metamakefile.py index bc82015f..5cfba591 100755 --- a/tools/batools/metamakefile.py +++ b/tools/batools/metamakefile.py @@ -129,7 +129,7 @@ class MetaMakefileGenerator: if public: our_lines_private = lines[auto_start_private + 1 : auto_end_private] else: - # Private targets (available in public through efrocache) + # Private targets (but available in public through efrocache). targets = [] our_lines_private_1 = ( _empty_line_if(bool(targets)) @@ -146,7 +146,7 @@ class MetaMakefileGenerator: ) all_dsts_private.update(t.dst for t in targets) - # Private-internal targets (not available at all in public) + # Private-internal targets (not available at all in public). targets = [] self._add_pyembed_targets_internal(targets) self._add_extra_targets_internal(targets) diff --git a/tools/batools/pcommand2.py b/tools/batools/pcommand2.py index 4af16aa5..489ecf1f 100644 --- a/tools/batools/pcommand2.py +++ b/tools/batools/pcommand2.py @@ -193,8 +193,9 @@ def win_ci_install_prereqs() -> None: ) as infile: meta_private: list[str] = json.loads(infile.read()) for target in meta_public + meta_private: - if target.startswith('src/ballistica/mgen/') or target.startswith( - 'src/assets/ba_data/python/babase/_mgen/' + if (target.startswith('src/ballistica/') and '/mgen/' in target) or ( + target.startswith('src/assets/ba_data/python/') + and '/_mgen/' in target ): needed_targets.add(target)