diff --git a/.efrocachemap b/.efrocachemap index 9d111569..3a892046 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3932,16 +3932,24 @@ "assets/build/windows/Win32/ucrtbased.dll": "https://files.ballistica.net/cache/ba1/b5/85/f8b6d0558ddb87267f34254b1450", "assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e", "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f", - "build/prefab/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/03/0f/4c4eeb516e212430405a62df4d96", - "build/prefab/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d6/9e/7ea5f6279b578671feec089a5f0b", - "build/prefab/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b9/93/97bf38a3110c61b82d5610e58cf7", - "build/prefab/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4c/b2/397c21672fccd98eb357feff9f86", - "build/prefab/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/3e/6e/c940715181bee2013b23b46ddd2e", - "build/prefab/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/c5/0f/6024c36bc2371ab59f4521f7c235", - "build/prefab/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/04/e9/e26dc0e97c51e4bb77ffeed959fc", - "build/prefab/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/df/0d/5fa79510c0cc55cad9480dfd8271", - "build/prefab/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b3/3e/a23ac72d41c78bc0b2e7c09559c3", - "build/prefab/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/44/7f/51dccf7eda919d1b138248d05481", - "build/prefab/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/fa/79/8d6c716b900bdd0a4aae18cb5767", - "build/prefab/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/c5/a8/0f9242124c4ee116ec01576a7fd4" + "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/24/0f/c39e95977f3a01a96cac80ec9bee", + "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/57/c4/9ac4ec70c2f05a9754f69ba6f839", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/48/dd/ef1331fc04e88b62dafaf1e918ac", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/74/e5/3d76af6120ae4fac97ccd6d06aa1", + "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/eb/85/2238ffb603143734e13f3923a34a", + "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a0/92/077762bb04a6957d5d7b81ccb3bf", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a4/ad/0962b48f84dde0e97a5fbc5d73b3", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e7/5b/c3c17254122f4e2b8648fedab32c", + "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/07/26/1eee5b94f1e7a2e5a0e98d88e88a", + "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/48/08/617bb551588cdca232fdaec2ff07", + "build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/e3/62/3e05f6f18f0394a0d7d172749790", + "build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/eb/43/297a13121358d1bf9e01d4cc5f6d", + "build/prefab/lib/linux_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/9c/fa/dd352f6c3cb26ede0a21f24d5454", + "build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/32/03/d4dd9c398eab7c7da62b2e7a4096", + "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/11/f5/cb2b3a42e4384d6ac4dfe7a98213", + "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/06/aa/fc55996ce9a1a3e898d1348873ff", + "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b4/33/477ad3318aac7568fb71748ad494", + "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/14/94/28743f847250acd121027bb03140", + "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/73/e0/1b2bebae1e1603d36a38ef3264e2", + "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/5e/e0/b8809648f1ac93dd4c5303549cc6" } \ No newline at end of file diff --git a/Makefile b/Makefile index b2377e88..20045064 100644 --- a/Makefile +++ b/Makefile @@ -151,10 +151,10 @@ prefab-server-release-build: # Specific platform prefab targets: -RUN_PREFAB_MAC_X86_64_DEBUG = cd build/prefab/mac_x86_64/debug \ +RUN_PREFAB_MAC_X86_64_DEBUG = cd build/prefab/full/mac_x86_64/debug \ && ./ballisticacore -RUN_PREFAB_MAC_ARM64_DEBUG = cd build/prefab/mac_arm64/debug \ +RUN_PREFAB_MAC_ARM64_DEBUG = cd build/prefab/full/mac_arm64/debug \ && ./ballisticacore prefab-mac-x86-64-debug: prefab-mac-x86-64-debug-build @@ -166,20 +166,23 @@ prefab-mac-arm64-debug: prefab-mac-arm64-debug-build @${RUN_PREFAB_MAC_ARM64_DEBUG} prefab-mac-x86-64-debug-build: prereqs assets-cmake \ - build/prefab/mac_x86_64/debug/ballisticacore - @${STAGE_ASSETS} -cmake build/prefab/mac_x86_64/debug + build/prefab/full/mac_x86_64/debug/ballisticacore + @${STAGE_ASSETS} -cmake build/prefab/full/mac_x86_64/debug prefab-mac-arm64-debug-build: prereqs assets-cmake \ - build/prefab/mac_arm64/debug/ballisticacore - @${STAGE_ASSETS} -cmake build/prefab/mac_arm64/debug + build/prefab/full/mac_arm64/debug/ballisticacore + @${STAGE_ASSETS} -cmake build/prefab/full/mac_arm64/debug -build/prefab/mac_%/debug/ballisticacore: .efrocachemap +build/prefab/full/mac_%/debug/ballisticacore: .efrocachemap @tools/pcommand efrocache_get $@ -RUN_PREFAB_MAC_X86_64_RELEASE = cd build/prefab/mac_x86_64/release \ +build/prefab/lib/mac_%/debug/libballisticacore_internal.a: .efrocachemap + @tools/pcommand efrocache_get $@ + +RUN_PREFAB_MAC_X86_64_RELEASE = cd build/prefab/full/mac_x86_64/release \ && ./ballisticacore -RUN_PREFAB_MAC_ARM64_RELEASE = cd build/prefab/mac_arm64/release \ +RUN_PREFAB_MAC_ARM64_RELEASE = cd build/prefab/full/mac_arm64/release \ && ./ballisticacore prefab-mac-x86-64-release: prefab-mac-x86-64-release-build @@ -191,21 +194,24 @@ prefab-mac-arm64-release: prefab-mac-arm64-release-build @${RUN_PREFAB_MAC_ARM64_RELEASE} prefab-mac-x86-64-release-build: prereqs assets-cmake \ - build/prefab/mac_x86_64/release/ballisticacore - @${STAGE_ASSETS} -cmake build/prefab/mac_x86_64/release + build/prefab/full/mac_x86_64/release/ballisticacore + @${STAGE_ASSETS} -cmake build/prefab/full/mac_x86_64/release prefab-mac-arm64-release-build: prereqs assets-cmake \ - build/prefab/mac_arm64/release/ballisticacore - @${STAGE_ASSETS} -cmake build/prefab/mac_arm64/release + build/prefab/full/mac_arm64/release/ballisticacore + @${STAGE_ASSETS} -cmake build/prefab/full/mac_arm64/release -build/prefab/mac_%/release/ballisticacore: .efrocachemap +build/prefab/full/mac_%/release/ballisticacore: .efrocachemap @tools/pcommand efrocache_get $@ -RUN_PREFAB_MAC_X86_64_SERVER_DEBUG = cd build/prefab/mac_x86_64_server/debug \ - && ./ballisticacore_server +build/prefab/lib/mac_%/release/libballisticacore_internal.a: .efrocachemap + @tools/pcommand efrocache_get $@ -RUN_PREFAB_MAC_ARM64_SERVER_DEBUG = cd build/prefab/mac_arm64_server/debug \ - && ./ballisticacore_server +RUN_PREFAB_MAC_X86_64_SERVER_DEBUG = cd \ + build/prefab/full/mac_x86_64_server/debug && ./ballisticacore_server + +RUN_PREFAB_MAC_ARM64_SERVER_DEBUG = cd \ + build/prefab/full/mac_arm64_server/debug && ./ballisticacore_server prefab-mac-x86-64-server-debug: prefab-mac-x86-64-server-debug-build @tools/pcommand ensure_prefab_platform mac_x86_64 @@ -216,42 +222,45 @@ prefab-mac-arm64-server-debug: prefab-mac-arm64-server-debug-build @${RUN_PREFAB_MAC_ARM64_SERVER_DEBUG} prefab-mac-x86-64-server-debug-build: prereqs assets-cmake \ - build/prefab/mac_x86_64_server/debug/dist/ballisticacore_headless \ - build/prefab/mac_x86_64_server/debug/ballisticacore_server \ - build/prefab/mac_x86_64_server/debug/config_template.yaml \ - build/prefab/mac_x86_64_server/debug/README.txt - @${STAGE_ASSETS} -cmakeserver build/prefab/mac_x86_64_server/debug/dist + build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless \ + build/prefab/full/mac_x86_64_server/debug/ballisticacore_server \ + build/prefab/full/mac_x86_64_server/debug/config_template.yaml \ + build/prefab/full/mac_x86_64_server/debug/README.txt + @${STAGE_ASSETS} -cmakeserver build/prefab/full/mac_x86_64_server/debug/dist prefab-mac-arm64-server-debug-build: prereqs assets-cmake \ - build/prefab/mac_arm64_server/debug/dist/ballisticacore_headless \ - build/prefab/mac_arm64_server/debug/ballisticacore_server \ - build/prefab/mac_arm64_server/debug/config_template.yaml \ - build/prefab/mac_arm64_server/debug/README.txt - @${STAGE_ASSETS} -cmakeserver build/prefab/mac_arm64_server/debug/dist + build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless \ + build/prefab/full/mac_arm64_server/debug/ballisticacore_server \ + build/prefab/full/mac_arm64_server/debug/config_template.yaml \ + build/prefab/full/mac_arm64_server/debug/README.txt + @${STAGE_ASSETS} -cmakeserver build/prefab/full/mac_arm64_server/debug/dist -build/prefab/mac_%_server/debug/ballisticacore_server: \ +build/prefab/full/mac_%_server/debug/ballisticacore_server: \ assets/src/server/ballisticacore_server.py tools/batools/pcommand.py @tools/pcommand stage_server_file debug $< $@ -build/prefab/mac_%_server/debug/config_template.yaml: \ +build/prefab/full/mac_%_server/debug/config_template.yaml: \ assets/src/server/config_template.yaml \ tools/batools/build.py \ tools/batools/pcommand.py \ tools/bacommon/servermanager.py @tools/pcommand stage_server_file debug $< $@ -build/prefab/mac_%_server/debug/README.txt: \ +build/prefab/full/mac_%_server/debug/README.txt: \ assets/src/server/README.txt @cp $< $@ -build/prefab/mac_%_server/debug/dist/ballisticacore_headless: .efrocachemap +build/prefab/full/mac_%_server/debug/dist/ballisticacore_headless: .efrocachemap + @tools/pcommand efrocache_get $@ + +build/prefab/lib/mac_%_server/debug/libballisticacore_internal.a: .efrocachemap @tools/pcommand efrocache_get $@ RUN_PREFAB_MAC_X86_64_SERVER_RELEASE = cd \ - build/prefab/mac_x86_64_server/release && ./ballisticacore_server + build/prefab/full/mac_x86_64_server/release && ./ballisticacore_server RUN_PREFAB_MAC_ARM64_SERVER_RELEASE = cd \ - build/prefab/mac_arm64_server/release && ./ballisticacore_server + build/prefab/full/mac_arm64_server/release && ./ballisticacore_server prefab-mac-x86-64-server-release: prefab-mac-x86-64-server-release-build @tools/pcommand ensure_prefab_platform mac_x86_64 @@ -262,42 +271,45 @@ prefab-mac-arm64-server-release: prefab-mac-arm64-server-release-build @${RUN_PREFAB_MAC_ARM64_SERVER_RELEASE} prefab-mac-x86-64-server-release-build: prereqs assets-cmake \ - build/prefab/mac_x86_64_server/release/dist/ballisticacore_headless \ - build/prefab/mac_x86_64_server/release/ballisticacore_server \ - build/prefab/mac_x86_64_server/release/config_template.yaml \ - build/prefab/mac_x86_64_server/release/README.txt - @${STAGE_ASSETS} -cmakeserver build/prefab/mac_x86_64_server/release/dist + build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless \ + build/prefab/full/mac_x86_64_server/release/ballisticacore_server \ + build/prefab/full/mac_x86_64_server/release/config_template.yaml \ + build/prefab/full/mac_x86_64_server/release/README.txt + @${STAGE_ASSETS} -cmakeserver build/prefab/full/mac_x86_64_server/release/dist prefab-mac-arm64-server-release-build: prereqs assets-cmake \ - build/prefab/mac_arm64_server/release/dist/ballisticacore_headless \ - build/prefab/mac_arm64_server/release/ballisticacore_server \ - build/prefab/mac_arm64_server/release/config_template.yaml \ - build/prefab/mac_arm64_server/release/README.txt - @${STAGE_ASSETS} -cmakeserver build/prefab/mac_arm64_server/release/dist + build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless \ + build/prefab/full/mac_arm64_server/release/ballisticacore_server \ + build/prefab/full/mac_arm64_server/release/config_template.yaml \ + build/prefab/full/mac_arm64_server/release/README.txt + @${STAGE_ASSETS} -cmakeserver build/prefab/full/mac_arm64_server/release/dist -build/prefab/mac_%_server/release/ballisticacore_server: \ +build/prefab/full/mac_%_server/release/ballisticacore_server: \ assets/src/server/ballisticacore_server.py tools/batools/pcommand.py @tools/pcommand stage_server_file release $< $@ -build/prefab/mac_%_server/release/config_template.yaml: \ +build/prefab/full/mac_%_server/release/config_template.yaml: \ assets/src/server/config_template.yaml \ tools/batools/build.py \ tools/batools/pcommand.py \ tools/bacommon/servermanager.py @tools/pcommand stage_server_file release $< $@ -build/prefab/mac_%_server/release/README.txt: \ +build/prefab/full/mac_%_server/release/README.txt: \ assets/src/server/README.txt @cp $< $@ -build/prefab/mac_%_server/release/dist/ballisticacore_headless: .efrocachemap +build/prefab/full/mac_%_server/release/dist/ballisticacore_headless: .efrocachemap + @tools/pcommand efrocache_get $@ + +build/prefab/lib/mac_%_server/release/libballisticacore_internal.a: .efrocachemap @tools/pcommand efrocache_get $@ RUN_PREFAB_LINUX_X86_64_DEBUG = cd \ - build/prefab/linux_x86_64/debug && ./ballisticacore + build/prefab/full/linux_x86_64/debug && ./ballisticacore RUN_PREFAB_LINUX_ARM64_DEBUG = cd \ - build/prefab/linux_arm64/debug && ./ballisticacore + build/prefab/full/linux_arm64/debug && ./ballisticacore prefab-linux-x86-64-debug: prefab-linux-x86-64-debug-build @tools/pcommand ensure_prefab_platform linux_x86_64 @@ -308,21 +320,24 @@ prefab-linux-arm64-debug: prefab-linux-arm64-debug-build @${RUN_PREFAB_LINUX_ARM64_DEBUG} prefab-linux-x86-64-debug-build: prereqs assets-cmake \ - build/prefab/linux_x86_64/debug/ballisticacore - @${STAGE_ASSETS} -cmake build/prefab/linux_x86_64/debug + build/prefab/full/linux_x86_64/debug/ballisticacore + @${STAGE_ASSETS} -cmake build/prefab/full/linux_x86_64/debug prefab-linux-arm64-debug-build: prereqs assets-cmake \ - build/prefab/linux_arm64/debug/ballisticacore - @${STAGE_ASSETS} -cmake build/prefab/linux_arm64/debug + build/prefab/full/linux_arm64/debug/ballisticacore + @${STAGE_ASSETS} -cmake build/prefab/full/linux_arm64/debug -build/prefab/linux_%/debug/ballisticacore: .efrocachemap +build/prefab/full/linux_%/debug/ballisticacore: .efrocachemap + @tools/pcommand efrocache_get $@ + +build/prefab/lib/linux_%/debug/libballisticacore_internal.a: .efrocachemap @tools/pcommand efrocache_get $@ RUN_PREFAB_LINUX_X86_64_RELEASE = cd \ - build/prefab/linux_x86_64/release && ./ballisticacore + build/prefab/full/linux_x86_64/release && ./ballisticacore RUN_PREFAB_LINUX_ARM64_RELEASE = cd \ - build/prefab/linux_arm64/release && ./ballisticacore + build/prefab/full/linux_arm64/release && ./ballisticacore prefab-linux-x86-64-release: prefab-linux-x86-64-release-build @tools/pcommand ensure_prefab_platform linux_x86_64 @@ -333,21 +348,24 @@ prefab-linux-arm64-release: prefab-linux-arm64-release-build @${RUN_PREFAB_LINUX_ARM64_RELEASE} prefab-linux-x86-64-release-build: prereqs assets-cmake \ - build/prefab/linux_x86_64/release/ballisticacore - @${STAGE_ASSETS} -cmake build/prefab/linux_x86_64/release + build/prefab/full/linux_x86_64/release/ballisticacore + @${STAGE_ASSETS} -cmake build/prefab/full/linux_x86_64/release prefab-linux-arm64-release-build: prereqs assets-cmake \ - build/prefab/linux_arm64/release/ballisticacore - @${STAGE_ASSETS} -cmake build/prefab/linux_arm64/release + build/prefab/full/linux_arm64/release/ballisticacore + @${STAGE_ASSETS} -cmake build/prefab/full/linux_arm64/release -build/prefab/linux_%/release/ballisticacore: .efrocachemap +build/prefab/full/linux_%/release/ballisticacore: .efrocachemap + @tools/pcommand efrocache_get $@ + +build/prefab/lib/linux_%/release/libballisticacore_internal.a: .efrocachemap @tools/pcommand efrocache_get $@ RUN_PREFAB_LINUX_X86_64_SERVER_DEBUG = cd \ - build/prefab/linux_x86_64_server/debug && ./ballisticacore_server + build/prefab/full/linux_x86_64_server/debug && ./ballisticacore_server RUN_PREFAB_LINUX_ARM64_SERVER_DEBUG = cd \ - build/prefab/linux_arm64_server/debug && ./ballisticacore_server + build/prefab/full/linux_arm64_server/debug && ./ballisticacore_server prefab-linux-x86-64-server-debug: prefab-linux-x86-64-server-debug-build @tools/pcommand ensure_prefab_platform linux_x86_64 @@ -358,75 +376,82 @@ prefab-linux-arm64-server-debug: prefab-linux-arm64-server-debug-build @${RUN_PREFAB_LINUX_ARM64_SERVER_DEBUG} prefab-linux-x86-64-server-debug-build: prereqs assets-cmake \ - build/prefab/linux_x86_64_server/debug/dist/ballisticacore_headless \ - build/prefab/linux_x86_64_server/debug/ballisticacore_server \ - build/prefab/linux_x86_64_server/debug/config_template.yaml \ - build/prefab/linux_x86_64_server/debug/README.txt - @${STAGE_ASSETS} -cmakeserver build/prefab/linux_x86_64_server/debug/dist + build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless \ + build/prefab/full/linux_x86_64_server/debug/ballisticacore_server \ + build/prefab/full/linux_x86_64_server/debug/config_template.yaml \ + build/prefab/full/linux_x86_64_server/debug/README.txt + @${STAGE_ASSETS} -cmakeserver build/prefab/full/linux_x86_64_server/debug/dist prefab-linux-arm64-server-debug-build: prereqs assets-cmake \ - build/prefab/linux_arm64_server/debug/dist/ballisticacore_headless \ - build/prefab/linux_arm64_server/debug/ballisticacore_server \ - build/prefab/linux_arm64_server/debug/config_template.yaml \ - build/prefab/linux_arm64_server/debug/README.txt - @${STAGE_ASSETS} -cmakeserver build/prefab/linux_arm64_server/debug/dist + build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless \ + build/prefab/full/linux_arm64_server/debug/ballisticacore_server \ + build/prefab/full/linux_arm64_server/debug/config_template.yaml \ + build/prefab/full/linux_arm64_server/debug/README.txt + @${STAGE_ASSETS} -cmakeserver build/prefab/full/linux_arm64_server/debug/dist -build/prefab/linux_%_server/debug/ballisticacore_server: \ +build/prefab/full/linux_%_server/debug/ballisticacore_server: \ assets/src/server/ballisticacore_server.py tools/batools/pcommand.py @tools/pcommand stage_server_file debug $< $@ -build/prefab/linux_%_server/debug/config_template.yaml: \ +build/prefab/full/linux_%_server/debug/config_template.yaml: \ assets/src/server/config_template.yaml \ tools/batools/build.py \ tools/batools/pcommand.py \ tools/bacommon/servermanager.py @tools/pcommand stage_server_file debug $< $@ -build/prefab/linux_%_server/debug/README.txt: \ +build/prefab/full/linux_%_server/debug/README.txt: \ assets/src/server/README.txt @cp $< $@ -build/prefab/linux_%_server/debug/dist/ballisticacore_headless: .efrocachemap +build/prefab/full/linux_%_server/debug/dist/ballisticacore_headless: .efrocachemap + @tools/pcommand efrocache_get $@ + +build/prefab/lib/linux_%_server/debug/libballisticacore_internal.a: .efrocachemap @tools/pcommand efrocache_get $@ RUN_PREFAB_LINUX_X86_64_SERVER_RELEASE = cd \ - build/prefab/linux_x86_64_server/release && ./ballisticacore_server + build/prefab/full/linux_x86_64_server/release && ./ballisticacore_server RUN_PREFAB_LINUX_ARM64_SERVER_RELEASE = cd \ - build/prefab/linux_arm64_server/release && ./ballisticacore_server + build/prefab/full/linux_arm64_server/release && ./ballisticacore_server prefab-linux-x86-64-server-release: prefab-linux-x86-64-server-release-build @tools/pcommand ensure_prefab_platform linux_x86_64 @${RUN_PREFAB_LINUX_X86_64_SERVER_RELEASE} prefab-linux-x86-64-server-release-build: prereqs assets-cmake \ - build/prefab/linux_x86_64_server/release/dist/ballisticacore_headless \ - build/prefab/linux_x86_64_server/release/ballisticacore_server \ - build/prefab/linux_x86_64_server/release/config_template.yaml \ - build/prefab/linux_x86_64_server/release/README.txt - @${STAGE_ASSETS} -cmakeserver build/prefab/linux_x86_64_server/release/dist + build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless \ + build/prefab/full/linux_x86_64_server/release/ballisticacore_server \ + build/prefab/full/linux_x86_64_server/release/config_template.yaml \ + build/prefab/full/linux_x86_64_server/release/README.txt + @${STAGE_ASSETS} \ + -cmakeserver build/prefab/full/linux_x86_64_server/release/dist -build/prefab/linux_%_server/release/ballisticacore_server: \ +build/prefab/full/linux_%_server/release/ballisticacore_server: \ assets/src/server/ballisticacore_server.py tools/batools/pcommand.py @tools/pcommand stage_server_file release $< $@ -build/prefab/linux_%_server/release/config_template.yaml: \ +build/prefab/full/linux_%_server/release/config_template.yaml: \ assets/src/server/config_template.yaml \ tools/batools/build.py \ tools/batools/pcommand.py \ tools/bacommon/servermanager.py @tools/pcommand stage_server_file release $< $@ -build/prefab/linux_%_server/release/README.txt: \ +build/prefab/full/linux_%_server/release/README.txt: \ assets/src/server/README.txt @cp $< $@ -build/prefab/linux_%_server/release/dist/ballisticacore_headless: .efrocachemap +build/prefab/full/linux_%_server/release/dist/ballisticacore_headless: .efrocachemap + @tools/pcommand efrocache_get $@ + +build/prefab/lib/linux_%_server/release/libballisticacore_internal.a: .efrocachemap @tools/pcommand efrocache_get $@ WINPLAT_X86 = Win32 -RUN_PREFAB_WINDOWS_X86_DEBUG = cd build/prefab/windows_x86/debug \ +RUN_PREFAB_WINDOWS_X86_DEBUG = cd build/prefab/full/windows_x86/debug \ && ./BallisticaCore.exe prefab-windows-x86-debug: prefab-windows-x86-debug-build @@ -434,14 +459,14 @@ prefab-windows-x86-debug: prefab-windows-x86-debug-build @{RUN_PREFAB_WINDOWS_X86_DEBUG} prefab-windows-x86-debug-build: prereqs assets-windows-${WINPLAT_X86} \ - build/prefab/windows_x86/debug/BallisticaCore.exe + build/prefab/full/windows_x86/debug/BallisticaCore.exe @${STAGE_ASSETS} -win-${WINPLAT_X86}-Debug \ -build/prefab/windows_x86/debug +build/prefab/full/windows_x86/debug -build/prefab/windows_x86/debug/BallisticaCore.exe: .efrocachemap +build/prefab/full/windows_x86/debug/BallisticaCore.exe: .efrocachemap @tools/pcommand efrocache_get $@ -RUN_PREFAB_WINDOWS_X86_RELEASE = cd build/prefab/windows_x86/release \ +RUN_PREFAB_WINDOWS_X86_RELEASE = cd build/prefab/full/windows_x86/release \ && ./BallisticaCore.exe prefab-windows-x86-release: prefab-windows-x86-release-build @@ -450,14 +475,15 @@ prefab-windows-x86-release: prefab-windows-x86-release-build prefab-windows-x86-release-build: prereqs \ assets-windows-${WINPLAT_X86} \ - build/prefab/windows_x86/release/BallisticaCore.exe + build/prefab/full/windows_x86/release/BallisticaCore.exe @${STAGE_ASSETS} -win-${WINPLAT_X86}-Release \ -build/prefab/windows_x86/release +build/prefab/full/windows_x86/release -build/prefab/windows_x86/release/BallisticaCore.exe: .efrocachemap +build/prefab/full/windows_x86/release/BallisticaCore.exe: .efrocachemap @tools/pcommand efrocache_get $@ -RUN_PREFAB_WINDOWS_X86_SERVER_DEBUG = cd build/prefab/windows_x86_server/debug \ +RUN_PREFAB_WINDOWS_X86_SERVER_DEBUG = cd \ + build/prefab/full/windows_x86_server/debug \ && dist/python_d.exe ballisticacore_server.py prefab-windows-x86-server-debug: prefab-windows-x86-server-debug-build @@ -466,38 +492,38 @@ prefab-windows-x86-server-debug: prefab-windows-x86-server-debug-build prefab-windows-x86-server-debug-build: prereqs \ assets-windows-${WINPLAT_X86} \ - build/prefab/windows_x86_server/debug/dist/ballisticacore_headless.exe \ - build/prefab/windows_x86_server/debug/launch_ballisticacore_server.bat \ - build/prefab/windows_x86_server/debug/ballisticacore_server.py \ - build/prefab/windows_x86_server/debug/config_template.yaml \ - build/prefab/windows_x86_server/debug/README.txt + build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe \ + build/prefab/full/windows_x86_server/debug/launch_ballisticacore_server.bat \ + build/prefab/full/windows_x86_server/debug/ballisticacore_server.py \ + build/prefab/full/windows_x86_server/debug/config_template.yaml \ + build/prefab/full/windows_x86_server/debug/README.txt @${STAGE_ASSETS} -winserver-${WINPLAT_X86}-Debug \ - build/prefab/windows_x86_server/debug/dist + build/prefab/full/windows_x86_server/debug/dist -build/prefab/windows_x86_server/debug/dist/ballisticacore_headless.exe: .efrocachemap +build/prefab/full/windows_x86_server/debug/dist/ballisticacore_headless.exe: .efrocachemap @tools/pcommand efrocache_get $@ -build/prefab/windows_%_server/debug/ballisticacore_server.py: \ +build/prefab/full/windows_%_server/debug/ballisticacore_server.py: \ assets/src/server/ballisticacore_server.py tools/batools/pcommand.py @tools/pcommand stage_server_file debug $< $@ -build/prefab/windows_%_server/debug/launch_ballisticacore_server.bat: \ +build/prefab/full/windows_%_server/debug/launch_ballisticacore_server.bat: \ assets/src/server/launch_ballisticacore_server.bat tools/batools/pcommand.py @tools/pcommand stage_server_file debug $< $@ -build/prefab/windows_%_server/debug/config_template.yaml: \ +build/prefab/full/windows_%_server/debug/config_template.yaml: \ assets/src/server/config_template.yaml \ tools/batools/build.py \ tools/batools/pcommand.py \ tools/bacommon/servermanager.py @tools/pcommand stage_server_file debug $< $@ -build/prefab/windows_%_server/debug/README.txt: \ +build/prefab/full/windows_%_server/debug/README.txt: \ assets/src/server/README.txt @cp $< $@ RUN_PREFAB_WINDOWS_X86_SERVER_RELEASE = cd \ - build/prefab/windows_x86_server/release \ + build/prefab/full/windows_x86_server/release \ && dist/python.exe -O ballisticacore_server.py prefab-windows-x86-server-release: prefab-windows-x86-server-release-build @@ -506,33 +532,33 @@ prefab-windows-x86-server-release: prefab-windows-x86-server-release-build prefab-windows-x86-server-release-build: prereqs \ assets-windows-${WINPLAT_X86} \ - build/prefab/windows_x86_server/release/dist/ballisticacore_headless.exe \ - build/prefab/windows_x86_server/release/launch_ballisticacore_server.bat \ - build/prefab/windows_x86_server/release/ballisticacore_server.py \ - build/prefab/windows_x86_server/release/config_template.yaml \ - build/prefab/windows_x86_server/release/README.txt + build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe \ + build/prefab/full/windows_x86_server/release/launch_ballisticacore_server.bat \ + build/prefab/full/windows_x86_server/release/ballisticacore_server.py \ + build/prefab/full/windows_x86_server/release/config_template.yaml \ + build/prefab/full/windows_x86_server/release/README.txt @${STAGE_ASSETS} -winserver-${WINPLAT_X86}-Release \ - build/prefab/windows_x86_server/release/dist + build/prefab/full/windows_x86_server/release/dist -build/prefab/windows_x86_server/release/dist/ballisticacore_headless.exe: .efrocachemap +build/prefab/full/windows_x86_server/release/dist/ballisticacore_headless.exe: .efrocachemap @tools/pcommand efrocache_get $@ -build/prefab/windows_%_server/release/ballisticacore_server.py: \ +build/prefab/full/windows_%_server/release/ballisticacore_server.py: \ assets/src/server/ballisticacore_server.py tools/batools/pcommand.py @tools/pcommand stage_server_file release $< $@ -build/prefab/windows_%_server/release/launch_ballisticacore_server.bat: \ +build/prefab/full/windows_%_server/release/launch_ballisticacore_server.bat: \ assets/src/server/launch_ballisticacore_server.bat tools/batools/pcommand.py @tools/pcommand stage_server_file release $< $@ -build/prefab/windows_%_server/release/config_template.yaml: \ +build/prefab/full/windows_%_server/release/config_template.yaml: \ assets/src/server/config_template.yaml \ tools/batools/build.py \ tools/batools/pcommand.py \ tools/bacommon/servermanager.py @tools/pcommand stage_server_file release $< $@ -build/prefab/windows_%_server/release/README.txt: \ +build/prefab/full/windows_%_server/release/README.txt: \ assets/src/server/README.txt @cp $< $@