RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-06 07:23:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

renamed ballisticakit_internal lib to ballistica_plus

Browse Source
This commit is contained in:
Eric 2023-05-16 20:56:43 -07:00
parent 4b8d93851e
commit bf31371510
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
7 changed files with 71 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
.efrocachemap
View File

@ -4080,42 +4080,42 @@
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/48/1c/3d2e629a6f04bd12b31964351bbf", "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/48/1c/3d2e629a6f04bd12b31964351bbf",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d9/de/146c8b7252802da53d778f5f8837", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d9/de/146c8b7252802da53d778f5f8837",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/20/bc/1692d1e093be536e7d6aca7f2ab1", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/20/bc/1692d1e093be536e7d6aca7f2ab1",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/cd/77/5f71c3cb4dfc14128d9081968220", "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ba/74/489c3f7856d700cd022cb24d6bdc",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/af/2a/d849d0aeae88a5db9a00ae4b10f0", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/af/2a/d849d0aeae88a5db9a00ae4b10f0",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/08/03/22015241e5ad707ce82a96630e36", "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/62/c1/632c8205f57f5b4b543df15079a7",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7e/88/12be466acafb3a90100705f0affd", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7e/88/12be466acafb3a90100705f0affd",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/c4/d0/67bd3f6c49291cf7f12f7be3a821", "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ec/fc/78098914c9a775edeaf6dc823126",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/73/f4/a75e5f5c59f41cf420e266d0a636", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/73/f4/a75e5f5c59f41cf420e266d0a636",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c0/97/c615aa1dfcef60d2a5b1b1f41294", "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/17/b7/3b4357f46842dd6bef3f396f29b1",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6b/92/fcb579d06cc289543de9c5005b24", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6b/92/fcb579d06cc289543de9c5005b24",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/7d/5a/6af092c7c38df17007b34f0e2a2f", "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/77/5f/2229fcba73e336ecc27c99f71970",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/5f/fc/aebf39c8665977b614179a7b8156", "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/56/eb/a1d625f986ec054d1ac89dc1a992",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/b8/c8/7b4f4b75c380020d961d0e39aed2", "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/50/20/25777771ab24f0a14feadadf7f53",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/a8/cd/3cd374b3adcaf1fc286e0a7b40f6", "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/72/ba/83d9976fc0a691416384c0e2bb02",
"build/prefab/lib/linux_arm64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/f8/b1/ed8792bb56f2307123200f140e7d", "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/96/3e/36fb95f8f1609a5a0c51cb2c008a",
"build/prefab/lib/linux_arm64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/a4/01/5f76fab7a51b8240b1ebc63fac28", "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/66/42/15dadfe1bce99682ea7d36b4e590",
"build/prefab/lib/linux_arm64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/b3/39/c708135692631e57fe17dd11181a", "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/71/97/7369170323e18f341fc5dcac4370",
"build/prefab/lib/linux_arm64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/cd/dd/66025812c8e82a93bc6f9d5f12f2", "build/prefab/lib/linux_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/cf/d6/3392a794e2d61618213f1baae4b5",
"build/prefab/lib/linux_x86_64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/e2/c4/c08e9c6f4ef316bc6313a3041dc4", "build/prefab/lib/linux_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/cf/e7/4cf4178de038c8ba0e9117024823",
"build/prefab/lib/linux_x86_64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/af/3d/770823edcf0a3bc49a441670e60e", "build/prefab/lib/linux_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2e/a5/0cf02540a47f82b479c803d9de32",
"build/prefab/lib/linux_x86_64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/da/e2/7e122494ad5c471e572de9845367", "build/prefab/lib/linux_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/e1/ba/68140e7d7fb3ac32d3056fe92255",
"build/prefab/lib/linux_x86_64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/51/60/ea606c34bc88edc508a4868294e5", "build/prefab/lib/linux_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/d5/1f/07963ebef1c67d99a6250f4f4203",
"build/prefab/lib/mac_arm64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/3c/cd/7af50c6919470fd54f74787d2ac7", "build/prefab/lib/mac_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/5e/7c/d414a3cb9a9d085384337528c0c2",
"build/prefab/lib/mac_arm64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/b0/c9/298ba9e8dfbf6d4d9498294117f6", "build/prefab/lib/mac_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/a1/5d/5d66f841b33bffd16267d736a0c8",
"build/prefab/lib/mac_arm64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/30/f2/4a40ae7d5d5d0c3c333d2a4fb002", "build/prefab/lib/mac_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/4e/2c/3ae430cabe5baefdd2d3b0634973",
"build/prefab/lib/mac_arm64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/02/8c/690439b80f4326c734a78da75f9c", "build/prefab/lib/mac_arm64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/6f/0c/70b00ac508f2220a9e54af30a5e7",
"build/prefab/lib/mac_x86_64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/c0/8d/a014bd9a8c900a82582ea7f9afef", "build/prefab/lib/mac_x86_64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/14/0e/1e5b159652cce49f33ddf5f928b2",
"build/prefab/lib/mac_x86_64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/32/71/9eba0ce57145aa3c2fae97f1b898", "build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/72/7d/49eb3c6d3f542379645b31c76321",
"build/prefab/lib/mac_x86_64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/4c/85/5a3b35285fe65c46f2eb54a6ad3c", "build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/50/07/a9bbc325406fcc829367d29c2cfe",
"build/prefab/lib/mac_x86_64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/1f/f0/3106b1fad70d477a250e3a960c08", "build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/4e/80/4fb673550bb4185ebd902cf120be",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.lib": "https://files.ballistica.net/cache/ba1/52/22/add22171782c6c905be27c150645", "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/9a/30/070b62eb78949ad8f1edbdbd480b",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/69/fd/e76452c930ffd6800443a2f79c9d", "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/8a/a1/9d682f08d9d9c4a4ad3fbc611fd3",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/d7/72/45872be691bf0aa664b6af5b9c37", "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/68/7f/c68d795af1a237f87b9e14e5992f",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/d3/e1/e105636c9339d7670a5c9d011239", "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/14/54/6ee2132867d834dc4dfef8f66b29",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.lib": "https://files.ballistica.net/cache/ba1/fe/ee/cdc35058772d20e855b5cc5f1cc1", "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/0d/d5/cc9bbf43e1b0fa66dbff58c0abbd",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/6b/78/cb24ac764daaa3698104203ed6f7", "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/f0/d9/d336d58c7bce91bd8db35f3d3d29",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/3c/17/b922ce5b3390fe51fc50a26063cf", "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/6e/f8/a5de1c9a47496768fcf610fe7ad9",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/87/40/095233b55101664510a039e18f05", "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/ac/00/ab4c4997138c46144c402a3def45",
"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/__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/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", "src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/b4/3d/e352190a0e5673d101c0f3ee3ad2",

