From 500a694ca870f9f5a8ea196f4099a0e7de09fe50 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 15 Sep 2020 07:22:32 -0700 Subject: [PATCH] msbuild: bundle all dolphin "core" code into single library --- Externals/ExternalsReferenceAll.props | 89 + Externals/curl/curl.vcxproj | 5 - Externals/liblzma/liblzma.vcxproj | 2 +- Externals/libpng/png/png.vcxproj | 5 - ...static_2013.vcxproj => libusb-1.0.vcxproj} | 0 Source/Android/jni/MainAndroid.cpp | 2 +- Source/Core/AudioCommon/AudioCommon.vcxproj | 64 - .../AudioCommon/AudioCommon.vcxproj.filters | 64 - Source/Core/Common/Common.vcxproj | 287 --- Source/Core/Common/Common.vcxproj.filters | 380 ---- Source/Core/Core/Core.vcxproj | 745 ------- Source/Core/Core/Core.vcxproj.filters | 1764 ----------------- Source/Core/DiscIO/DiscIO.vcxproj | 106 - Source/Core/DiscIO/DiscIO.vcxproj.filters | 191 -- Source/Core/DolphinLib.ARM64.props | 35 + Source/Core/DolphinLib.props | 1201 +++++++++++ .../D3DCommon.vcxproj => DolphinLib.vcxproj} | 30 +- Source/Core/DolphinLib.vcxproj.user | 6 + Source/Core/DolphinLib.x64.props | 54 + Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj | 37 +- Source/Core/DolphinQt/DolphinQt.vcxproj | 62 +- Source/Core/InputCommon/InputCommon.vcxproj | 116 -- .../InputCommon/InputCommon.vcxproj.filters | 261 --- Source/Core/UICommon/UICommon.vcxproj | 72 - .../Core/UpdaterCommon/UpdaterCommon.vcxproj | 44 - Source/Core/VideoBackends/D3D/D3D.vcxproj | 56 - .../VideoBackends/D3D/D3D.vcxproj.filters | 80 - Source/Core/VideoBackends/D3D12/D3D12.vcxproj | 62 - .../VideoBackends/D3D12/D3D12.vcxproj.filters | 36 - .../D3DCommon/D3DCommon.vcxproj.filters | 13 - Source/Core/VideoBackends/Null/Null.vcxproj | 43 - Source/Core/VideoBackends/OGL/OGL.vcxproj | 60 - .../VideoBackends/OGL/OGL.vcxproj.filters | 85 - .../VideoBackends/Software/Software.vcxproj | 67 - .../Core/VideoBackends/Vulkan/Vulkan.vcxproj | 76 - Source/Core/VideoCommon/VideoCommon.vcxproj | 202 -- .../VideoCommon/VideoCommon.vcxproj.filters | 408 ---- Source/Core/WinUpdater/WinUpdater.vcxproj | 21 +- Source/DSPTool/DSPTool.vcxproj | 7 +- Source/UnitTests/UnitTests.vcxproj | 27 +- Source/dolphin-emu.sln | 242 +-- 41 files changed, 1477 insertions(+), 5630 deletions(-) create mode 100644 Externals/ExternalsReferenceAll.props rename Externals/libusb/{libusb_static_2013.vcxproj => libusb-1.0.vcxproj} (100%) delete mode 100644 Source/Core/AudioCommon/AudioCommon.vcxproj delete mode 100644 Source/Core/AudioCommon/AudioCommon.vcxproj.filters delete mode 100644 Source/Core/Common/Common.vcxproj delete mode 100644 Source/Core/Common/Common.vcxproj.filters delete mode 100644 Source/Core/Core/Core.vcxproj delete mode 100644 Source/Core/Core/Core.vcxproj.filters delete mode 100644 Source/Core/DiscIO/DiscIO.vcxproj delete mode 100644 Source/Core/DiscIO/DiscIO.vcxproj.filters create mode 100644 Source/Core/DolphinLib.ARM64.props create mode 100644 Source/Core/DolphinLib.props rename Source/Core/{VideoBackends/D3DCommon/D3DCommon.vcxproj => DolphinLib.vcxproj} (56%) create mode 100644 Source/Core/DolphinLib.vcxproj.user create mode 100644 Source/Core/DolphinLib.x64.props delete mode 100644 Source/Core/InputCommon/InputCommon.vcxproj delete mode 100644 Source/Core/InputCommon/InputCommon.vcxproj.filters delete mode 100644 Source/Core/UICommon/UICommon.vcxproj delete mode 100644 Source/Core/UpdaterCommon/UpdaterCommon.vcxproj delete mode 100644 Source/Core/VideoBackends/D3D/D3D.vcxproj delete mode 100644 Source/Core/VideoBackends/D3D/D3D.vcxproj.filters delete mode 100644 Source/Core/VideoBackends/D3D12/D3D12.vcxproj delete mode 100644 Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters delete mode 100644 Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj.filters delete mode 100644 Source/Core/VideoBackends/Null/Null.vcxproj delete mode 100644 Source/Core/VideoBackends/OGL/OGL.vcxproj delete mode 100644 Source/Core/VideoBackends/OGL/OGL.vcxproj.filters delete mode 100644 Source/Core/VideoBackends/Software/Software.vcxproj delete mode 100644 Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj delete mode 100644 Source/Core/VideoCommon/VideoCommon.vcxproj delete mode 100644 Source/Core/VideoCommon/VideoCommon.vcxproj.filters diff --git a/Externals/ExternalsReferenceAll.props b/Externals/ExternalsReferenceAll.props new file mode 100644 index 0000000000..0d7de6fecd --- /dev/null +++ b/Externals/ExternalsReferenceAll.props @@ -0,0 +1,89 @@ + + + + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} + + + {41279555-f94f-4ebc-99de-af863c10c5c4} + + + {0e033be3-2e08-428e-9ae9-bc673efa12b5} + + + {8ada04d7-6db1-4da4-ab55-64fb12a0997b} + + + {1d8c51d2-ffa4-418e-b183-9f42b6a6717e} + + + {c636d9d1-82fe-42b5-9987-63b7d4836341} + + + {8ea11166-6512-44fc-b7a5-a4d1ecc81170} + + + {bb00605c-125f-4a21-b33b-7bf418322dcb} + + + {4482fd2a-ec43-3ffb-ac20-2e5c54b05ead} + + + {5bdf4b91-1491-4fb0-bc27-78e9a8e97dc3} + + + {cbc76802-c128-4b17-bf6c-23b08c313e5e} + + + {8498f2fa-5ca6-4169-9971-de5b1fe6132c} + + + {d178061b-84d3-44f9-beed-efd18d9033f0} + + + {4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb} + + + {055a775f-b4f5-4970-9240-f6cf7661f37b} + + + {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} + + + {349ee8f9-7d25-4909-aaf5-ff3fade72187} + + + {ab993f38-c31d-4897-b139-a620c42bc565} + + + {bdb6578b-0691-4e80-a46c-df21639fd3b8} + + + {31643fdb-1bb8-4965-9de7-000fc88d35ae} + + + {23114507-079a-4418-9707-cfa81a03ca99} + + + {2c0d058e-de35-4471-ad99-e68a2caf9e18} + + + {38fee76f-f347-484b-949c-b4649381cffb} + + + {93d73454-2512-424e-9cda-4bb357fe13dd} + + + {ec082900-b4d8-42e9-9663-77f02f6936ae} + + + {677ea016-1182-440c-9345-dc88d1e98c0c} + + + {ff213b23-2c26-4214-9f88-85271e557e87} + + + {1bea10f3-80ce-4bc4-9331-5769372cdf99} + + + diff --git a/Externals/curl/curl.vcxproj b/Externals/curl/curl.vcxproj index 35c0056786..9f74333f73 100644 --- a/Externals/curl/curl.vcxproj +++ b/Externals/curl/curl.vcxproj @@ -360,11 +360,6 @@ - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - diff --git a/Externals/liblzma/liblzma.vcxproj b/Externals/liblzma/liblzma.vcxproj index f5a34f1bf3..e3a24ce660 100644 --- a/Externals/liblzma/liblzma.vcxproj +++ b/Externals/liblzma/liblzma.vcxproj @@ -18,7 +18,7 @@ .;check;common;delta;lz;lzma;rangecoder;simple;tuklib;%(AdditionalIncludeDirectories) - LZMA_API_STATIC;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + LZMA_API_STATIC;HAVE_CONFIG_H;%(PreprocessorDefinitions) diff --git a/Externals/libpng/png/png.vcxproj b/Externals/libpng/png/png.vcxproj index d1d649b4e0..5a8b402064 100644 --- a/Externals/libpng/png/png.vcxproj +++ b/Externals/libpng/png/png.vcxproj @@ -44,11 +44,6 @@ - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - diff --git a/Externals/libusb/libusb_static_2013.vcxproj b/Externals/libusb/libusb-1.0.vcxproj similarity index 100% rename from Externals/libusb/libusb_static_2013.vcxproj rename to Externals/libusb/libusb-1.0.vcxproj diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index ad91ce17c5..1290f586fb 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -31,12 +31,12 @@ #include "Common/Version.h" #include "Common/WindowSystemInfo.h" -#include "Core/Analytics.h" #include "Core/Boot/Boot.h" #include "Core/BootManager.h" #include "Core/ConfigLoaders/GameConfigLoader.h" #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/DolphinAnalytics.h" #include "Core/HW/DVD/DVDInterface.h" #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj deleted file mode 100644 index 270997ef92..0000000000 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {8498f2fa-5ca6-4169-9971-de5b1fe6132c} - - - {ec082900-b4d8-42e9-9663-77f02f6936ae} - - - - - - \ No newline at end of file diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters deleted file mode 100644 index 0d9a4818ad..0000000000 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters +++ /dev/null @@ -1,64 +0,0 @@ - - - - - {25ec8f16-fc60-4a63-bc3e-ad0272fd5942} - - - - - - - - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - - - - - - - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - SoundStreams - - - - - - - - \ No newline at end of file diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj deleted file mode 100644 index e25075a60c..0000000000 --- a/Source/Core/Common/Common.vcxproj +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4} - - - - - - - - - - - - - - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - - - - - - - - - - true - - - true - - - - - - - - - - - - - - - - - - true - - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - - - - - - - - - - {bb00605c-125f-4a21-b33b-7bf418322dcb} - - - {cbc76802-c128-4b17-bf6c-23b08c313e5e} - - - {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} - - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - - - {41279555-f94f-4ebc-99de-af863c10c5c4} - - - - - - - - - diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters deleted file mode 100644 index 6656e6fd0c..0000000000 --- a/Source/Core/Common/Common.vcxproj.filters +++ /dev/null @@ -1,380 +0,0 @@ - - - - - {0336df21-7c3f-48a9-b767-9cf11d8958a6} - - - {c54973ce-5723-491c-ac23-41cea3565b05} - - - {3bcf0d33-06a7-4eb6-bf2d-bc5273f551a3} - - - {79bb235a-a0ea-42e2-af6e-532088e5e253} - - - {c1d6f1fe-5ec5-406d-84f2-ed64d733d2c3} - - - {c6eef5b2-5e78-4f8c-8a51-8a4ffb768137} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Logging - - - Logging - - - Logging - - - Crypto - - - Crypto - - - Crypto - - - - - - - - - GL - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLInterface - - - - - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - GL\GLExtensions - - - - - - GL\GLExtensions - - - - Debug - - - Debug - - - Debug - - - GL\GLInterface - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Crypto - - - Crypto - - - Crypto - - - Logging - - - - - - - Logging - - - GL - - - GL\GLExtensions - - - GL\GLInterface - - - - - - - - - Debug - - - - Debug - - - GL\GLInterface - - - - - - - - - - - - - diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj deleted file mode 100644 index 47adf0b741..0000000000 --- a/Source/Core/Core/Core.vcxproj +++ /dev/null @@ -1,745 +0,0 @@ - - - - - - {E54CF649-140E-4255-81A5-30A673C1FB36} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {54aa7840-5beb-4a0c-9452-74ba4cc7fd44} - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {41279555-f94f-4ebc-99de-af863c10c5c4} - - - {160bdc25-5626-4b0d-bdd8-2953d9777fb5} - - - {6bbd47cf-91fd-4077-b676-8b76980178a9} - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - {8ada04d7-6db1-4da4-ab55-64fb12a0997b} - - - {8ea11166-6512-44fc-b7a5-a4d1ecc81170} - - - {cbc76802-c128-4b17-bf6c-23b08c313e5e} - - - {349ee8f9-7d25-4909-aaf5-ff3fade72187} - - - {ab993f38-c31d-4897-b139-a620c42bc565} - - - {31643fdb-1bb8-4965-9de7-000fc88d35ae} - - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - - - {23114507-079a-4418-9707-cfa81a03ca99} - - - {38fee76f-f347-484b-949c-b4649381cffb} - - - {93d73454-2512-424e-9cda-4bb357fe13dd} - - - - - - \ No newline at end of file diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters deleted file mode 100644 index e1201746b2..0000000000 --- a/Source/Core/Core/Core.vcxproj.filters +++ /dev/null @@ -1,1764 +0,0 @@ - - - - - {e0d231ab-7a66-45ce-a8e4-c0225308f763} - - - {2472fb36-5473-4d49-ad2d-3699b78ab6e2} - - - {259a11eb-ca07-4b31-b849-7286dbd4550a} - - - {ed683a12-55f0-49cb-918b-c7edbcf57268} - - - {35594696-15a6-44cb-b811-04e3195eecf5} - - - {659f0a99-77cf-46a0-a7a3-95afdd99be72} - - - {c1c76a12-b4f3-4a46-84e6-e11980b2e997} - - - {256586c3-3a1b-4d7b-9f4a-2f7ffac9d23e} - - - {d060b137-c211-44eb-9cad-fc12dedbea73} - - - {ebd24590-dfdc-433e-a411-21723e4b7cb5} - - - {d6410c05-51f9-422a-83d5-f0723e34b607} - - - {523f8d77-4aa6-4762-8f27-96f02b5070b4} - - - {c67be826-2935-4d25-a213-e132fa2e63ef} - - - {c88ec388-371f-4401-851c-a32dcdc0b88b} - - - {6204f663-bbd0-4eb5-bc15-e3778d8b6091} - - - {5377680f-d667-4f1a-aa86-b616c19a5cd4} - - - {712e3a61-b818-434e-a724-ef8de1f09027} - - - {d657188a-426d-46c8-af0a-caa148c6ed1b} - - - {2832269e-5c7d-47f8-b212-afcd9145e427} - - - {9a10faaa-40c3-446c-81b6-5fc7a79d5329} - - - {7a29a81c-1fee-4e5b-bfe1-5f941837bdc9} - - - {0eecffe7-f680-4d21-a05f-2f12c8244833} - - - {9fcd7c03-c4be-477b-9c15-5f096ab9d0f6} - - - {69d8dcb1-f22b-47af-b1e4-f700b1a42e77} - - - {079f3720-45c8-4c54-8589-b7d00a8bc1ac} - - - {bc3e845a-3d01-4713-aa32-f27110838d0c} - - - {d19f1218-0e28-4f24-a4b3-33fac750a899} - - - {15452851-6ca5-4520-bbf1-d4b810317be3} - - - {d7b3050d-3dd9-4284-969c-c5ad3b3662d9} - - - {15452851-6ca5-4520-bbf1-d4b810317be2} - - - {2ef543bc-8125-4b96-9627-6d8c15a5b36a} - - - {dea96a0c-0274-4c9f-915e-97472e7f4578} - - - {9fbdb5b5-9179-4488-b0bf-75c1ccdb3a61} - - - {11385524-b10b-419b-8390-710791c53550} - - - {fa27e799-34c8-440a-9de3-6720df6022e7} - - - {2b41ab45-ba8c-45dc-92cc-9107c1fa3e36} - - - {81956f71-d9fe-454f-96a6-855195d611c4} - - - {e14b3339-dc23-46d6-845d-7206dc4f88c3} - - - {c1e2e0dc-30ac-44cd-9909-e5b594647a04} - - - {5846b261-397e-4e2a-89e3-88d22ab927c5} - - - {ab9cdd90-54d7-4f42-9248-d7903ce52cc8} - - - {f20fc3ea-846b-4629-b86c-fd7860f73ee9} - - - {165768ae-ee50-4789-8051-5c5b7023fa4b} - - - {a749993a-d2cf-46b6-9f7f-f76294e9ad02} - - - {fc3080d6-d99a-44c6-bdd4-140cec1c6bf0} - - - {3db8c364-1d72-4660-9179-86d1c46904b9} - - - {75be4669-90fe-4280-b0ea-df350f481357} - - - {7fae98ef-4b62-4701-8f08-c496bd1ce2a7} - - - {b132ac6a-a02e-429e-858b-bfbc3fdc1851} - - - {2bfd4ecc-7225-48f0-91b9-efb42aaf71bf} - - - {1fa9df3e-6741-4045-b2f6-457b4a0540a9} - - - {a3d4778e-1891-458e-9bd1-009c2f5e8ed9} - - - {f0b52c84-49f4-470a-b037-edeea5634b9e} - - - {ee6645da-3ad9-4fe7-809f-e4646d0b0ca5} - - - {68c09d7e-4f5a-435d-a0d2-7eb7a74d7054} - - - {132cd43e-84be-4939-9f0c-0e7f26794598} - - - {9e91e72c-e432-4e02-8e03-c45c2b6f6957} - - - - - - - - - - - - - - - - - - - - - - ActionReplay - - - ActionReplay - - - Boot - - - Boot - - - Boot - - - Boot - - - Boot - - - Debugger - - - Debugger - - - Debugger - - - Debugger - - - Debugger - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Jit - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - GeckoCode - - - GeckoCode - - - HLE - - - HLE - - - HLE - - - HLE - - - PowerPC - - - PowerPC - - - PowerPC\Cached Interpreter - - - PowerPC\Cached Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - HW %28Flipper/Hollywood%29\AI - Audio Interface - - - HW %28Flipper/Hollywood%29\AI - Audio Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCPad - - - HW %28Flipper/Hollywood%29\GCPad - - - HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo - - - HW %28Flipper/Hollywood%29\MI - Memory Interface - - - HW %28Flipper/Hollywood%29\PI - Processor Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\VI - Video Interface - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Real - - - HW %28Flipper/Hollywood%29\Wiimote\Real - - - HW %28Flipper/Hollywood%29\Wii IPC - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - HW %28Flipper/Hollywood%29\Wiimote - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC\JitCommon - - - PowerPC\JitCommon - - - PowerPC\JitCommon - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - HW %28Flipper/Hollywood%29\GCKeyboard - - - HW %28Flipper/Hollywood%29\GCKeyboard - - - PowerPC - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS - - - IOS - - - IOS - - - IOS\DI - - - IOS\FS - - - IOS\FS - - - IOS\FS - - - IOS\FS - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\ES - - - IOS\Network - - - IOS - - - IOS - - - IOS - - - IOS - - - IOS\Network - - - IOS\Network - - - IOS\Network - - - IOS\Network\IP - - - IOS\Network\KD - - - IOS\Network\KD - - - IOS\Network\KD - - - IOS\Network\NCD - - - IOS\Network\WD - - - IOS\SDIO - - - IOS\STM - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\WFS - - - IOS\WFS - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - PowerPC\Jit64Common - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - Config - - - Config - - - Config - - - Config - - - IOS\Network\NCD - - - Config - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Common - - - HW %28Flipper/Hollywood%29 - - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - Config - - - - - - - - - - - - - - - - - - - - - - - - - - - ActionReplay - - - ActionReplay - - - Boot - - - Boot - - - Boot - - - Boot - - - Debugger - - - Debugger - - - Debugger - - - Debugger - - - Debugger - - - Debugger - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Interpreter - - - DSPCore\Jit - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - DSPCore\Jit\x64 - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - FifoPlayer - - - GeckoCode - - - GeckoCode - - - HLE - - - HLE - - - HLE - - - HLE - - - PowerPC\Cached Interpreter - - - PowerPC\Cached Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Interpreter - - - PowerPC\Jit64 - - - HW %28Flipper/Hollywood%29\AI - Audio Interface - - - HW %28Flipper/Hollywood%29\AI - Audio Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DI - Drive Interface - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE\uCodes - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\HLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE\LLE - - - HW %28Flipper/Hollywood%29\DSP Interface + HLE - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCMemcard - - - HW %28Flipper/Hollywood%29\GCPad - - - HW %28Flipper/Hollywood%29\GCPad - - - HW %28Flipper/Hollywood%29\GP - Gather Pipe Fifo - - - HW %28Flipper/Hollywood%29\MI - Memory Interface - - - HW %28Flipper/Hollywood%29\PI - Processor Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\SI - Serial Interface - - - HW %28Flipper/Hollywood%29\VI - Video Interface - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Real - - - HW %28Flipper/Hollywood%29\Wiimote\Real - - - HW %28Flipper/Hollywood%29\Wii IPC - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - HW %28Flipper/Hollywood%29 - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - DSPCore - - - HW %28Flipper/Hollywood%29\Wiimote - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC - - - PowerPC\JitCommon - - - PowerPC\JitCommon - - - PowerPC\JitCommon - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - PowerPC\Jit64 - - - - HW %28Flipper/Hollywood%29\GCKeyboard - - - HW %28Flipper/Hollywood%29\GCKeyboard - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - PowerPC\Jit64Common - - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - PowerPC\SignatureDB - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS - - - IOS - - - IOS\DI - - - IOS\ES - - - IOS\FS - - - IOS\FS - - - IOS\FS - - - IOS\FS - - - IOS\ES - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS\Network - - - IOS\Network - - - IOS\Network - - - IOS\Network - - - IOS\Network - - - IOS\Network\IP - - - IOS\Network\KD - - - IOS\Network\KD - - - IOS\Network\KD - - - IOS\Network\NCD - - - IOS\Network\WD - - - IOS\SDIO - - - IOS\STM - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\USB - - - IOS\WFS - - - IOS\WFS - - - IOS\USB\Bluetooth - - - IOS\USB\Bluetooth - - - IOS - - - IOS - - - IOS - - - IOS - - - IOS - - - PowerPC\Jit64Common - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - ConfigLoader - - - Config - - - Config - - - Config - - - Config - - - IOS\Network\NCD - - - HW %28Flipper/Hollywood%29\Wiimote\Common - - - HW %28Flipper/Hollywood%29\Wiimote\Common - - - HW %28Flipper/Hollywood%29\Wiimote\Common - - - Config - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu\Extension - - - HW %28Flipper/Hollywood%29\Wiimote\Emu - - - HW %28Flipper/Hollywood%29\Wiimote\Common - - - - HW %28Flipper/Hollywood%29 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArm64 - - - PowerPC\JitArmCommon - - - HW %28Flipper/Hollywood%29\EXI - Expansion Interface - - - - - Config - - - - - - - - \ No newline at end of file diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj deleted file mode 100644 index 16a6a41aa0..0000000000 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - {160BDC25-5626-4B0D-BDD8-2953D9777FB5} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {055a775f-b4f5-4970-9240-f6cf7661f37b} - - - {1d8c51d2-ffa4-418e-b183-9f42b6a6717e} - - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - - - {38fee76f-f347-484b-949c-b4649381cffb} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - - {1bea10f3-80ce-4bc4-9331-5769372cdf99} - - - - - - \ No newline at end of file diff --git a/Source/Core/DiscIO/DiscIO.vcxproj.filters b/Source/Core/DiscIO/DiscIO.vcxproj.filters deleted file mode 100644 index 196120fd6a..0000000000 --- a/Source/Core/DiscIO/DiscIO.vcxproj.filters +++ /dev/null @@ -1,191 +0,0 @@ - - - - - {51cdf366-d3fe-464a-9f89-c9f1592a6f1c} - - - {3873659a-9a30-4a58-af9e-8dad7d7eb627} - - - {bd7dbc22-b233-4f82-a369-034f04133b73} - - - {0a2c0bb1-2948-4dfb-9216-77410c39a42c} - - - {cbce645c-943c-4a94-8be0-8ad529b5c825} - - - {3d2fc224-a486-4975-a617-d19f4439702b} - - - - - DiscScrubber - - - FileSystem - - - FileSystem - - - NAND - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume - - - Volume - - - Volume - - - Volume - - - Volume - - - Volume - - - Volume\Blob - - - DiscExtractor - - - NAND - - - Volume - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - - - - DiscScrubber - - - FileSystem - - - FileSystem - - - NAND - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume - - - Volume\Blob - - - Volume - - - Volume - - - Volume - - - Volume - - - Volume - - - Volume\Blob - - - DiscExtractor - - - NAND - - - Volume - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - Volume\Blob - - - - - - - \ No newline at end of file diff --git a/Source/Core/DolphinLib.ARM64.props b/Source/Core/DolphinLib.ARM64.props new file mode 100644 index 0000000000..61d9bd84b0 --- /dev/null +++ b/Source/Core/DolphinLib.ARM64.props @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props new file mode 100644 index 0000000000..9142fb1bc4 --- /dev/null +++ b/Source/Core/DolphinLib.props @@ -0,0 +1,1201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj b/Source/Core/DolphinLib.vcxproj similarity index 56% rename from Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj rename to Source/Core/DolphinLib.vcxproj index f77c12e51f..5485304bdd 100644 --- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj +++ b/Source/Core/DolphinLib.vcxproj @@ -1,9 +1,9 @@  - - + + - {DEA96CF2-F237-4A1A-B32F-C916769EFB50} + {d79392f7-06d6-4b4b-a39f-4d587c215d3a} @@ -15,22 +15,18 @@ + + + + + + + - - - - - - - - - - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} + + {41279555-f94f-4ebc-99de-af863c10c5c4} - - + \ No newline at end of file diff --git a/Source/Core/DolphinLib.vcxproj.user b/Source/Core/DolphinLib.vcxproj.user new file mode 100644 index 0000000000..966b4ffb6f --- /dev/null +++ b/Source/Core/DolphinLib.vcxproj.user @@ -0,0 +1,6 @@ + + + + true + + \ No newline at end of file diff --git a/Source/Core/DolphinLib.x64.props b/Source/Core/DolphinLib.x64.props new file mode 100644 index 0000000000..3cdddfb028 --- /dev/null +++ b/Source/Core/DolphinLib.x64.props @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj index 1acb1d5291..bee23c9944 100644 --- a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj +++ b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj @@ -24,40 +24,17 @@ - - {e54cf649-140e-4255-81a5-30a673c1fb36} + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - {604c8368-f34a-4d55-82c8-cc92a0c13254} + + {41279555-f94f-4ebc-99de-af863c10c5c4} - - {96020103-4ba5-4fd2-b4aa-5b6d24492d4e} - - - {570215b7-e32f-4438-95ae-c8d955f9fca3} - - - {53a5391b-737e-49a8-bc8f-312ada00736f} - - - {ec1a314c-5588-4506-9c1e-2e58e5817f75} - - - {a4c423aa-f57c-46c7-a172-d1a777017d29} - - - {29f29a19-f141-45ad-9679-5a2923b49da3} - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - {c636d9d1-82fe-42b5-9987-63b7d4836341} - - - {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} + + {0e033be3-2e08-428e-9ae9-bc673efa12b5} + diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index 187b500e4c..3a21497eef 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -358,73 +358,17 @@ - - {54aa7840-5beb-4a0c-9452-74ba4cc7fd44} - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} {41279555-f94f-4ebc-99de-af863c10c5c4} - - {e54cf649-140e-4255-81a5-30a673c1fb36} - - - {160bdc25-5626-4b0d-bdd8-2953d9777fb5} - - - {6bbd47cf-91fd-4077-b676-8b76980178a9} - - - {604C8368-F34A-4D55-82C8-CC92A0C13254} - - - {96020103-4ba5-4fd2-b4aa-5b6d24492d4e} - - - {570215b7-e32f-4438-95ae-c8d955f9fca3} - - - {53A5391B-737E-49A8-BC8F-312ADA00736F} - - - {ec1a314c-5588-4506-9c1e-2e58e5817f75} - - - {a4c423aa-f57c-46c7-a172-d1a777017d29} - - - {29f29a19-f141-45ad-9679-5a2923b49da3} - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - {0e033be3-2e08-428e-9ae9-bc673efa12b5} - - {8ada04d7-6db1-4da4-ab55-64fb12a0997b} - - - {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} - - - {4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb} - - - {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} - - - {ab993f38-c31d-4897-b139-a620c42bc565} - - - {93d73454-2512-424e-9cda-4bb357fe13dd} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - + diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj deleted file mode 100644 index afa5348166..0000000000 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - {6BBD47CF-91FD-4077-B676-8B76980178A9} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - - - - diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters deleted file mode 100644 index cc652e5e51..0000000000 --- a/Source/Core/InputCommon/InputCommon.vcxproj.filters +++ /dev/null @@ -1,261 +0,0 @@ - - - - - {3a755a86-0efa-4396-bf79-bb3a1910764d} - - - {e10ce316-283c-4be0-848d-578dec2b6404} - - - {4c839215-4085-4e34-a960-7960986ad015} - - - {19ddd862-a1e3-479b-b638-bb31700c5171} - - - {e805231c-dc4e-4540-8bf8-8c567f3d00ae} - - - {ce661cb4-f23f-4ab2-952d-402d381735e5} - - - {6ca06b20-d8f6-4622-97ab-eefbc66edbd5} - - - {0289ef91-50f5-4c16-9fa4-ff4c4d8208e7} - - - {07bad1aa-7e03-4f5c-ade2-a44857c5cbc3} - - - {ff02580e-3a62-4de4-a135-3a6c2c339a90} - - - - - - - ControllerEmu - - - ControllerEmu - - - ControllerEmu\Control - - - ControllerEmu\Control - - - ControllerEmu\Control - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\Setting - - - ControllerInterface\DInput - - - ControllerInterface\DInput - - - ControllerInterface\DInput - - - ControllerInterface\XInput - - - ControllerInterface - - - ControllerInterface - - - ControllerInterface\ForceFeedback - - - ControllerInterface\DInput - - - ControllerInterface\Win32 - - - ControllerInterface\Wiimote - - - ControllerInterface - - - ControllerInterface - - - ControllerInterface - - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerInterface\DualShockUDPClient - - - - - - - - - - ControllerEmu - - - ControllerEmu - - - ControllerEmu\Control - - - ControllerEmu\Control - - - ControllerEmu\Control - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\Setting - - - ControllerInterface\DInput - - - ControllerInterface\DInput - - - ControllerInterface\DInput - - - ControllerInterface\XInput - - - ControllerInterface - - - ControllerInterface - - - ControllerInterface\ForceFeedback - - - ControllerInterface\DInput - - - ControllerInterface\DInput - - - ControllerInterface\Win32 - - - ControllerInterface\Wiimote - - - ControllerInterface - - - ControllerInterface - - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - ControllerEmu\ControlGroup - - - - ControllerInterface\DualShockUDPClient - - - ControllerInterface\DualShockUDPClient - - - - - - - - diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj deleted file mode 100644 index f39896f4a1..0000000000 --- a/Source/Core/UICommon/UICommon.vcxproj +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - {604C8368-F34A-4D55-82C8-CC92A0C13254} - - - - - - - - - - - - - - - - - {E54CF649-140E-4255-81A5-30A673C1FB36} - - - {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} - - - {2c0d058e-de35-4471-ad99-e68a2caf9e18} - - - {38fee76f-f347-484b-949c-b4649381cffb} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {C636D9D1-82FE-42B5-9987-63B7D4836341} - - - - - - \ No newline at end of file diff --git a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj b/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj deleted file mode 100644 index e707486a3d..0000000000 --- a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - {B001D13E-7EAB-4689-842D-801E5ACFFAC5} - - - - - - - - - - - - - - - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {c636d9d1-82fe-42b5-9987-63b7d4836341} - - - {bb00605c-125f-4a21-b33b-7bf418322dcb} - - - {5bdf4b91-1491-4fb0-bc27-78e9a8e97dc3} - - - {bdb6578b-0691-4e80-a46c-df21639fd3b8} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj deleted file mode 100644 index 79b0cf086f..0000000000 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {dea96cf2-f237-4a1a-b32f-c916769efb50} - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters deleted file mode 100644 index f3838e16b1..0000000000 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters +++ /dev/null @@ -1,80 +0,0 @@ - - - - - {ae700f7e-33c8-45b5-b7ee-a0ded3630549} - - - {3683d29b-19f6-4e7a-803f-4ac70b1d49fd} - - - - - D3D - - - D3D - - - Render - - - Render - - - Render - - - Render - - - - Render - - - Render - - - Render - - - Render - - - Render - - - - - D3D - - - D3D - - - Render - - - Render - - - Render - - - - Render - - - Render - - - Render - - - Render - - - Render - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj deleted file mode 100644 index 8901908fba..0000000000 --- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - {570215B7-E32F-4438-95AE-C8D955F9FCA3} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {dea96cf2-f237-4a1a-b32f-c916769efb50} - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - - - - diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters deleted file mode 100644 index a9533e36cf..0000000000 --- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj.filters b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj.filters deleted file mode 100644 index 9d380f07fc..0000000000 --- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/Null/Null.vcxproj b/Source/Core/VideoBackends/Null/Null.vcxproj deleted file mode 100644 index 965d57a6c5..0000000000 --- a/Source/Core/VideoBackends/Null/Null.vcxproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - {53A5391B-737E-49A8-BC8F-312ADA00736F} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj deleted file mode 100644 index 991d3b7bcc..0000000000 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - {EC1A314C-5588-4506-9C1E-2E58E5817F75} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters deleted file mode 100644 index 5e0e52e16d..0000000000 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters +++ /dev/null @@ -1,85 +0,0 @@ - - - - - {f29f8e7f-21ba-49da-8044-e5279a091c8f} - - - {5bfec41c-1031-4925-8f98-38c7b49b1924} - - - {696df73b-378e-4399-8f21-999b65d78dcd} - - - - - Decoder - - - Decoder - - - Render - - - Render - - - Render - - - Render - - - Render - - - - - Render - - - Render - - - Render - - - - - Decoder - - - Render - - - Render - - - Render - - - Render - - - Render - - - - - GLUtil - - - Render - - - Render - - - Render - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/Software/Software.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj deleted file mode 100644 index 68c9e2132e..0000000000 --- a/Source/Core/VideoBackends/Software/Software.vcxproj +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - {A4C423AA-F57C-46C7-A172-D1A777017D29} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj deleted file mode 100644 index 8ea2daa54c..0000000000 --- a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - {29F29A19-F141-45AD-9679-5A2923B49DA3} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} - - - {d178061b-84d3-44f9-beed-efd18d9033f0} - - - - - - - - - \ No newline at end of file diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj deleted file mode 100644 index ecfc6b2def..0000000000 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3} - - - - - - - - - - - - - - HAS_OPENGL;%(PreprocessorDefinitions) - - - - - HAS_VULKAN;%(PreprocessorDefinitions) - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - true - - - - true - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb} - - - {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} - - - {677EA016-1182-440C-9345-DC88D1E98C0C} - - - {ff213b23-2c26-4214-9f88-85271e557e87} - - - - - - diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters deleted file mode 100644 index 96d76b5646..0000000000 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ /dev/null @@ -1,408 +0,0 @@ - - - - - {23908fac-d3fd-4fa5-a9b4-87b3bafc7bd9} - - - {2baa29c2-a528-4981-abcb-e0842c311f63} - - - {6a88e4a0-754c-43df-98e6-405c99cd2ca7} - - - {7ce5076f-4e85-4f4d-b3f0-8c88267b8b2d} - - - {8c17624b-2ccb-4ee4-9ec0-593f8f3d1dd2} - - - {8edd4982-cce6-406e-9029-f7a6449311b1} - - - {cefc166b-1f5e-4e96-863d-1448e14c0741} - - - - - - - - - - Base - - - Base - - - Base - - - Base - - - Base - - - Decoding - - - Decoding - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Shader Managers - - - Shader Managers - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Decoding - - - Decoding - - - Util - - - Util - - - Shader Generators - - - Shader Managers - - - Shader Generators - - - Util - - - Base - - - Base - - - Shader Generators - - - Util - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Base - - - Base - - - Shader Generators - - - Shader Generators - - - Base - - - Util - - - Util - - - Decoding - - - Vertex Loading - - - - - - - - - - - - Base - - - Base - - - Base - - - Base - - - Base - - - Decoding - - - Decoding - - - Decoding - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Register Sections - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Shader Managers - - - Shader Managers - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Util - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Vertex Loading - - - Util - - - Util - - - Shader Generators - - - Shader Managers - - - Util - - - Base - - - Base - - - Util - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Base - - - Base - - - Base - - - Base - - - Shader Generators - - - Shader Generators - - - Shader Generators - - - Base - - - Shader Generators - - - Util - - - Util - - - Vertex Loading - - - - - - diff --git a/Source/Core/WinUpdater/WinUpdater.vcxproj b/Source/Core/WinUpdater/WinUpdater.vcxproj index 772239e360..b550b5f107 100644 --- a/Source/Core/WinUpdater/WinUpdater.vcxproj +++ b/Source/Core/WinUpdater/WinUpdater.vcxproj @@ -24,14 +24,27 @@ - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - {B001D13E-7EAB-4689-842D-801E5ACFFAC5} + + {c636d9d1-82fe-42b5-9987-63b7d4836341} + + + {bb00605c-125f-4a21-b33b-7bf418322dcb} + + + {5bdf4b91-1491-4fb0-bc27-78e9a8e97dc3} + + + {bdb6578b-0691-4e80-a46c-df21639fd3b8} + + + {ff213b23-2c26-4214-9f88-85271e557e87} + diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj index 2256a856aa..59c5f2bc3d 100644 --- a/Source/DSPTool/DSPTool.vcxproj +++ b/Source/DSPTool/DSPTool.vcxproj @@ -35,11 +35,8 @@ - - {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} - - - {e54cf649-140e-4255-81a5-30a673c1fb36} + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj index d828e23389..f758af5bed 100644 --- a/Source/UnitTests/UnitTests.vcxproj +++ b/Source/UnitTests/UnitTests.vcxproj @@ -82,31 +82,14 @@ - - {E54CF649-140E-4255-81A5-30A673C1FB36} + + {D79392F7-06D6-4B4B-A39F-4D587C215D3A} - - {604c8368-f34a-4d55-82c8-cc92a0c13254} - - - {96020103-4ba5-4fd2-b4aa-5b6d24492d4e} - - - {570215b7-e32f-4438-95ae-c8d955f9fca3} - - - {53A5391B-737E-49A8-BC8F-312ADA00736F} - - - {ec1a314c-5588-4506-9c1e-2e58e5817f75} - - - {a4c423aa-f57c-46c7-a172-d1a777017d29} - - - {29F29A19-F141-45AD-9679-5A2923B49DA3} + + {0e033be3-2e08-428e-9ae9-bc673efa12b5} + diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index 4502479713..0f31f47801 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -5,19 +5,15 @@ VisualStudioVersion = 16.0.29519.181 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinQt\DolphinQt.vcxproj", "{FA3FA62B-6F58-4B86-9453-4D149940A066}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{E54CF649-140E-4255-81A5-30A673C1FB36}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinNoGUI", "Core\DolphinNoGUI\DolphinNoGUI.vcxproj", "{974E563D-23F8-4E8F-9083-F62876B04E08}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.vcxproj", "{1970D175-3DE8-4738-942A-4D98D1CDBF64}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{474661E7-C73A-43A6-AFEE-EE1EC433D49E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcxproj", "{160BDC25-5626-4B0D-BDD8-2953D9777FB5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinLib", "Core\DolphinLib.vcxproj", "{D79392F7-06D6-4B4B-A39F-4D587C215D3A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcxproj", "{6BBD47CF-91FD-4077-B676-8B76980178A9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UICommon", "Core\UICommon\UICommon.vcxproj", "{604C8368-F34A-4D55-82C8-CC92A0C13254}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcxproj", "{3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinUpdater", "Core\WinUpdater\WinUpdater.vcxproj", "{E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Externals", "Externals", "{87ADDFF9-5768-4DA2-A33B-2477593D6677}" EndProject @@ -25,8 +21,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bochs_disasm", "..\External EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Languages", "..\Languages\Languages.vcxproj", "{0E033BE3-2E08-428E-9AE9-BC673EFA12B5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dolphin Core", "Dolphin Core", "{15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO.vcxproj", "{AB993F38-C31D-4897-B139-A620C42BC565}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniupnpc", "..\Externals\miniupnpc\miniupnpc.vcxproj", "{31643FDB-1BB8-4965-9DE7-000FC88D35AE}" @@ -45,26 +39,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SC EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2010\SFML_Network.vcxproj", "{93D73454-2512-424E-9CDA-4BB357FE13DD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0", "..\Externals\libusb\libusb_static_2013.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.vcxproj", "{1970D175-3DE8-4738-942A-4D98D1CDBF64}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D", "Core\VideoBackends\D3D\D3D.vcxproj", "{96020103-4BA5-4FD2-B4AA-5B6D24492D4E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGL", "Core\VideoBackends\OGL\OGL.vcxproj", "{EC1A314C-5588-4506-9C1E-2E58E5817F75}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Software", "Core\VideoBackends\Software\Software.vcxproj", "{A4C423AA-F57C-46C7-A172-D1A777017D29}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Null", "Core\VideoBackends\Null\Null.vcxproj", "{53A5391B-737E-49A8-BC8F-312ADA00736F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Vulkan", "Core\VideoBackends\Vulkan\Vulkan.vcxproj", "{29F29A19-F141-45AD-9679-5A2923B49DA3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Video Backends", "Video Backends", "{AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0", "..\Externals\libusb\libusb-1.0.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pch", "PCH\pch.vcxproj", "{76563A7F-1011-4EAD-B667-7BB18D09568E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{474661E7-C73A-43A6-AFEE-EE1EC433D49E}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enet", "..\Externals\enet\enet.vcxproj", "{CBC76802-C128-4B17-BF6C-23B08C313E5E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curl", "..\Externals\curl\curl.vcxproj", "{BB00605C-125F-4A21-B33B-7BF418322DCB}" @@ -79,9 +57,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml", "..\Externals\pug EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "picojson", "..\Externals\picojson\picojson.vcxproj", "{2C0D058E-DE35-4471-AD99-E68A2CAF9E18}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ed25519", "..\externals\ed25519\ed25519.vcxproj", "{5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinUpdater", "Core\WinUpdater\WinUpdater.vcxproj", "{E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ed25519", "..\Externals\ed25519\ed25519.vcxproj", "{5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSurround", "..\Externals\FreeSurround\FreeSurround.vcxproj", "{8498F2FA-5CA6-4169-9971-DE5B1FE6132C}" EndProject @@ -91,14 +67,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "..\Externals\min EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imgui", "..\Externals\imgui\imgui.vcxproj", "{4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdaterCommon", "Core\UpdaterCommon\UpdaterCommon.vcxproj", "{B001D13E-7EAB-4689-842D-801E5ACFFAC5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12", "Core\VideoBackends\D3D12\D3D12.vcxproj", "{570215B7-E32F-4438-95AE-C8D955F9FCA3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3DCommon", "Core\VideoBackends\D3DCommon\D3DCommon.vcxproj", "{DEA96CF2-F237-4A1A-B32F-C916769EFB50}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinNoGUI", "Core\DolphinNoGUI\DolphinNoGUI.vcxproj", "{974E563D-23F8-4E8F-9083-F62876B04E08}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\Externals\bzip2\bzip2.vcxproj", "{1D8C51D2-FFA4-418E-B183-9F42B6A6717E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzma", "..\Externals\liblzma\liblzma.vcxproj", "{055A775F-B4F5-4970-9240-F6CF7661F37B}" @@ -121,62 +89,42 @@ Global {FA3FA62B-6F58-4B86-9453-4D149940A066}.Release|ARM64.Build.0 = Release|ARM64 {FA3FA62B-6F58-4B86-9453-4D149940A066}.Release|x64.ActiveCfg = Release|x64 {FA3FA62B-6F58-4B86-9453-4D149940A066}.Release|x64.Build.0 = Release|x64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Debug|ARM64.Build.0 = Debug|ARM64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Debug|x64.ActiveCfg = Debug|x64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Debug|x64.Build.0 = Debug|x64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Release|ARM64.ActiveCfg = Release|ARM64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Release|ARM64.Build.0 = Release|ARM64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Release|x64.ActiveCfg = Release|x64 - {E54CF649-140E-4255-81A5-30A673C1FB36}.Release|x64.Build.0 = Release|x64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Debug|ARM64.Build.0 = Debug|ARM64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Debug|x64.ActiveCfg = Debug|x64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Debug|x64.Build.0 = Debug|x64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Release|ARM64.ActiveCfg = Release|ARM64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Release|ARM64.Build.0 = Release|ARM64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Release|x64.ActiveCfg = Release|x64 - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}.Release|x64.Build.0 = Release|x64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Debug|ARM64.Build.0 = Debug|ARM64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Debug|x64.ActiveCfg = Debug|x64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Debug|x64.Build.0 = Debug|x64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Release|ARM64.ActiveCfg = Release|ARM64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Release|ARM64.Build.0 = Release|ARM64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Release|x64.ActiveCfg = Release|x64 - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}.Release|x64.Build.0 = Release|x64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Debug|ARM64.Build.0 = Debug|ARM64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Debug|x64.ActiveCfg = Debug|x64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Debug|x64.Build.0 = Debug|x64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Release|ARM64.ActiveCfg = Release|ARM64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Release|ARM64.Build.0 = Release|ARM64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Release|x64.ActiveCfg = Release|x64 - {160BDC25-5626-4B0D-BDD8-2953D9777FB5}.Release|x64.Build.0 = Release|x64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Debug|ARM64.Build.0 = Debug|ARM64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Debug|x64.ActiveCfg = Debug|x64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Debug|x64.Build.0 = Debug|x64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Release|ARM64.ActiveCfg = Release|ARM64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Release|ARM64.Build.0 = Release|ARM64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Release|x64.ActiveCfg = Release|x64 - {6BBD47CF-91FD-4077-B676-8B76980178A9}.Release|x64.Build.0 = Release|x64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Debug|ARM64.Build.0 = Debug|ARM64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Debug|x64.ActiveCfg = Debug|x64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Debug|x64.Build.0 = Debug|x64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Release|ARM64.ActiveCfg = Release|ARM64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Release|ARM64.Build.0 = Release|ARM64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Release|x64.ActiveCfg = Release|x64 - {604C8368-F34A-4D55-82C8-CC92A0C13254}.Release|x64.Build.0 = Release|x64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Debug|ARM64.Build.0 = Debug|ARM64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Debug|x64.ActiveCfg = Debug|x64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Debug|x64.Build.0 = Debug|x64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Release|ARM64.ActiveCfg = Release|ARM64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Release|ARM64.Build.0 = Release|ARM64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Release|x64.ActiveCfg = Release|x64 - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3}.Release|x64.Build.0 = Release|x64 + {974E563D-23F8-4E8F-9083-F62876B04E08}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {974E563D-23F8-4E8F-9083-F62876B04E08}.Debug|x64.ActiveCfg = Debug|x64 + {974E563D-23F8-4E8F-9083-F62876B04E08}.Release|ARM64.ActiveCfg = Release|ARM64 + {974E563D-23F8-4E8F-9083-F62876B04E08}.Release|x64.ActiveCfg = Release|x64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|ARM64.Build.0 = Debug|ARM64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.ActiveCfg = Debug|x64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.Build.0 = Debug|x64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|ARM64.ActiveCfg = Release|ARM64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|ARM64.Build.0 = Release|ARM64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.ActiveCfg = Release|x64 + {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.Build.0 = Release|x64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|ARM64.Build.0 = Debug|ARM64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|x64.ActiveCfg = Debug|x64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|x64.Build.0 = Debug|x64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|ARM64.ActiveCfg = Release|ARM64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|ARM64.Build.0 = Release|ARM64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.ActiveCfg = Release|x64 + {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.Build.0 = Release|x64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Debug|ARM64.Build.0 = Debug|ARM64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Debug|x64.ActiveCfg = Debug|x64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Debug|x64.Build.0 = Debug|x64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Release|ARM64.ActiveCfg = Release|ARM64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Release|ARM64.Build.0 = Release|ARM64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Release|x64.ActiveCfg = Release|x64 + {D79392F7-06D6-4B4B-A39F-4D587C215D3A}.Release|x64.Build.0 = Release|x64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|ARM64.Build.0 = Debug|ARM64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|x64.ActiveCfg = Debug|x64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|x64.Build.0 = Debug|x64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|ARM64.ActiveCfg = Release|ARM64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|ARM64.Build.0 = Release|ARM64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|x64.ActiveCfg = Release|x64 + {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|x64.Build.0 = Release|x64 {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}.Debug|ARM64.ActiveCfg = Debug|ARM64 {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}.Debug|ARM64.Build.0 = Debug|ARM64 {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}.Debug|x64.ActiveCfg = Debug|x64 @@ -273,50 +221,6 @@ Global {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|ARM64.Build.0 = Release|ARM64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.ActiveCfg = Release|x64 {349EE8F9-7D25-4909-AAF5-FF3FADE72187}.Release|x64.Build.0 = Release|x64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|ARM64.Build.0 = Debug|ARM64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.ActiveCfg = Debug|x64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.Build.0 = Debug|x64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|ARM64.ActiveCfg = Release|ARM64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|ARM64.Build.0 = Release|ARM64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.ActiveCfg = Release|x64 - {1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.Build.0 = Release|x64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Debug|ARM64.Build.0 = Debug|ARM64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Debug|x64.ActiveCfg = Debug|x64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Debug|x64.Build.0 = Debug|x64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Release|ARM64.ActiveCfg = Release|ARM64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Release|ARM64.Build.0 = Release|ARM64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Release|x64.ActiveCfg = Release|x64 - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E}.Release|x64.Build.0 = Release|x64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Debug|x64.ActiveCfg = Debug|x64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Debug|x64.Build.0 = Debug|x64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Release|ARM64.ActiveCfg = Release|ARM64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Release|x64.ActiveCfg = Release|x64 - {EC1A314C-5588-4506-9C1E-2E58E5817F75}.Release|x64.Build.0 = Release|x64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Debug|x64.ActiveCfg = Debug|x64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Debug|x64.Build.0 = Debug|x64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Release|ARM64.ActiveCfg = Release|ARM64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Release|x64.ActiveCfg = Release|x64 - {A4C423AA-F57C-46C7-A172-D1A777017D29}.Release|x64.Build.0 = Release|x64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Debug|ARM64.Build.0 = Debug|ARM64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Debug|x64.ActiveCfg = Debug|x64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Debug|x64.Build.0 = Debug|x64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Release|ARM64.ActiveCfg = Release|ARM64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Release|ARM64.Build.0 = Release|ARM64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Release|x64.ActiveCfg = Release|x64 - {53A5391B-737E-49A8-BC8F-312ADA00736F}.Release|x64.Build.0 = Release|x64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Debug|ARM64.Build.0 = Debug|ARM64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Debug|x64.ActiveCfg = Debug|x64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Debug|x64.Build.0 = Debug|x64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Release|ARM64.ActiveCfg = Release|ARM64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Release|ARM64.Build.0 = Release|ARM64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Release|x64.ActiveCfg = Release|x64 - {29F29A19-F141-45AD-9679-5A2923B49DA3}.Release|x64.Build.0 = Release|x64 {76563A7F-1011-4EAD-B667-7BB18D09568E}.Debug|ARM64.ActiveCfg = Debug|ARM64 {76563A7F-1011-4EAD-B667-7BB18D09568E}.Debug|ARM64.Build.0 = Debug|ARM64 {76563A7F-1011-4EAD-B667-7BB18D09568E}.Debug|x64.ActiveCfg = Debug|x64 @@ -325,14 +229,6 @@ Global {76563A7F-1011-4EAD-B667-7BB18D09568E}.Release|ARM64.Build.0 = Release|ARM64 {76563A7F-1011-4EAD-B667-7BB18D09568E}.Release|x64.ActiveCfg = Release|x64 {76563A7F-1011-4EAD-B667-7BB18D09568E}.Release|x64.Build.0 = Release|x64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|ARM64.Build.0 = Debug|ARM64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|x64.ActiveCfg = Debug|x64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Debug|x64.Build.0 = Debug|x64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|ARM64.ActiveCfg = Release|ARM64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|ARM64.Build.0 = Release|ARM64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.ActiveCfg = Release|x64 - {474661E7-C73A-43A6-AFEE-EE1EC433D49E}.Release|x64.Build.0 = Release|x64 {CBC76802-C128-4B17-BF6C-23B08C313E5E}.Debug|ARM64.ActiveCfg = Debug|ARM64 {CBC76802-C128-4B17-BF6C-23B08C313E5E}.Debug|ARM64.Build.0 = Debug|ARM64 {CBC76802-C128-4B17-BF6C-23B08C313E5E}.Debug|x64.ActiveCfg = Debug|x64 @@ -397,14 +293,6 @@ Global {5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}.Release|ARM64.Build.0 = Release|ARM64 {5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}.Release|x64.ActiveCfg = Release|x64 {5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}.Release|x64.Build.0 = Release|x64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|ARM64.Build.0 = Debug|ARM64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|x64.ActiveCfg = Debug|x64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Debug|x64.Build.0 = Debug|x64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|ARM64.ActiveCfg = Release|ARM64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|ARM64.Build.0 = Release|ARM64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|x64.ActiveCfg = Release|x64 - {E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}.Release|x64.Build.0 = Release|x64 {8498F2FA-5CA6-4169-9971-DE5B1FE6132C}.Debug|ARM64.ActiveCfg = Debug|ARM64 {8498F2FA-5CA6-4169-9971-DE5B1FE6132C}.Debug|ARM64.Build.0 = Debug|ARM64 {8498F2FA-5CA6-4169-9971-DE5B1FE6132C}.Debug|x64.ActiveCfg = Debug|x64 @@ -437,34 +325,6 @@ Global {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}.Release|ARM64.Build.0 = Release|ARM64 {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}.Release|x64.ActiveCfg = Release|x64 {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}.Release|x64.Build.0 = Release|x64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Debug|ARM64.Build.0 = Debug|ARM64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Debug|x64.ActiveCfg = Debug|x64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Debug|x64.Build.0 = Debug|x64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Release|ARM64.ActiveCfg = Release|ARM64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Release|ARM64.Build.0 = Release|ARM64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Release|x64.ActiveCfg = Release|x64 - {B001D13E-7EAB-4689-842D-801E5ACFFAC5}.Release|x64.Build.0 = Release|x64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Debug|ARM64.Build.0 = Debug|ARM64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Debug|x64.ActiveCfg = Debug|x64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Debug|x64.Build.0 = Debug|x64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Release|ARM64.ActiveCfg = Release|ARM64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Release|ARM64.Build.0 = Release|ARM64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Release|x64.ActiveCfg = Release|x64 - {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Release|x64.Build.0 = Release|x64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Debug|ARM64.Build.0 = Debug|ARM64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Debug|x64.ActiveCfg = Debug|x64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Debug|x64.Build.0 = Debug|x64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Release|ARM64.ActiveCfg = Release|ARM64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Release|ARM64.Build.0 = Release|ARM64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Release|x64.ActiveCfg = Release|x64 - {DEA96CF2-F237-4A1A-B32F-C916769EFB50}.Release|x64.Build.0 = Release|x64 - {974E563D-23F8-4E8F-9083-F62876B04E08}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {974E563D-23F8-4E8F-9083-F62876B04E08}.Debug|x64.ActiveCfg = Debug|x64 - {974E563D-23F8-4E8F-9083-F62876B04E08}.Release|ARM64.ActiveCfg = Release|ARM64 - {974E563D-23F8-4E8F-9083-F62876B04E08}.Release|x64.ActiveCfg = Release|x64 {1D8C51D2-FFA4-418E-B183-9F42B6A6717E}.Debug|ARM64.ActiveCfg = Debug|ARM64 {1D8C51D2-FFA4-418E-B183-9F42B6A6717E}.Debug|ARM64.Build.0 = Debug|ARM64 {1D8C51D2-FFA4-418E-B183-9F42B6A6717E}.Debug|x64.ActiveCfg = Debug|x64 @@ -494,13 +354,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {E54CF649-140E-4255-81A5-30A673C1FB36} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {160BDC25-5626-4B0D-BDD8-2953D9777FB5} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {6BBD47CF-91FD-4077-B676-8B76980178A9} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {604C8368-F34A-4D55-82C8-CC92A0C13254} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {AB993F38-C31D-4897-B139-A620C42BC565} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {31643FDB-1BB8-4965-9DE7-000FC88D35AE} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} @@ -511,13 +364,6 @@ Global {BDB6578B-0691-4E80-A46C-DF21639FD3B8} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {93D73454-2512-424E-9CDA-4BB357FE13DD} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {EC1A314C-5588-4506-9C1E-2E58E5817F75} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {A4C423AA-F57C-46C7-A172-D1A777017D29} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {53A5391B-737E-49A8-BC8F-312ADA00736F} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {29F29A19-F141-45AD-9679-5A2923B49DA3} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {76563A7F-1011-4EAD-B667-7BB18D09568E} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {CBC76802-C128-4B17-BF6C-23B08C313E5E} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {BB00605C-125F-4A21-B33B-7BF418322DCB} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {D178061B-84D3-44F9-BEED-EFD18D9033F0} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} @@ -530,8 +376,6 @@ Global {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {23114507-079A-4418-9707-CFA81A03CA99} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} - {570215B7-E32F-4438-95AE-C8D955F9FCA3} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {DEA96CF2-F237-4A1A-B32F-C916769EFB50} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} {1D8C51D2-FFA4-418E-B183-9F42B6A6717E} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {055A775F-B4F5-4970-9240-F6CF7661F37B} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {1BEA10F3-80CE-4BC4-9331-5769372CDF99} = {87ADDFF9-5768-4DA2-A33B-2477593D6677}