From c187ce9d9c9f38fd27c04ebefc3d756f2676cfc9 Mon Sep 17 00:00:00 2001
From: Eric Froemling <ericfroemling@gmail.com>
Date: Wed, 2 Jun 2021 16:08:40 -0500
Subject: [PATCH] more win build testing

---
 .efrocachemap                | 56 ++++++++++++++++++------------------
 Makefile                     |  7 ++---
 src/ballistica/ballistica.cc |  2 +-
 3 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/.efrocachemap b/.efrocachemap
index 3303ac68..c96f511b 100644
--- a/.efrocachemap
+++ b/.efrocachemap
@@ -3934,26 +3934,26 @@
   "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f",
   "ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a",
   "ballisticacore-windows/build/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/51/8b/d7e62f3cac378d7898fd22219485",
-  "build/prefab/full/linux_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/5d/1a/f0735adad6a5a61f7d057e857136",
-  "build/prefab/full/linux_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/fd/86/cf11d3e6becd308a242931196d89",
-  "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/40/24/47b24a97c48212c9fcf76afaf47b",
-  "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/66/e7/f1f8c569f047bf19a1a877901ca1",
-  "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a2/18/321c17958d9f38ebf537ed894626",
-  "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ef/56/020ac9eab1e8204087a96a25f131",
-  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/98/a4/cc3424c053cf9c9ee628d070d2ea",
-  "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/31/c6/bc0948e1fb95b74b6f52cab67806",
-  "build/prefab/full/mac_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/de/aa/8ad6c9885ee47af107faa4327131",
-  "build/prefab/full/mac_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/32/f6/95e8e557c23af42e8e1d501d84d0",
-  "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/6b/60/6b1721f53d070c7df1bbf73b602a",
-  "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/3c/40/ba652fefd2e32ca30346622ed69d",
-  "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/fd/5b/99e138e17adf2e521f3c3022a038",
-  "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/99/34/e6326c63e19988cca538bcfa0334",
-  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4a/fe/0ee1bbd9d9f36347c9e260736a56",
-  "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/84/65/ea739b8a06e6da4e7c996747fea3",
-  "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/4e/8a/c51595ec01924cda2719fdd61d39",
-  "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/2b/84/f1a39a6a1bbc5e6f1e05d565009a",
-  "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/f8/e5/9465d12b4bfb76609a768ec9fc81",
-  "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/f7/44/57914fe765f16f815f9a3655c8d8",
+  "build/prefab/full/linux_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/92/f1/1e1aa0155ae41d2fdead63deaf45",
+  "build/prefab/full/linux_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/25/2c/38f7cf86c7fb23aed9ce5f845908",
+  "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cb/82/4b958c09b02c7bd5826a9744ca9a",
+  "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b4/c8/80f3e5857bf54242f88a5922e6ad",
+  "build/prefab/full/linux_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a6/fd/fb5e47019eccce9f557ec3270c98",
+  "build/prefab/full/linux_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/5e/81/da55117215d33ea6aa4d892adff5",
+  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e5/c6/a311a5c1319c0861e8cb7673628a",
+  "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/72/f2/b6bc5fa21ed5401f977cd17cf48b",
+  "build/prefab/full/mac_arm64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a3/d2/24be11bb773674abd2fb1fa9a144",
+  "build/prefab/full/mac_arm64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/4d/6b/970fb4431ca7f478e5a55c4cb6a8",
+  "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/75/ca/52b6b41ca06dc5b5e4ace35582ee",
+  "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/af/93/6117fb8e27e6df3535eb565bd47c",
+  "build/prefab/full/mac_x86_64/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/18/ba/c450484c699736609aedf530998f",
+  "build/prefab/full/mac_x86_64/release/ballisticacore": "https://files.ballistica.net/cache/ba1/61/ee/c8781325975750d5888f7632a75a",
+  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a9/6e/2b1e8e267a7d16dd17ed86e3ee5e",
+  "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4c/c5/c3f6b8f9d044166838ed47acb1be",
+  "build/prefab/full/windows_x86/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/50/a8/7695dc0c9899d0260665de8893dc",
+  "build/prefab/full/windows_x86/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/8a/18/e89e37abad3a2e82d032ef0f1a54",
+  "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/2b/99/9f8f9808c8655098b29fe971ac1e",
+  "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/cf/d7/6ce1dae97c989551221eaee892af",
   "build/prefab/lib/linux_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/1a/ff/0027a7c84610c331be09633907ef",
   "build/prefab/lib/linux_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e0/05/94ac67cbf2e665eeecfc77246caf",
   "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/72/a8/bdf8597296d539357b344f75082d",
@@ -3962,12 +3962,12 @@
   "build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/1f/b3/80375870a9ab83bbb63b50b03a73",
   "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e7/b0/f52d213949d05db13145a5247285",
   "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b6/6b/37174b3a0d72a05f1bb3d904b78b",
-  "build/prefab/lib/mac_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/be/a7/195ae804624dbeb6803f93a1a012",
-  "build/prefab/lib/mac_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/05/51/1ae5692b76ed59fad0503f237d93",
-  "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ba/c5/9182deecb4828e2931ea4c06591a",
-  "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ba/a5/e4843ba222e159d7b163580e440c",
-  "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/3a/bd/ece30026ff3c39df47e80626bd4d",
-  "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/08/74/826f2b32c7576bbf646794bfc189",
-  "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/88/c6/631cf07ec92de021afaa648646a6",
-  "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/6c/54/618ae7f3191d1e6b9b0c18c4af85"
+  "build/prefab/lib/mac_arm64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d6/b1/c96f1ebaca35a05a29a154dafbc3",
+  "build/prefab/lib/mac_arm64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c7/3c/e3d331aebb4362c8d21b106d7783",
+  "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f7/c2/3207b0c0d24a2d591e9c0a70e86e",
+  "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c5/14/71c707d7837c712bd062e0eff223",
+  "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/2d/f1/2dc6357d5c3b9c793045538abede",
+  "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/39/ca/24dfdbf5e860d2ce5e98e2358203",
+  "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/24/92/bd165d3676a6eb06243843c1612c",
+  "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/bb/65/fb4bd3036775d52332d208080aa0"
 }
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 8089436d..15908633 100644
--- a/Makefile
+++ b/Makefile
@@ -496,11 +496,8 @@ ballisticacore-windows/build/Debug_%/BallisticaCoreGenericInternal.exe: \
   ballisticacore-windows/build/Debug_%/BallisticaCoreGenericInternal.lib \
   ballisticacore-windows/Generic/BallisticaCore.ico \
   prereqs code resources
-	${WIN_MSBUILD_EXE_B} \
-  ${shell wslpath -m -a \
-  ballisticacore-windows/Generic/BallisticaCoreGeneric.vcxproj} \
-  -target:Build -property:Configuration=Debug \
-  -property:Platform=Generic ${VISUAL_STUDIO_VERSION}
+	WINDOWS_PROJECT=Generic WINDOWS_CONFIGURATION=Debug WINDOWS_PLATFORM=$* \
+      ${MAKE} _windows-wsl-build
 
 # Tell make which of these targets don't represent files.
 .PHONY: prefab-debug prefab-release prefab-debug-build prefab-release-build \
diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc
index 9bef863a..dd3cb37f 100644
--- a/src/ballistica/ballistica.cc
+++ b/src/ballistica/ballistica.cc
@@ -21,7 +21,7 @@
 namespace ballistica {
 
 // These are set automatically via script; don't edit them here.
-const int kAppBuildNumber = 20370;
+const int kAppBuildNumber = 20371;
 const char* kAppVersion = "1.6.4";
 
 // Our standalone globals.