5
CHANGELOG.md
View File

@ -250,6 +250,11 @@
future, the default BallisticaKit app may be expanded with editing future, the default BallisticaKit app may be expanded with editing
functionality and I feel the name 'Kit' fits better for something used that functionality and I feel the name 'Kit' fits better for something used that
way than 'Core' does. way than 'Core' does.
- The `ballisticakit_internal` precompiled library has been renamed to
`ballistica_plus`. This name better describes what it actually is (basically
precompiled native portion of the `plus` feature set). Also by removing the
'kit' from the end it will no longer be renamed in spinoff projects, meaning
we should be able to recycle the same built libraries in those cases.
### 1.7.19 (build 20997, api 7, 2023-01-19) ### 1.7.19 (build 20997, api 7, 2023-01-19)

48
Makefile
View File

@ -238,7 +238,7 @@ prefab-mac-arm64-gui-debug-build: prereqs assets-cmake \
build/prefab/full/mac_%_gui/debug/ballisticakit: .efrocachemap build/prefab/full/mac_%_gui/debug/ballisticakit: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/mac_%_gui/debug/libballisticakit_internal.a: .efrocachemap build/prefab/lib/mac_%_gui/debug/libballistica_plus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Mac gui release: # Mac gui release:
@ -268,7 +268,7 @@ prefab-mac-arm64-gui-release-build: prereqs assets-cmake \
build/prefab/full/mac_%_gui/release/ballisticakit: .efrocachemap build/prefab/full/mac_%_gui/release/ballisticakit: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/mac_%_gui/release/libballisticakit_internal.a: .efrocachemap build/prefab/lib/mac_%_gui/release/libballistica_plus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Mac server debug: # Mac server debug:
@ -298,7 +298,7 @@ prefab-mac-arm64-server-debug-build: prereqs assets-cmake \
build/prefab/full/mac_%_server/debug/dist/ballisticakit_headless: .efrocachemap build/prefab/full/mac_%_server/debug/dist/ballisticakit_headless: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/mac_%_server/debug/libballisticakit_internal.a: .efrocachemap build/prefab/lib/mac_%_server/debug/libballistica_plus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Mac server release: # Mac server release:
@ -330,7 +330,7 @@ prefab-mac-arm64-server-release-build: prereqs assets-cmake \
build/prefab/full/mac_%_server/release/dist/ballisticakit_headless: .efrocachemap build/prefab/full/mac_%_server/release/dist/ballisticakit_headless: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/mac_%_server/release/libballisticakit_internal.a: .efrocachemap build/prefab/lib/mac_%_server/release/libballistica_plus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Linux gui debug: # Linux gui debug:
@ -360,7 +360,7 @@ prefab-linux-arm64-gui-debug-build: prereqs assets-cmake \
build/prefab/full/linux_%_gui/debug/ballisticakit: .efrocachemap build/prefab/full/linux_%_gui/debug/ballisticakit: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/linux_%_gui/debug/libballisticakit_internal.a: .efrocachemap build/prefab/lib/linux_%_gui/debug/libballistica_plus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Linux gui release: # Linux gui release:
@ -390,7 +390,7 @@ prefab-linux-arm64-gui-release-build: prereqs assets-cmake \
build/prefab/full/linux_%_gui/release/ballisticakit: .efrocachemap build/prefab/full/linux_%_gui/release/ballisticakit: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/linux_%_gui/release/libballisticakit_internal.a: .efrocachemap build/prefab/lib/linux_%_gui/release/libballistica_plus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Linux server debug: # Linux server debug:
@ -422,7 +422,7 @@ prefab-linux-arm64-server-debug-build: prereqs assets-cmake \
build/prefab/full/linux_%_server/debug/dist/ballisticakit_headless: .efrocachemap build/prefab/full/linux_%_server/debug/dist/ballisticakit_headless: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/linux_%_server/debug/libballisticakit_internal.a: .efrocachemap build/prefab/lib/linux_%_server/debug/libballistica_plus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Linux server release: # Linux server release:
@ -454,7 +454,7 @@ prefab-linux-arm64-server-release-build: prereqs assets-cmake \
build/prefab/full/linux_%_server/release/dist/ballisticakit_headless: .efrocachemap build/prefab/full/linux_%_server/release/dist/ballisticakit_headless: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/linux_%_server/release/libballisticakit_internal.a: .efrocachemap build/prefab/lib/linux_%_server/release/libballistica_plus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Windows gui debug: # Windows gui debug:
@ -474,10 +474,10 @@ prefab-windows-x86-gui-debug-build: prereqs assets-windows-$(WINPLAT_X86) \
build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe: .efrocachemap build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/windows/Debug_%/BallisticaKitGenericInternal.lib: .efrocachemap build/prefab/lib/windows/Debug_%/BallisticaKitGenericPlus.lib: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/windows/Debug_%/BallisticaKitGenericInternal.pdb: .efrocachemap build/prefab/lib/windows/Debug_%/BallisticaKitGenericPlus.pdb: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Windows gui release: # Windows gui release:
@ -498,10 +498,10 @@ build/prefab/full/windows_x86_gui/release
build/prefab/full/windows_x86_gui/release/BallisticaKit.exe: .efrocachemap build/prefab/full/windows_x86_gui/release/BallisticaKit.exe: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/windows/Release_%/BallisticaKitGenericInternal.lib: .efrocachemap build/prefab/lib/windows/Release_%/BallisticaKitGenericPlus.lib: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/windows/Release_%/BallisticaKitGenericInternal.pdb: .efrocachemap build/prefab/lib/windows/Release_%/BallisticaKitGenericPlus.pdb: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Windows server debug: # Windows server debug:
@ -523,10 +523,10 @@ prefab-windows-x86-server-debug-build: prereqs \
build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe: .efrocachemap build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/windows/Debug_%/BallisticaKitHeadlessInternal.lib: .efrocachemap build/prefab/lib/windows/Debug_%/BallisticaKitHeadlessPlus.lib: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/windows/Debug_%/BallisticaKitHeadlessInternal.pdb: .efrocachemap build/prefab/lib/windows/Debug_%/BallisticaKitHeadlessPlus.pdb: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Windows server release: # Windows server release:
@ -548,10 +548,10 @@ prefab-windows-x86-server-release-build: prereqs \
build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe: .efrocachemap build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/windows/Release_%/BallisticaKitHeadlessInternal.lib: .efrocachemap build/prefab/lib/windows/Release_%/BallisticaKitHeadlessPlus.lib: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
build/prefab/lib/windows/Release_%/BallisticaKitHeadlessInternal.pdb: .efrocachemap build/prefab/lib/windows/Release_%/BallisticaKitHeadlessPlus.pdb: .efrocachemap
@tools/pcommand efrocache_get $@ @tools/pcommand efrocache_get $@
# Tell make which of these targets don't represent files. # Tell make which of these targets don't represent files.
@ -933,8 +933,8 @@ windows-release: windows-release-build
# Build a debug windows build (from WSL). # Build a debug windows build (from WSL).
windows-debug-build: \ windows-debug-build: \
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.lib \ build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib \
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.pdb build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb
@tools/pcommand ensure_prefab_platform windows_x86 @tools/pcommand ensure_prefab_platform windows_x86
@tools/pcommand wsl_build_check_win_drive @tools/pcommand wsl_build_check_win_drive
WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging
@ -943,8 +943,8 @@ windows-debug-build: \
# Rebuild a debug windows build (from WSL). # Rebuild a debug windows build (from WSL).
windows-debug-rebuild: \ windows-debug-rebuild: \
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.lib \ build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib \
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.pdb build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb
@tools/pcommand ensure_prefab_platform windows_x86 @tools/pcommand ensure_prefab_platform windows_x86
@tools/pcommand wsl_build_check_win_drive @tools/pcommand wsl_build_check_win_drive
WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging
@ -953,8 +953,8 @@ windows-debug-rebuild: \
# Build a release windows build (from WSL). # Build a release windows build (from WSL).
windows-release-build: \ windows-release-build: \
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.lib \ build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib \
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.pdb build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb
@tools/pcommand ensure_prefab_platform windows_x86 @tools/pcommand ensure_prefab_platform windows_x86
@tools/pcommand wsl_build_check_win_drive @tools/pcommand wsl_build_check_win_drive
WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging
@ -963,8 +963,8 @@ windows-release-build: \
# Rebuild a release windows build (from WSL). # Rebuild a release windows build (from WSL).
windows-release-rebuild: \ windows-release-rebuild: \
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.lib \ build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib \
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.pdb build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb
@tools/pcommand ensure_prefab_platform windows_x86 @tools/pcommand ensure_prefab_platform windows_x86
@tools/pcommand wsl_build_check_win_drive @tools/pcommand wsl_build_check_win_drive
WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging WINDOWS_CONFIGURATION=Release WINDOWS_PLATFORM=Win32 $(MAKE) windows-staging

