diff --git a/.efrocachemap b/.efrocachemap index d9ed8aa8..ab9c2b12 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4056,26 +4056,26 @@ "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "bc76c6a34a367df5874a1806d3380730", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "0d84d2854b2418bc72d0402fa20fb2d6", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "9ed7e0a8e0fb50d0938e22179b95dc3b", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "4ffe100e34d497f9b05927ca446c2eb1", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "978b1fa602bc48d814c8051b6e3a5ef0", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "0f5435e98f8f2cd2ab9ddd07974e4dab", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "04118a4d5a9ed3ef0bde328b553df122", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "3a6b0376fa55dd7973c991e4593a5e94", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f77111f3a4e48696456bd70a8cdfcf1b", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c2608d781507d8e95961e80f9a2f3e98", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "1e64d28f0c44651df685cc40b8f7542c", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "a346c666b51f29a7cd6b4edbc35cba24", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "1f4352145abac6cb90a92024734d7647", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "84cf028c26c40952722c1312d8f6fb13", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "7545800c0ff817d58239a58cbcec043d", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "d846a8092d61577fc888396962a7d01d", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "6f0c8e9154730666866886235159128c", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "753fe097bbe82ff89589c29606fbba66", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "4a72d99954e642a87d9edb767bcb6103", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "185219931d4dc82ee7b8c33f26299c54", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "3c2b2b37faa0c827e7a515dba7a8fa25", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "ef802531bbf82293b0ed52083d945cdc", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "508cc12c611316ed5276ee7d926e7b70", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "801c672cc7836c94ed090f3f11ad90a3", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "438173f578d3e0b407276434e1ba37a6", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "37e256cb735133aae96ba51cb06d01a6", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "23bfa2b732e6a703875e14572c3fd1eb", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "68f0f68d32d272a90080fd7746f84b47", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "a164e99217a28cd26e322d6413cf64cf", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "c83d961a17c8c28da7c7eca5192a6314", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "9eefdf54ed08d80ef2226f14129e000a", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "a4db7791ab708bc197cf5bf7ecc22224", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "728633cfb493d99846955c08b85bec16", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "efca925b71252880a692741d38d26519", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "a4bf11f9b1d0cf394fc7606928c02cf1", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "b40f16dbc3b6c98ca61ef22391ab9a67", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "d2ac3dea823f0ed27ab3bd45b2af6eb1", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "8a34d3924ae61f01003ebf8ea7166f91", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "7ee211897490829f29ba1defd952400f", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "144670c1e891b8378a85e8d408c0d7ce", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "5156f353592c4211f25ee238afe038fc", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "dd16f8d0f18ef126d051c5cd725b1568", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "5156f353592c4211f25ee238afe038fc", @@ -4092,14 +4092,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "b4f192949f671e0d20536bfbb04591e3", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "0f6bd992d92d00526ce8746aee66dc9e", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "b4f192949f671e0d20536bfbb04591e3", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "62927dee99eaf521daf0872af4bfb36c", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "90a17d2a0b125923252a8760c9ba369c", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "4a3e691967151431ebbae1138442c2e7", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "5f4e2c8d39e1f547fd0b3a1d093bf6c7", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "5f2ba19d5ac0dee8cb46f2e19214a9ce", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "eff64f1be917c44f189c4d812ace22d5", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "ba281d69f264f64f471b1127e4189edc", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "99aefd9fc4c01bd63e1cd3af116b9040", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "6bb9e5a8ef46a5ea9040ebc65af567b2", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "ebc29b9a80eb67258093f7ca35a467ff", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "984f0cc74452ae6d597f316615f92165", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "9884ec826b4662d367291945afc0319b", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "211deddf90855ac10fb191370b1a8b9f", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "93d3a7cd4f9ab503d595650ce6c4733d", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "227ad657446b051c5f2cc901d459612e", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "5742a499a4526b460ffcbda7ad163027", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "f8cd3af311ac63147882590123b78318", "src/ballistica/base/mgen/pyembed/binding_base.inc": "9f71f171464dc004dbaab87e9bb4b03b", diff --git a/CHANGELOG.md b/CHANGELOG.md index 379f26fd..4c7bd3b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.28 (build 21410, api 8, 2023-10-03) +### 1.7.28 (build 21411, api 8, 2023-10-04) - Massively cleaned up code related to rendering and window systems (OpenGL, SDL, etc). This code had been growing into a nasty tangle for 15 years @@ -97,6 +97,7 @@ now be tapped to copy it (Thanks vishal332008!). - Removed the bits from `babase.app` that were deprecated in 1.7.27. I know that was only one version ago, but this version has been cooking for a while now. +- Visual Studio projects have been updated to target Visual Studio 2022. ### 1.7.27 (build 21282, api 8, 2023-08-30) diff --git a/Makefile b/Makefile index f92aac5d..36637945 100644 --- a/Makefile +++ b/Makefile @@ -1236,12 +1236,12 @@ $(PCOMMANDBATCHBIN): src/tools/pcommandbatch/pcommandbatch.c \ CM_BT_LC = $(shell echo $(CMAKE_BUILD_TYPE) | tr A-Z a-z) # Eww; no way to do multi-line constants in make without spaces :-( -_WMSBE_1 = \"C:\\Program Files \(x86\)\\Microsoft Visual Studio\\2019 +_WMSBE_1 = \"C:\\Program Files\\Microsoft Visual Studio\\2022 _WMSBE_2 = \\Community\\MSBuild\\Current\\Bin\\MSBuild.exe\" -_WMSBE_1B = /mnt/c/Program Files (x86)/Microsoft Visual Studio/2019 +_WMSBE_1B = /mnt/c/Program Files/Microsoft Visual Studio/2022 _WMSBE_2B = /Community/MSBuild/Current/Bin/MSBuild.exe -VISUAL_STUDIO_VERSION = -property:VisualStudioVersion=16 +VISUAL_STUDIO_VERSION = -property:VisualStudioVersion=17 WIN_MSBUILD_EXE = $(_WMSBE_1)$(_WMSBE_2) WIN_MSBUILD_EXE_B = "$(_WMSBE_1B)$(_WMSBE_2B)" WINPRJ = $(WINDOWS_PROJECT) diff --git a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj index 2c3bf6b5..a0f8b3d7 100644 --- a/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj +++ b/ballisticakit-windows/Generic/BallisticaKitGeneric.vcxproj @@ -29,27 +29,27 @@ Application true Unicode - v142 + v143 Application true Unicode - v142 + v143 Application false true Unicode - v142 + v143 Application false true Unicode - v142 + v143 diff --git a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj index f6064e94..4637dcdb 100644 --- a/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj +++ b/ballisticakit-windows/Headless/BallisticaKitHeadless.vcxproj @@ -28,26 +28,26 @@ Application true - v142 + v143 Unicode Application false - v142 + v143 true Unicode Application true - v142 + v143 Unicode Application false - v142 + v143 true Unicode diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 9616fade..d44198db 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21410 +TARGET_BALLISTICA_BUILD = 21411 TARGET_BALLISTICA_VERSION = '1.7.28' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index 461bf4f9..a81ccce4 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 = 21410; +const int kEngineBuildNumber = 21411; const char* kEngineVersion = "1.7.28"; const int kEngineApiVersion = 8; diff --git a/tools/batools/pcommands2.py b/tools/batools/pcommands2.py index 7f6b0141..203c9eaa 100644 --- a/tools/batools/pcommands2.py +++ b/tools/batools/pcommands2.py @@ -243,13 +243,13 @@ def win_ci_binary_build() -> None: # Do the thing. subprocess.run( [ - 'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\' + 'C:\\Program Files\\Microsoft Visual Studio\\2022\\' 'Enterprise\\MSBuild\\Current\\Bin\\MSBuild.exe', 'ballisticakit-windows\\Generic\\BallisticaKitGeneric.vcxproj', '-target:Build', '-property:Configuration=Debug', '-property:Platform=Win32', - '-property:VisualStudioVersion=16', + '-property:VisualStudioVersion=17', ], check=True, )