From d3348cd80d89c84bd20e2d8563087307982aebaa Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 21 Aug 2023 09:29:59 -0700 Subject: [PATCH] fixing top level 'make assets' target --- .efrocachemap | 36 +++++++++---------- .idea/dictionaries/ericf.xml | 1 + .../.idea/dictionaries/ericf.xml | 1 + src/assets/Makefile | 3 +- tools/efrotools/pybuild.py | 9 +++++ 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 5f73998c..6d5774c5 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4076,18 +4076,18 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "c14f956a37c6c4b854528431f69d97a3", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "fd57912de1a8c12d23b9f19729b963d8", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "3e21f3f57cd594dcd4e4b4ed14546cd8", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "c4db68443f31c70b27511c89c0042ff6", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "09907e81afe7c3a148f21cef2c73e87a", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "f3d980a36605c34dca3b12184326163a", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "fb034ad5af059f2b19d42fff4c465ece", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "fe9a05767cd07e3bc1c4e09698650b0e", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "badf5f08cbcb64742114ca048c6b7727", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "9c074fac35c13f29f55a1f913307aba3", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "8405f44936e40e5b03f43be9767dae08", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "555a3eac0feed1ae6f86326082019d2c", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "82b73ef479f177a3f96d3fc521fd986b", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "cb138fb8ec019892df1d29bfa86e7b46", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "5710f9d700298af5fe062af043aa9a61", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "6b2b5e81a81e82140b5637ae8d76810b", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "999459515be3dcd49b3b4268298eab6d", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "57d637ebae10327b6f49966ec46c616b", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "8977914f6658821d8f2e4bd5ddd01072", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "ed6837468430103572b1d6bcb4373d10", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "f8b4ac0346f70ff11ede342cc411f488", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "7477de94db17daf9562b8a70eca80e3e", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "31b07c33ea5f7341b4839e0254ab4063", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "7136c72bf182ad936289c52100b0b3a1", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "a3ea5777d3faee912a6cfa4309aaa504", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "85ba4e81a1f7ae2cff4b1355eb49904f", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "498921f7eb2afd327d4b900cb70e31f9", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "85ba4e81a1f7ae2cff4b1355eb49904f", @@ -4104,14 +4104,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "0ab638b6602610bdaf432e3cc2464080", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "92394eb19387c363471ce134ac9e6a1b", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "0ab638b6602610bdaf432e3cc2464080", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "7e7dd154962326d6c3b6089774da2fd3", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "887664acc51488a1e5bda23297e2ede0", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "4057bf7feb1d96987f571d52c482fd9d", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "1f3d4445f1854bbfed32d164e83c01cd", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "6273ffb3c4160d960a0be12dee00b78a", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "38c0a19337162817680cc0ff34279618", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "ebc7699242e51224623f5dd8f6685ead", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "35008f5db3de1717c8008762ea12e964", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "fe2e8a79ff07c4c34504328910053b53", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "34924c80882be7ef762e714704834d5f", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "dd6aa0c821b7fab6a688e334a9ae9404", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "f6963241a3d2cf613fdb1fc9ac0340a8", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "fdb89547f0df660bd62c64d23d9c918f", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "9171cff8b56a35d2735d5ea93798b2bd", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "edc75ad6d89e1b9c347e322581a9c261", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "2cc2646a2efc0bdee3797ba4d3c26507", "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/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index a956c19e..ea9782d1 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -3138,6 +3138,7 @@ unimported uninferrable uninited + unintuitively uniquify unixccompiler unknownlintline diff --git a/ballisticakit-cmake/.idea/dictionaries/ericf.xml b/ballisticakit-cmake/.idea/dictionaries/ericf.xml index 419e7d35..b983b1cb 100644 --- a/ballisticakit-cmake/.idea/dictionaries/ericf.xml +++ b/ballisticakit-cmake/.idea/dictionaries/ericf.xml @@ -1835,6 +1835,7 @@ unichar unichars uninited + unintuitively unmanaged unpaused unpausing diff --git a/src/assets/Makefile b/src/assets/Makefile index dfc5c99a..b572a3f8 100644 --- a/src/assets/Makefile +++ b/src/assets/Makefile @@ -7531,8 +7531,7 @@ assets-ios: $(ASSET_TARGETS_IOS) $(ASSET_TARGETS_COMMON_GUI) assets-android: $(ASSET_TARGETS_ANDROID) $(ASSET_TARGETS_COMMON_GUI) # Build all assets for all platforms. -assets: assets-cmake assets-win-Win32 assets-win-x64 assets-mac assets-ios \ - assets-android +assets: assets-cmake assets-win-Win32 clean: @rm -rf $(BUILD_DIR) diff --git a/tools/efrotools/pybuild.py b/tools/efrotools/pybuild.py index 35301f2a..4bac4be6 100644 --- a/tools/efrotools/pybuild.py +++ b/tools/efrotools/pybuild.py @@ -34,6 +34,7 @@ PY_VER_EXACT_APPLE = '3.11.3' OPENSSL_VER_APPLE = '3.0.8' OPENSSL_VER_ANDROID = '3.0.8' +ZLIB_VER_ANDROID = '1.3' # Filenames we prune from Python lib dirs in source repo to cut down on size. PRUNE_LIB_NAMES = [ @@ -292,6 +293,14 @@ def build_android(rootdir: str, arch: str, debug: bool = False) -> None: count=1, ) + # Set specific ZLib version. + ftxt = replace_exact( + ftxt, + "source = 'https://www.zlib.net/zlib-1.2.13.tar.gz'", + f"source = 'https://www.zlib.net/zlib-{ZLIB_VER_ANDROID}.tar.gz'", + count=1, + ) + # Give ourselves a handle to patch the OpenSSL build. ftxt = replace_exact( ftxt,