2
ballisticakit-cmake/CMakeLists.txt
View File

@ -753,7 +753,7 @@ target_include_directories(ballisticakit PRIVATE
) )
target_link_libraries(ballisticakit PRIVATE target_link_libraries(ballisticakit PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/prefablib/libballisticakit_internal.a ode pthread ${Python_LIBRARIES} ${CMAKE_CURRENT_BINARY_DIR}/prefablib/libballistica_plus.a ode pthread ${Python_LIBRARIES}
${SDL2_LIBRARIES} ${EXTRA_LIBRARIES} dl) ${SDL2_LIBRARIES} ${EXTRA_LIBRARIES} dl)
# Hack for building on rpi (might be due to my manually built Python 3.8) # Hack for building on rpi (might be due to my manually built Python 3.8)

2
src/ballistica/plus/README.md
View File

@ -2,5 +2,5 @@
Bits of the engine related to accounts and cloud functionality. In prefab builds Bits of the engine related to accounts and cloud functionality. In prefab builds
the compiled code for this feature set is contained in the pre-compiled static the compiled code for this feature set is contained in the pre-compiled static
ballisticakit_internal library. The plus feature set can also be removed from ballistica_plus library. The plus feature set can also be removed from
spinoff projects if desired to remove the need for that library. spinoff projects if desired to remove the need for that library.

