diff --git a/.efrocachemap b/.efrocachemap index 2df785d1..e81ffaf7 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4076,18 +4076,18 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "e20ef3249191a24b428fd30b585a6ab9", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "c1b483c4c1639af5ad247e9252f51956", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "742d5e4793a557f7d322267cdf25fde3", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "4880ca58a6b9ce36769657c0f8a5a4c5", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5ae7b4b94a8147a1e8dddda74171fd3b", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c8084478951a16ba144f12d65386b9b3", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "06c0d46f6b991aed566a17d32c0cd85d", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "43c61a6274c670df8e80eabb6ad7f0cf", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "77607a1c853c968a04340e538c196f4d", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "358193a334d56860d284716432c95f1e", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "e50958914ab0373f88f5276fd0ec53b7", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "ee39adeed9e2f6405c83f5f81ccf54fc", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "9bc9ffe2da1a79524eb26a551ee50ba3", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "085fd185878b6dd66f6fa84599ba3b44", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "ed1c7c6769b381526f5ac8d9e16a8bad", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "ddce8a5ebc89ad56f23b24e2b04a5edc", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "8dc47367a8feb2908244f4b45ef332e8", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "d8fd33af6124baf1bfd8ab39372abf17", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "78801f3a9a811c0e62528b60b78e36e1", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "605bbb25423a8802879417a254bfeaa3", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "3206b201e39a81bed6abe9e949fa7265", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "6b15d0733463244646f92add404cf5fb", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "fef286304937f68f98127c3c8a876821", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "ee6e1bdccf0f3db9c198ba5632739103", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "2f84ca77788e244cdc3edaeb00a0dc4c", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "ee6e1bdccf0f3db9c198ba5632739103", @@ -4104,14 +4104,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "e0c3972bcc77fa5fc5aed5802308b4b1", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "89cd2bd873934be3e46f409663e9c2cb", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "e0c3972bcc77fa5fc5aed5802308b4b1", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "89423e0c466b20a5bfbd660d85607264", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "0b1921de7f4505e9ad177b0be5fc5cb5", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "6fae4927a00f7e78822e1efdac4c421d", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "11178659f946fde59ad43af0c8a8aaac", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "59fa8ce09122d57e9ca64d28401f6f4a", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "9f2ada0e934bba54e04924f389243d09", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "1b5ca2f7ef5b934946d55486fe08bee3", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "9d03b912cadc179744712665bdeaf866", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "68224f3523b77310bbaa34ef9c37c561", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "46a78119815b6a765088494616ff88cf", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "a4507c6fac638c4840ad1fb9ab41e7e4", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "8e3cba46d14cab6c2cd31b8bf10b2f75", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "e8deee688bf3e99e1cd009cf6a65c33b", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "c489d1b272ad5f9c168802a68b14eb6e", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "dfc015787d50f7c36e36b406846269b3", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "b696873186a2d66114199a7af399a755", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "f8cd3af311ac63147882590123b78318", "src/ballistica/base/mgen/pyembed/binding_base.inc": "eeddad968b176000e31c65be6206a2bc", diff --git a/tools/batools/build.py b/tools/batools/build.py index b72660b1..7cf96e0c 100644 --- a/tools/batools/build.py +++ b/tools/batools/build.py @@ -693,7 +693,6 @@ def cmake_prep_dir(dirname: str, verbose: bool = False) -> None: """ # pylint: disable=too-many-locals import json - import platform from efrotools import PYVER @dataclass @@ -744,17 +743,13 @@ def cmake_prep_dir(dirname: str, verbose: bool = False) -> None: entries.append(Entry('python_path', python_path)) # ...or if mac xcode sdk paths change + mac_xcode_sdks_dir = ( + '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/' + 'Developer/SDKs/' + ) mac_xcode_sdks = ( - ','.join( - sorted( - os.listdir( - '/Applications/Xcode.app/Contents/' - 'Developer/Platforms/MacOSX.platform/' - 'Developer/SDKs/' - ) - ) - ) - if platform.system() == 'Darwin' + ','.join(sorted(os.listdir(mac_xcode_sdks_dir))) + if os.path.isdir(mac_xcode_sdks_dir) else '' ) entries.append(Entry('mac_xcode_sdks', mac_xcode_sdks))