diff --git a/.efrocachemap b/.efrocachemap index e82becc8..6b8f9e1d 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4068,26 +4068,26 @@ "build/assets/windows/Win32/ucrtbased.dll": "https://files.ballistica.net/cache/ba1/2d/ef/5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/b0/8a/55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/86/5b/2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/53/c4/44d44aa135b4379ca6068c3bbe05", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/79/76/a29421bf10ff5b69d388717af8d8", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/08/17/01d2f5b460c5e7718fcde4879c98", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/2d/b3/1aed611902b9a3900318ca2c7d7f", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/9f/72/ef529885376574b51fac22f6b1cf", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a9/9e/92b0800bee6e506d8fc99ffdad43", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/0d/b9/8ccbe1c0bc855bc1250586ead87b", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/de/24/3f6d45d7befc5f23046b90148821", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/bf/23/0ebf3b18a7e0d0094db4172b2e48", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/b7/89/4348c3a88d0fa6829276c2bb48b7", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/48/5d/f3b9de867fab2277f9df097b0766", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/52/93/f9e1062e92b630f3c6814611b74a", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/e1/41/f7a06d879c76ad38b35750662401", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/82/07/b4f4fffb9bc622ecc904d34dec89", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c8/59/5c88827ab3bf0626147fe4e235d8", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/40/5f/e4011c7265c98420a4b1debb60d9", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/55/49/6c82cd310136d8574553bd8438f2", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/f5/bd/a764be2a4b5a18c2681e92e760a2", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/ec/a4/43a8bb2f9766ca14bd59ee23bd6a", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/75/55/2bb73fb2a212123ab0d3575d7852", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/bb/c7/4ef93af038e8d0e78e6bbf2d8ccd", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/00/69/d9d791018f665d404d4a07f3b73f", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/43/2d/00ead34e49771ecae25eee72a639", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ab/41/21d782497286df6450d6e248bdf1", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/80/6d/62ee994bd6ea597b57a456518ace", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/da/82/493db6580f691ed32372644ecb49", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7e/cf/9c8f54e170da2e8b4303f61f0257", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/2f/d8/b3da2bf81c5a1d1388085caf840d", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/9b/5f/1f6c7b07de1000c279a0702a83bf", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/f3/6f/9d86182a6a4677cdc9fd9c1f7f19", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ec/fe/7fe44e1fefbb6325e466fb0278bc", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c7/db/2b3ca393aad03121e7fa5cccd604", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ac/fa/0ee96e9ab51427dd0a8eaaf55546", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/64/fd/108739d12925982818c16e4f69cc", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ba/65/d557f47ec557ff66d5077278947d", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/5a/d2/fd994e6ab6ea8315b51db3cbb274", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/ff/aa/390c8329a0a1245bb61b72cf607b", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/eb/2d/9b7e35156943a56521ae9ad07bf0", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/20/fe/7ee64a746e94fd32ac152ecb20b1", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/12/ec/6115f93a4b254cf4fa82522ee10a", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "https://files.ballistica.net/cache/ba1/4e/69/3d3715ffb88e61962dff80e52fa0", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "https://files.ballistica.net/cache/ba1/df/78/f138dbf92a93dcd647831fb8fde4", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "https://files.ballistica.net/cache/ba1/4e/69/3d3715ffb88e61962dff80e52fa0", @@ -4104,14 +4104,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "https://files.ballistica.net/cache/ba1/84/7d/952ba7e47c98635853b6b3e046fa", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "https://files.ballistica.net/cache/ba1/ad/de/141e3f5ea646f9d359a7edc40524", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "https://files.ballistica.net/cache/ba1/84/7d/952ba7e47c98635853b6b3e046fa", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/d7/c9/a00dd6d4a2986cfefa0c06332aa3", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/41/06/ecdf5ec3fd7c800f19dd1ff64fde", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/72/12/cf4c4553a377422f7abf59842454", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/f3/e6/f2a579f8c67d57a27161df687773", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/ab/ce/c58c2c29139fda41758d95002e6c", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/43/ff/17cfafaf235f8d83b7cefe21c52d", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/ec/b9/e4347a41daedceeee53296cdc1e5", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/2f/60/c85447897afec670b15957f191fb", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/23/f5/0cd5ec1a07a88f1ce69ffe46bbb4", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/6b/b7/0f20ebfc4aa3ce82b614f7c8553e", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/47/a1/87cfabb76c5af6922b36cae8585b", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/5f/67/ca0e32734c731f1c1b6383f56aac", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/f3/e0/56006952bb54b29d7e6e319baa06", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/6a/fc/495578c6c0b4aea6b863be6dd367", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/5b/6a/e888f3a56a6b2af2ed638046767a", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/d8/9a/6df73bd62b784c8ce277e0c704b4", "src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/f8/85/fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/f8/cd/3af311ac63147882590123b78318", "src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/3e/7a/203e2a5d2b5bb42cfe3fd2fe16c2", diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index 326d872d..1fc38916 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -232,6 +232,7 @@ ballistica ballistica's ballisticakit + ballisticakitbin ballisticakitcb ballisticakitso ballisticaplus diff --git a/CHANGELOG.md b/CHANGELOG.md index cfd848be..a5b3bc9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.24 (build 21186, api 8, 2023-07-21) +### 1.7.24 (build 21188, api 8, 2023-07-22) - Due to the cleanup done in 1.7.20, it is now possible to build and run Ballistica as a 'pure' Python app consisting of binary Python modules loaded diff --git a/Makefile b/Makefile index 058cd2b4..b5007ca9 100644 --- a/Makefile +++ b/Makefile @@ -426,12 +426,12 @@ prefab-linux-arm64-server-debug: prefab-linux-arm64-server-debug-build prefab-linux-x86-64-server-debug-build: prereqs assets-server \ build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless @$(STAGE_BUILD) -cmakeserver -debug \ - build/prefab/full/linux_x86_64_server/debug + build/prefab/full/linux_x86_64_server/debug prefab-linux-arm64-server-debug-build: prereqs assets-server \ build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless @$(STAGE_BUILD) -cmakeserver -debug \ - build/prefab/full/linux_arm64_server/debug + build/prefab/full/linux_arm64_server/debug build/prefab/full/linux_%_server/debug/dist/ballisticakit_headless: .efrocachemap @tools/pcommand efrocache_get $@ @@ -483,7 +483,7 @@ prefab-windows-x86-gui-debug: prefab-windows-x86-gui-debug-build prefab-windows-x86-gui-debug-build: prereqs assets-windows-$(WINPLAT_X86) \ build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe @$(STAGE_BUILD) -win-$(WINPLAT_X86) -debug \ - build/prefab/full/windows_x86_gui/debug + build/prefab/full/windows_x86_gui/debug build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe: .efrocachemap @tools/pcommand efrocache_get $@ @@ -507,7 +507,7 @@ prefab-windows-x86-gui-release-build: prereqs \ assets-windows-$(WINPLAT_X86) \ build/prefab/full/windows_x86_gui/release/BallisticaKit.exe @$(STAGE_BUILD) -win-$(WINPLAT_X86) -release \ -build/prefab/full/windows_x86_gui/release + build/prefab/full/windows_x86_gui/release build/prefab/full/windows_x86_gui/release/BallisticaKit.exe: .efrocachemap @tools/pcommand efrocache_get $@ @@ -532,7 +532,7 @@ prefab-windows-x86-server-debug-build: prereqs \ assets-windows-$(WINPLAT_X86) \ build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe @$(STAGE_BUILD) -winserver-$(WINPLAT_X86) -debug \ - build/prefab/full/windows_x86_server/debug + build/prefab/full/windows_x86_server/debug build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe: .efrocachemap @tools/pcommand efrocache_get $@ @@ -557,7 +557,7 @@ prefab-windows-x86-server-release-build: prereqs \ assets-windows-$(WINPLAT_X86) \ build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe @$(STAGE_BUILD) -winserver-$(WINPLAT_X86) -release \ - build/prefab/full/windows_x86_server/release + build/prefab/full/windows_x86_server/release build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe: .efrocachemap @tools/pcommand efrocache_get $@ @@ -932,7 +932,7 @@ WINDOWS_CONFIGURATION ?= Debug # Stage assets and other files so a built binary will run. windows-staging: assets-windows resources meta $(STAGE_BUILD) -win-$(WINPLT) -$(WINCFGLC) \ - build/windows/$(WINCFG)_$(WINPLT) + build/windows/$(WINCFG)_$(WINPLT) # Build and run a debug windows build (from WSL). windows-debug: windows-debug-build @@ -1035,7 +1035,7 @@ cmake-binary: meta || cmake -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \ $(shell pwd)/ballisticakit-cmake @tools/pcommand update_cmake_prefab_lib standard $(CM_BT_LC) build/cmake/$(CM_BT_LC) - @cd build/cmake/$(CM_BT_LC) && $(MAKE) -j$(CPUS) ballisticakit + @cd build/cmake/$(CM_BT_LC) && $(MAKE) -j$(CPUS) ballisticakitbin cmake-clean: rm -rf build/cmake/$(CM_BT_LC) @@ -1055,7 +1055,7 @@ cmake-server-binary: meta $(shell pwd)/ballisticakit-cmake @tools/pcommand update_cmake_prefab_lib server $(CM_BT_LC) build/cmake/server-$(CM_BT_LC)/dist @cd build/cmake/server-$(CM_BT_LC)/dist && $(MAKE) -j$(CPUS) \ - ballisticakit + ballisticakitbin cmake-server-clean: rm -rf build/cmake/server-$(CM_BT_LC) diff --git a/ballisticakit-cmake/.idea/dictionaries/ericf.xml b/ballisticakit-cmake/.idea/dictionaries/ericf.xml index a5ad63fe..9955c59e 100644 --- a/ballisticakit-cmake/.idea/dictionaries/ericf.xml +++ b/ballisticakit-cmake/.idea/dictionaries/ericf.xml @@ -137,6 +137,7 @@ ballistica ballistica's ballisticakit + ballisticakitbin ballisticakitso ballisticaplus bamasteraddr diff --git a/ballisticakit-cmake/CMakeLists.txt b/ballisticakit-cmake/CMakeLists.txt index 8d79abde..1f577141 100644 --- a/ballisticakit-cmake/CMakeLists.txt +++ b/ballisticakit-cmake/CMakeLists.txt @@ -750,29 +750,32 @@ set(BALLISTICA_SOURCES ) # BallisticaKit monolithic binary. -add_executable(ballisticakit ${BALLISTICA_SOURCES}) +add_executable(ballisticakitbin ${BALLISTICA_SOURCES}) # Gets -rdynamic added when linking gcc builds which exports all symbols # which gives us more meaningful stack traces using backtrace_symbols(). -set_target_properties(ballisticakit PROPERTIES ENABLE_EXPORTS 1) +set_target_properties(ballisticakitbin PROPERTIES ENABLE_EXPORTS 1) if (HEADLESS) - set_target_properties(ballisticakit + set_target_properties(ballisticakitbin PROPERTIES OUTPUT_NAME "ballisticakit_headless") +else () + set_target_properties(ballisticakitbin + PROPERTIES OUTPUT_NAME "ballisticakit") endif () -target_include_directories(ballisticakit PRIVATE +target_include_directories(ballisticakitbin PRIVATE ${Python_INCLUDE_DIRS} ${BA_SRC_ROOT}/external/open_dynamics_engine-ef ${EXTRA_INCLUDE_DIRS}) -target_link_libraries(ballisticakit PRIVATE +target_link_libraries(ballisticakitbin PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/prefablib/libballisticaplus.a ode pthread ${Python_LIBRARIES} ${SDL2_LIBRARIES} ${EXTRA_LIBRARIES} dl) # Hack for building on rpi; need to update my pi so I can remove this. if(EXISTS "/home/pi") -target_link_libraries(ballisticakit PRIVATE dl util stdc++fs) +target_link_libraries(ballisticakitbin PRIVATE dl util stdc++fs) endif() diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index c7cb6df7..bfb35009 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -51,7 +51,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21186 +TARGET_BALLISTICA_BUILD = 21188 TARGET_BALLISTICA_VERSION = '1.7.24' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 5bc9636e..beed0254 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 = 21186; +const int kEngineBuildNumber = 21188; const char* kEngineVersion = "1.7.24"; #if BA_MONOLITHIC_BUILD diff --git a/tools/batools/build.py b/tools/batools/build.py index 4277c4dc..0fa3e4f1 100644 --- a/tools/batools/build.py +++ b/tools/batools/build.py @@ -692,7 +692,10 @@ def cmake_prep_dir(dirname: str, verbose: bool = False) -> None: name: str current_value: str - entries: list[Entry] = [] + # Start with an entry we can explicitly increment if we want to blow + # away all cmake builds everywhere (for if we change something in + # the CMakeList that cmake doesn't properly handle itself, etc.). + entries: list[Entry] = [Entry('explicit cmake rebuild', '1')] # Start fresh if cmake version changes. cmake_ver_output = subprocess.run( diff --git a/tools/batools/spinoff/_context.py b/tools/batools/spinoff/_context.py index 06a934d9..a04c54ff 100644 --- a/tools/batools/spinoff/_context.py +++ b/tools/batools/spinoff/_context.py @@ -830,6 +830,7 @@ class SpinoffContext: ' ode ', 'ode ', label=src_path, + count=2, ) if src_path.startswith( 'ballisticakit-windows/'