9
tools/batools/pcommand2.py
View File

@ -177,8 +177,8 @@ def win_ci_install_prereqs() -> None:
# hard-code whatever we need here. # hard-code whatever we need here.
lib_dbg_win32 = 'build/prefab/lib/windows/Debug_Win32' lib_dbg_win32 = 'build/prefab/lib/windows/Debug_Win32'
needed_targets: set[str] = { needed_targets: set[str] = {
f'{lib_dbg_win32}/BallisticaKitGenericInternal.lib', f'{lib_dbg_win32}/BallisticaKitGenericPlus.lib',
f'{lib_dbg_win32}/BallisticaKitGenericInternal.pdb', f'{lib_dbg_win32}/BallisticaKitGenericPlus.pdb',
'ballisticakit-windows/Generic/BallisticaKit.ico', 'ballisticakit-windows/Generic/BallisticaKit.ico',
} }
@ -245,8 +245,7 @@ def update_cmake_prefab_lib() -> None:
) )
suffix = '_server' if buildtype == 'server' else '_gui' suffix = '_server' if buildtype == 'server' else '_gui'
target = ( target = (
f'build/prefab/lib/{platform}{suffix}/{mode}/' f'build/prefab/lib/{platform}{suffix}/{mode}/' f'libballistica_plus.a'
f'libballisticakit_internal.a'
) )
# Build the target and then copy it to dst if it doesn't exist there yet # Build the target and then copy it to dst if it doesn't exist there yet
@ -254,7 +253,7 @@ def update_cmake_prefab_lib() -> None:
subprocess.run(['make', target], check=True) subprocess.run(['make', target], check=True)
libdir = os.path.join(builddir, 'prefablib') libdir = os.path.join(builddir, 'prefablib')
libpath = os.path.join(libdir, 'libballisticakit_internal.a') libpath = os.path.join(libdir, 'libballistica_plus.a')
update = True update = True
time1 = os.path.getmtime(target) time1 = os.path.getmtime(target)

8
tools/batools/project/_updater.py
View File

@ -459,7 +459,7 @@ class ProjectUpdater:
src_root = '..\\..\\src' src_root = '..\\..\\src'
public_project = 'Internal' not in os.path.basename(fname) public_project = 'Plus' not in os.path.basename(fname)
all_files = sorted( all_files = sorted(
[ [
@ -555,10 +555,10 @@ class ProjectUpdater:
self._update_visual_studio_project('Generic') self._update_visual_studio_project('Generic')
self._update_visual_studio_project('Headless') self._update_visual_studio_project('Headless')
if not self.public: if not self.public:
self._update_visual_studio_project('GenericInternal') self._update_visual_studio_project('GenericPlus')
self._update_visual_studio_project('HeadlessInternal') self._update_visual_studio_project('HeadlessPlus')
self._update_visual_studio_project('Oculus') self._update_visual_studio_project('Oculus')
self._update_visual_studio_project('OculusInternal') self._update_visual_studio_project('OculusPlus')
def _is_public_source_file(self, filename: str) -> bool: def _is_public_source_file(self, filename: str) -> bool:
assert filename.startswith('/') assert filename.startswith('/')