diff --git a/Makefile b/Makefile index 08646799..a42395d7 100644 --- a/Makefile +++ b/Makefile @@ -266,10 +266,10 @@ prefab-mac-arm64-gui-debug-build: prereqs assets-cmake \ @$(STAGE_BUILD) -cmake -debug build/prefab/full/mac_arm64_gui/debug build/prefab/full/mac_%_gui/debug/ballisticakit: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/mac_%_gui/debug/libballisticaplus.a: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Mac gui release: @@ -296,10 +296,10 @@ prefab-mac-arm64-gui-release-build: prereqs assets-cmake \ @$(STAGE_BUILD) -cmake -release build/prefab/full/mac_arm64_gui/release build/prefab/full/mac_%_gui/release/ballisticakit: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/mac_%_gui/release/libballisticaplus.a: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Mac server debug: @@ -326,10 +326,10 @@ prefab-mac-arm64-server-debug-build: prereqs assets-server \ @$(STAGE_BUILD) -cmakeserver -debug build/prefab/full/mac_arm64_server/debug build/prefab/full/mac_%_server/debug/dist/ballisticakit_headless: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/mac_%_server/debug/libballisticaplus.a: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Mac server release: @@ -358,10 +358,10 @@ prefab-mac-arm64-server-release-build: prereqs assets-server \ build/prefab/full/mac_arm64_server/release build/prefab/full/mac_%_server/release/dist/ballisticakit_headless: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/mac_%_server/release/libballisticaplus.a: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Linux gui debug: @@ -388,10 +388,10 @@ prefab-linux-arm64-gui-debug-build: prereqs assets-cmake \ @$(STAGE_BUILD) -cmake -debug build/prefab/full/linux_arm64_gui/debug build/prefab/full/linux_%_gui/debug/ballisticakit: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/linux_%_gui/debug/libballisticaplus.a: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Linux gui release: @@ -418,10 +418,10 @@ prefab-linux-arm64-gui-release-build: prereqs assets-cmake \ @$(STAGE_BUILD) -cmake -release build/prefab/full/linux_arm64_gui/release build/prefab/full/linux_%_gui/release/ballisticakit: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/linux_%_gui/release/libballisticaplus.a: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Linux server debug: @@ -450,10 +450,10 @@ prefab-linux-arm64-server-debug-build: prereqs assets-server \ build/prefab/full/linux_arm64_server/debug build/prefab/full/linux_%_server/debug/dist/ballisticakit_headless: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/linux_%_server/debug/libballisticaplus.a: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Linux server release: @@ -482,10 +482,10 @@ prefab-linux-arm64-server-release-build: prereqs assets-server \ build/prefab/full/linux_arm64_server/release build/prefab/full/linux_%_server/release/dist/ballisticakit_headless: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/linux_%_server/release/libballisticaplus.a: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Windows gui debug: @@ -502,13 +502,13 @@ prefab-windows-x86-gui-debug-build: prereqs assets-windows-$(WINPLAT_X86) \ build/prefab/full/windows_x86_gui/debug build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/windows/Debug_%/BallisticaKitGenericPlus.lib: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/windows/Debug_%/BallisticaKitGenericPlus.pdb: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Windows gui release: @@ -526,13 +526,13 @@ prefab-windows-x86-gui-release-build: prereqs \ build/prefab/full/windows_x86_gui/release build/prefab/full/windows_x86_gui/release/BallisticaKit.exe: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/windows/Release_%/BallisticaKitGenericPlus.lib: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/windows/Release_%/BallisticaKitGenericPlus.pdb: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Windows server debug: @@ -551,13 +551,13 @@ prefab-windows-x86-server-debug-build: prereqs \ build/prefab/full/windows_x86_server/debug build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/windows/Debug_%/BallisticaKitHeadlessPlus.lib: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/windows/Debug_%/BallisticaKitHeadlessPlus.pdb: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Windows server release: @@ -576,13 +576,13 @@ prefab-windows-x86-server-release-build: prereqs \ build/prefab/full/windows_x86_server/release build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/windows/Release_%/BallisticaKitHeadlessPlus.lib: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ build/prefab/lib/windows/Release_%/BallisticaKitHeadlessPlus.pdb: .efrocachemap - @.cache/pcommandbatch/pcommandbatch efrocache_get $@ + @tools/pcommand efrocache_get $@ # Tell make which of these targets don't represent files. .PHONY: prefab-gui-debug prefab-gui-release prefab-gui-debug-build \ diff --git a/src/assets/Makefile b/src/assets/Makefile index a84663b2..4b1970c0 100644 --- a/src/assets/Makefile +++ b/src/assets/Makefile @@ -1757,7 +1757,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_APPLE = \ # Rule to copy src asset scripts to dst. # (and make non-writable so I'm less likely to accidentally edit them there) $(SCRIPT_TARGETS_PY_PRIVATE_APPLE) : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ # These are too complex to define in a pattern rule; # Instead we generate individual targets in a loop. @@ -2701,7 +2701,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_ANDROID = \ # Rule to copy src asset scripts to dst. # (and make non-writable so I'm less likely to accidentally edit them there) $(SCRIPT_TARGETS_PY_PRIVATE_ANDROID) : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ # These are too complex to define in a pattern rule; # Instead we generate individual targets in a loop. @@ -2759,7 +2759,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \ # Rule to copy src asset scripts to dst. # (and make non-writable so I'm less likely to accidentally edit them there) $(SCRIPT_TARGETS_PY_PRIVATE_COMMON) : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ # These are too complex to define in a pattern rule; # Instead we generate individual targets in a loop. @@ -3687,7 +3687,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_WIN_WIN32 = \ # Rule to copy src asset scripts to dst. # (and make non-writable so I'm less likely to accidentally edit them there) $(SCRIPT_TARGETS_PY_PRIVATE_WIN_WIN32) : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ # These are too complex to define in a pattern rule; # Instead we generate individual targets in a loop. @@ -4615,7 +4615,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_WIN_X64 = \ # Rule to copy src asset scripts to dst. # (and make non-writable so I'm less likely to accidentally edit them there) $(SCRIPT_TARGETS_PY_PRIVATE_WIN_X64) : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ # These are too complex to define in a pattern rule; # Instead we generate individual targets in a loop. @@ -7290,7 +7290,7 @@ EXTRAS_TARGETS_WIN_WIN32 = \ # Rule to copy src extras to build. $(EXTRAS_TARGETS_WIN_WIN32) : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ EXTRAS_TARGETS_WIN_X64 = \ @@ -7380,7 +7380,7 @@ EXTRAS_TARGETS_WIN_X64 = \ # Rule to copy src extras to build. $(EXTRAS_TARGETS_WIN_X64) : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ # __AUTOGENERATED_PRIVATE_END__ @@ -7388,64 +7388,64 @@ ASSET_TARGETS_COMMON_GUI += $(MESH_TARGETS) $(COLLISION_MESH_TARGETS) ASSET_TARGETS_COMMON_SERVER += $(COLLISION_MESH_TARGETS) $(BUILD_DIR)/%.bob : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ $(BUILD_DIR)/%.cob : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ $(BUILD_DIR)/%.ogg : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ $(BUILD_DIR)/%.fdata : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ $(BUILD_DIR)/%.pem : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ # Langdata one-off json file. $(BUILD_DIR)/ba_data/data/langdata.json : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ # Languages json files. $(BUILD_DIR)/ba_data/data/languages/%.json : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ # Map json files. $(BUILD_DIR)/ba_data/data/maps/%.json : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ ba_data/%.tex2d.png : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ ba_data/%_+x.tex2d.png : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ ba_data/%_-x.tex2d.png: ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ ba_data/%_+y.tex2d.png: ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ ba_data/%_-y.tex2d.png: ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ ba_data/%_+z.tex2d.png: ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ ba_data/%_-z.tex2d.png: ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ $(BUILD_DIR)/ba_data/%_preview.png : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ $(BUILD_DIR)/%.dds : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ $(BUILD_DIR)/%.pvr : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ $(BUILD_DIR)/%.ktx : ../../.efrocachemap - @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@ + @cd ../.. && tools/pcommand efrocache_get src/assets/$@ audio: $(AUDIO_TARGETS) audio-clean: