diff --git a/.efrocachemap b/.efrocachemap index e6aca954..e6bd7cb6 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4069,18 +4069,18 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "e5db667cca97477bdc53745597ce96c0", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "a691fe1725d4e3e8659d4a8910767a6b", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "757d3686278016f0a8c14ca32351869f", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "1f4113367d9314392e9f735d169880b6", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "c83bdc7dedf14fb6b75e791426bc1c42", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "e0aad2e5e0429f267c68e1adc01f4de2", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "eb5e74ea7434d314c8e3775db5fbb46e", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "e2b04830b186f5c34712772dbb8c3c0c", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "7f3147c3eb2d6b47d060cec361333609", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "558d5de83a26abe0da6c56d20918d0e6", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "6c0b13deccc79d9b1ce05bdfe8cd77cc", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "60e4941df0d4d6f05f4f5d4497f5b31f", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "ba913b1cbf2fab9da6f00bef768e99f5", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "83029d84710058c0400a2030c95805f4", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "c4908dc4c7bff0f87e2469b145e9fe64", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "65f8b9df27e56bb9d44289475e8752c6", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "ddc6bbf0e792502c05bbfc7d22f5f36c", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "4966a48d90426c00d566cb73c7a5bb4e", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "421eccd01f494e8b16108c115f9c454e", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "362b4a7954ad3a47ac22549dc16c6787", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "10ccfc4b9c884ca0ca60fd15609fa6cb", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "e18663da062012118b436aabcd75cf7c", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "1c75a8e2450cd3bf96efc32677784edc", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9", @@ -4097,14 +4097,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "fbdc80e41c5883b4a893d2f0786e377f", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "519286657455b41232a1faa946d41c2c", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "56629dc18b297fc90ddd4a2e64906943", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "71735c7abee709e3f0b3de828a342726", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "1dc5bb0bcab746e2ed3d4ee95e96b228", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "b149369e859494ff0bf4ee3e3148969a", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "2406289654622f7faf67c797ca16069c", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "46cac43de3e45317c5b8296eaad873ce", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "82405a82c0780693e65ead6b85263780", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "e1af076467c1cc96971e775233439907", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "a4665e417f029f4c5324a7ce5f16ead3", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "d60e21fa70b7fe8f3859e7b67f2cec67", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "0b86527ec5d6e35b2533a3a2d49303e3", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "95a5100c5aaf7b29f96f8fb2b14b15c9", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "5a7404105c65723799acf224c117691b", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "35c723d0a7d7967d8bba43600dcf6daf", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "3674b562a6fec4a925c3f38ee1753599", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d", "src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f", diff --git a/Makefile b/Makefile index 8edcf993..c725f7d1 100644 --- a/Makefile +++ b/Makefile @@ -217,47 +217,35 @@ BA_WSL_TARGETS_WINDOWS ?= 1 # Assemble & run a gui debug build for this platform. prefab-gui-debug: prefab-gui-debug-build - export BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) && \ - $($(shell BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) \ - $(PCOMMAND) prefab_run_var gui-debug)) + $($(shell $(WSLU) $(PCOMMAND) prefab_run_var gui-debug)) # Assemble & run a gui release build for this platform. prefab-gui-release: prefab-gui-release-build - export BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) && \ - $($(shell BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) \ - $(PCOMMAND) prefab_run_var gui-release)) + $($(shell $(WSLU) $(PCOMMAND) prefab_run_var gui-release)) # Assemble a debug build for this platform. prefab-gui-debug-build: - BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) \ - $(PCOMMAND) make_prefab gui-debug + $(WSLU) $(PCOMMAND) make_prefab gui-debug # Assemble a release build for this platform. prefab-gui-release-build: - BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) \ - $(PCOMMAND) make_prefab gui-release + $(WSLU) $(PCOMMAND) make_prefab gui-release # Assemble & run a server debug build for this platform. prefab-server-debug: prefab-server-debug-build - export BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) && \ - $($(shell BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) \ - $(PCOMMAND) prefab_run_var server-debug)) + $($(shell $(WSLU) $(PCOMMAND) prefab_run_var server-debug)) # Assemble & run a server release build for this platform. prefab-server-release: prefab-server-release-build - export BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) && \ - $($(shell BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) \ - $(PCOMMAND) prefab_run_var server-release)) + $($(shell $(WSLU) $(PCOMMAND) prefab_run_var server-release)) # Assemble a server debug build for this platform. prefab-server-debug-build: - BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) \ - $(PCOMMAND) make_prefab server-debug + $(WSLU) $(PCOMMAND) make_prefab server-debug # Assemble a server release build for this platform. prefab-server-release-build: - BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) \ - $(PCOMMAND) make_prefab server-release + $(WSLU) $(PCOMMAND) make_prefab server-release # Clean all prefab builds. prefab-clean: @@ -278,11 +266,11 @@ RUN_PREFAB_MAC_ARM64_GUI_DEBUG = cd build/prefab/full/mac_arm64_gui/debug \ prefab-mac-x86-64-gui-debug: prefab-mac-x86-64-gui-debug-build @$(PCOMMAND) ensure_prefab_platform mac_x86_64 - @$(RUN_PREFAB_MAC_X86_64_GUI_DEBUG) + $(RUN_PREFAB_MAC_X86_64_GUI_DEBUG) prefab-mac-arm64-gui-debug: prefab-mac-arm64-gui-debug-build @$(PCOMMAND) ensure_prefab_platform mac_arm64 - @$(RUN_PREFAB_MAC_ARM64_GUI_DEBUG) + $(RUN_PREFAB_MAC_ARM64_GUI_DEBUG) prefab-mac-x86-64-gui-debug-build: prereqs assets-cmake \ build/prefab/full/mac_x86_64_gui/debug/ballisticakit @@ -308,11 +296,11 @@ RUN_PREFAB_MAC_ARM64_GUI_RELEASE = cd build/prefab/full/mac_arm64_gui/release \ prefab-mac-x86-64-gui-release: prefab-mac-x86-64-gui-release-build @$(PCOMMAND) ensure_prefab_platform mac_x86_64 - @$(RUN_PREFAB_MAC_X86_64_GUI_RELEASE) + $(RUN_PREFAB_MAC_X86_64_GUI_RELEASE) prefab-mac-arm64-gui-release: prefab-mac-arm64-gui_release-build @$(PCOMMAND) ensure_prefab_platform mac_arm64 - @$(RUN_PREFAB_MAC_ARM64_GUI_RELEASE) + $(RUN_PREFAB_MAC_ARM64_GUI_RELEASE) prefab-mac-x86-64-gui-release-build: prereqs assets-cmake \ build/prefab/full/mac_x86_64_gui/release/ballisticakit @@ -342,7 +330,7 @@ prefab-mac-x86-64-server-debug: prefab-mac-x86-64-server-debug-build prefab-mac-arm64-server-debug: prefab-mac-arm64-server-debug-build @$(PCOMMAND) ensure_prefab_platform mac_arm64 - @$(RUN_PREFAB_MAC_ARM64_SERVER_DEBUG) + $(RUN_PREFAB_MAC_ARM64_SERVER_DEBUG) prefab-mac-x86-64-server-debug-build: prereqs assets-server \ build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless @@ -368,11 +356,11 @@ RUN_PREFAB_MAC_ARM64_SERVER_RELEASE = cd \ prefab-mac-x86-64-server-release: prefab-mac-x86-64-server-release-build @$(PCOMMAND) ensure_prefab_platform mac_x86_64 - @$(RUN_PREFAB_MAC_X86_64_SERVER_RELEASE) + $(RUN_PREFAB_MAC_X86_64_SERVER_RELEASE) prefab-mac-arm64-server-release: prefab-mac-arm64-server-release-build @$(PCOMMAND) ensure_prefab_platform mac_arm64 - @$(RUN_PREFAB_MAC_ARM64_SERVER_RELEASE) + $(RUN_PREFAB_MAC_ARM64_SERVER_RELEASE) prefab-mac-x86-64-server-release-build: prereqs assets-server \ build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless @@ -399,12 +387,12 @@ RUN_PREFAB_LINUX_ARM64_GUI_DEBUG = cd \ build/prefab/full/linux_arm64_gui/debug && ./ballisticakit prefab-linux-x86-64-gui-debug: prefab-linux-x86-64-gui-debug-build - @$(PCOMMAND) ensure_prefab_platform linux_x86_64 - @$(RUN_PREFAB_LINUX_X86_64_GUI_DEBUG) + @$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_x86_64 + $(RUN_PREFAB_LINUX_X86_64_GUI_DEBUG) prefab-linux-arm64-gui-debug: prefab-linux-arm64-gui-debug-build - @$(PCOMMAND) ensure_prefab_platform linux_arm64 - @$(RUN_PREFAB_LINUX_ARM64_GUI_DEBUG) + @$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_arm64 + $(RUN_PREFAB_LINUX_ARM64_GUI_DEBUG) prefab-linux-x86-64-gui-debug-build: prereqs assets-cmake \ build/prefab/full/linux_x86_64_gui/debug/ballisticakit @@ -429,12 +417,12 @@ RUN_PREFAB_LINUX_ARM64_GUI_RELEASE = cd \ build/prefab/full/linux_arm64_gui/release && ./ballisticakit prefab-linux-x86-64-gui-release: prefab-linux-x86-64-gui-release-build - @$(PCOMMAND) ensure_prefab_platform linux_x86_64 - @$(RUN_PREFAB_LINUX_X86_64_GUI_RELEASE) + @$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_x86_64 + $(RUN_PREFAB_LINUX_X86_64_GUI_RELEASE) prefab-linux-arm64-gui-release: prefab-linux-arm64-gui-release-build - @$(PCOMMAND) ensure_prefab_platform linux_arm64 - @$(RUN_PREFAB_LINUX_ARM64_GUI_RELEASE) + @$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_arm64 + $(RUN_PREFAB_LINUX_ARM64_GUI_RELEASE) prefab-linux-x86-64-gui-release-build: prereqs assets-cmake \ build/prefab/full/linux_x86_64_gui/release/ballisticakit @@ -459,12 +447,12 @@ RUN_PREFAB_LINUX_ARM64_SERVER_DEBUG = cd \ build/prefab/full/linux_arm64_server/debug && ./ballisticakit_server prefab-linux-x86-64-server-debug: prefab-linux-x86-64-server-debug-build - @$(PCOMMAND) ensure_prefab_platform linux_x86_64 - @$(RUN_PREFAB_LINUX_X86_64_SERVER_DEBUG) + @$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_x86_64 + $(RUN_PREFAB_LINUX_X86_64_SERVER_DEBUG) prefab-linux-arm64-server-debug: prefab-linux-arm64-server-debug-build - @$(PCOMMAND) ensure_prefab_platform linux_arm64 - @$(RUN_PREFAB_LINUX_ARM64_SERVER_DEBUG) + @$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_arm64 + $(RUN_PREFAB_LINUX_ARM64_SERVER_DEBUG) prefab-linux-x86-64-server-debug-build: prereqs assets-server \ build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless @@ -491,12 +479,12 @@ RUN_PREFAB_LINUX_ARM64_SERVER_RELEASE = cd \ build/prefab/full/linux_arm64_server/release && ./ballisticakit_server prefab-linux-x86-64-server-release: prefab-linux-x86-64-server-release-build - @$(PCOMMAND) ensure_prefab_platform linux_x86_64 - @$(RUN_PREFAB_LINUX_X86_64_SERVER_RELEASE) + @$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_x86_64 + $(RUN_PREFAB_LINUX_X86_64_SERVER_RELEASE) prefab-linux-arm64-server-release: prefab-linux-arm64-server-release-build - @$(PCOMMAND) ensure_prefab_platform linux_arm64 - @$(RUN_PREFAB_LINUX_ARM64_SERVER_RELEASE) + @$(WSLL) $(PCOMMAND) ensure_prefab_platform linux_arm64 + $(RUN_PREFAB_LINUX_ARM64_SERVER_RELEASE) prefab-linux-x86-64-server-release-build: prereqs assets-server \ build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless @@ -520,8 +508,8 @@ RUN_PREFAB_WINDOWS_X86_GUI_DEBUG = cd build/prefab/full/windows_x86_gui/debug \ && ./BallisticaKit.exe prefab-windows-x86-gui-debug: prefab-windows-x86-gui-debug-build - @$(PCOMMAND) ensure_prefab_platform windows_x86 - @$(RUN_PREFAB_WINDOWS_X86_GUI_DEBUG) + @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 + $(RUN_PREFAB_WINDOWS_X86_GUI_DEBUG) prefab-windows-x86-gui-debug-build: prereqs assets-windows-$(WINPLAT_X86) \ build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe @@ -543,8 +531,8 @@ RUN_PREFAB_WINDOWS_X86_GUI_RELEASE = cd \ build/prefab/full/windows_x86_gui/release && ./BallisticaKit.exe prefab-windows-x86-gui-release: prefab-windows-x86-gui-release-build - @$(PCOMMAND) ensure_prefab_platform windows_x86 - @$(RUN_PREFAB_WINDOWS_X86_GUI_RELEASE) + @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 + $(RUN_PREFAB_WINDOWS_X86_GUI_RELEASE) prefab-windows-x86-gui-release-build: prereqs \ assets-windows-$(WINPLAT_X86) \ @@ -568,8 +556,8 @@ RUN_PREFAB_WINDOWS_X86_SERVER_DEBUG = cd \ && dist/python_d.exe ballisticakit_server.py prefab-windows-x86-server-debug: prefab-windows-x86-server-debug-build - @$(PCOMMAND) ensure_prefab_platform windows_x86 - @$(RUN_PREFAB_WINDOWS_X86_SERVER_DEBUG) + @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 + $(RUN_PREFAB_WINDOWS_X86_SERVER_DEBUG) prefab-windows-x86-server-debug-build: prereqs \ assets-windows-$(WINPLAT_X86) \ @@ -593,8 +581,8 @@ RUN_PREFAB_WINDOWS_X86_SERVER_RELEASE = cd \ && dist/python.exe -O ballisticakit_server.py prefab-windows-x86-server-release: prefab-windows-x86-server-release-build - @$(PCOMMAND) ensure_prefab_platform windows_x86 - @$(RUN_PREFAB_WINDOWS_X86_SERVER_RELEASE) + @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 + $(RUN_PREFAB_WINDOWS_X86_SERVER_RELEASE) prefab-windows-x86-server-release-build: prereqs \ assets-windows-$(WINPLAT_X86) \ @@ -985,19 +973,19 @@ windows-staging: assets-windows resources meta # Build and run a debug windows build (from WSL). windows-debug: windows-debug-build - @$(PCOMMAND) ensure_prefab_platform windows_x86 + @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 build/windows/Debug_Win32/BallisticaKitGeneric.exe # Build and run a release windows build (from WSL). windows-release: windows-release-build - @$(PCOMMAND) ensure_prefab_platform windows_x86 + @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 build/windows/Release_Win32/BallisticaKitGeneric.exe # Build a debug windows build (from WSL). windows-debug-build: \ build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib \ build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb - @$(PCOMMAND) ensure_prefab_platform windows_x86 + @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 @$(PCOMMAND) wsl_build_check_win_drive WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging WINDOWS_PROJECT=Generic WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 \ @@ -1007,7 +995,7 @@ windows-debug-build: \ windows-debug-rebuild: \ build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib \ build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb - @$(PCOMMAND) ensure_prefab_platform windows_x86 + @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 @$(PCOMMAND) wsl_build_check_win_drive WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging WINDOWS_PROJECT=Generic WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 \ @@ -1017,7 +1005,7 @@ windows-debug-rebuild: \ windows-release-build: \ build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib \ build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb - @$(PCOMMAND) ensure_prefab_platform windows_x86 + @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 @$(PCOMMAND) wsl_build_check_win_drive WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging WINDOWS_PROJECT=Generic WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 \ @@ -1027,7 +1015,7 @@ windows-release-build: \ windows-release-rebuild: \ build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib \ build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb - @$(PCOMMAND) ensure_prefab_platform windows_x86 + @$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86 @$(PCOMMAND) wsl_build_check_win_drive WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging WINDOWS_PROJECT=Generic WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 \ @@ -1262,6 +1250,13 @@ _WMSBE_2 = \\Community\\MSBuild\\Current\\Bin\\MSBuild.exe\" _WMSBE_1B = /mnt/c/Program Files/Microsoft Visual Studio/2022 _WMSBE_2B = /Community/MSBuild/Current/Bin/MSBuild.exe +# Sets WSL build type to the user's choice (defaults to Windows). +WSLU=BA_WSL_TARGETS_WINDOWS=$(BA_WSL_TARGETS_WINDOWS) +# Sets WSL build type to Linux. +WSLL=BA_WSL_TARGETS_WINDOWS=0 +# Sets WSL build type to Windows. +WSLW=BA_WSL_TARGETS_WINDOWS=1 + VISUAL_STUDIO_VERSION = -property:VisualStudioVersion=17 WIN_MSBUILD_EXE = $(_WMSBE_1)$(_WMSBE_2) WIN_MSBUILD_EXE_B = "$(_WMSBE_1B)$(_WMSBE_2B)" diff --git a/tools/batools/staging.py b/tools/batools/staging.py index 5a14ea75..983d81f3 100755 --- a/tools/batools/staging.py +++ b/tools/batools/staging.py @@ -11,6 +11,7 @@ import subprocess from functools import partial from typing import TYPE_CHECKING +from efro.terminal import Clr from efrotools import PYVER, extract_arg, extract_flag if TYPE_CHECKING: @@ -39,6 +40,7 @@ class AssetStager: def __init__(self, projroot: str) -> None: self.projroot = projroot + self.desc = 'unknown' # We always calc src relative to this script. self.src = f'{self.projroot}/build/assets' self.dst: str | None = None @@ -71,6 +73,12 @@ class AssetStager: """Do the thing.""" self._parse_args(args) + print( + f'{Clr.BLU}Staging {Clr.MAG}{Clr.BLD}{self.desc}{Clr.RST}' + f'{Clr.BLU} build in {Clr.MAG}{Clr.BLD}{self.dst}' + f'{Clr.RST}{Clr.BLU}...{Clr.RST}' + ) + # Ok, now for every top level dir in src, come up with a nice single # command to sync the needed subset of it to dst. @@ -140,22 +148,27 @@ class AssetStager: ) if platform_arg == '-android': + self.desc = 'android' self._parse_android_args(args) elif platform_arg.startswith('-win'): + self.desc = 'windows' self._parse_win_args(platform_arg, args) elif platform_arg == '-cmake': + self.desc = 'cmake' self.dst = args[-1] self.tex_suffix = '.dds' # Link/copy in a binary *if* builddir is provided. self.include_binary_executable = self.builddir is not None self.executable_name = 'ballisticakit' elif platform_arg == '-cmakemodular': + self.desc = 'cmake modular' self.dst = args[-1] self.tex_suffix = '.dds' self.include_python_dylib = True self.include_shell_executable = True self.executable_name = 'ballisticakit' elif platform_arg == '-cmakeserver': + self.desc = 'cmake server' self.dst = os.path.join(args[-1], 'dist') self.serverdst = args[-1] self.include_textures = False @@ -165,6 +178,7 @@ class AssetStager: self.include_binary_executable = self.builddir is not None self.executable_name = 'ballisticakit_headless' elif platform_arg == '-cmakemodularserver': + self.desc = 'cmake modular server' self.dst = os.path.join(args[-1], 'dist') self.serverdst = args[-1] self.include_textures = False @@ -175,6 +189,7 @@ class AssetStager: self.executable_name = 'ballisticakit_headless' elif platform_arg == '-xcode-mac': + self.desc = 'xcode mac' self.src = os.environ['SOURCE_ROOT'] + '/../build/assets' self.dst = ( os.environ['TARGET_BUILD_DIR'] @@ -184,17 +199,8 @@ class AssetStager: self.include_pylib = True self.pylib_src_name = 'pylib-apple' self.tex_suffix = '.dds' - elif platform_arg == '-xcode-mac-old': - self.src = os.environ['SOURCE_ROOT'] + '/build/assets' - self.dst = ( - os.environ['TARGET_BUILD_DIR'] - + '/' - + os.environ['UNLOCALIZED_RESOURCES_FOLDER_PATH'] - ) - self.include_pylib = True - self.pylib_src_name = 'pylib-apple' - self.tex_suffix = '.dds' elif platform_arg == '-xcode-ios': + self.desc = 'xcode ios' self.src = os.environ['SOURCE_ROOT'] + '/build/assets' self.dst = ( os.environ['TARGET_BUILD_DIR']