From d9a7510937cf4bc6020656ddd38880d436a65549 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 18 Mar 2012 03:30:03 -0700 Subject: [PATCH] forgot to add wxwidgets3 vcxproj to git, since it was masked by gitignore... fix up misc warnings and build errors --- .../wxWidgets3/build/msw/wx_base.vcxproj | 1687 ++++++++ .../build/msw/wx_base.vcxproj.filters | 3426 +++++++++++++++++ Languages/Languages.vcxproj | 5 - Source/Core/DolphinWX/Dolphin.vcxproj | 6 +- Source/DSPTool/DSPTool.vcxproj | 10 - Source/VSProps/WXWOverrides.props | 2 +- 6 files changed, 5117 insertions(+), 19 deletions(-) create mode 100644 Externals/wxWidgets3/build/msw/wx_base.vcxproj create mode 100644 Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj b/Externals/wxWidgets3/build/msw/wx_base.vcxproj new file mode 100644 index 0000000000..ed41c88d76 --- /dev/null +++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj @@ -0,0 +1,1687 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + DebugFast + Win32 + + + DebugFast + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + + true + true + true + true + true + true + + + + + + true + true + true + true + true + true + + + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 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 + + + 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 + + + + 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 + + + + + + + + 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 + + + + + + + + + + true + true + true + true + true + true + + + + + {01573c36-ac6e-49f6-94ba-572517eb9740} + + + {3e1339f5-9311-4122-9442-369702e8fcad} + + + + wxWidgets + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} + wxBase28 + + + + StaticLibrary + Unicode + + + StaticLibrary + Unicode + + + StaticLibrary + Unicode + + + StaticLibrary + Unicode + + + StaticLibrary + Unicode + + + StaticLibrary + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + __WXDEBUG__;%(PreprocessorDefinitions) + + + + + + + + + + __WXDEBUG__;%(PreprocessorDefinitions) + + + + + + + + + \ No newline at end of file diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters b/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters new file mode 100644 index 0000000000..7c02f384fa --- /dev/null +++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters @@ -0,0 +1,3426 @@ + + + + + {ea19c29f-6825-47dc-b54d-ee464810b353} + + + {e1077817-0cf8-4a28-b86f-34e85984db45} + + + {887bf107-6891-4a1f-a32f-5be1aafc0535} + + + {303d663d-e46a-4394-9423-5d6bd35169f9} + + + {dab87ac5-435c-4c4c-a685-966df965635c} + + + {dd338b6e-5f9c-42f6-b1c3-e4db2c484490} + + + {7a3796f6-d621-4a89-a785-d0ec354b9652} + + + {3112ece1-9900-49c2-b90d-7e9c956d3cfb} + + + {6f4ef8f1-41e1-4bd6-8940-ac03c6b9218c} + + + {c4049f2a-35bb-494f-a789-c83ed28f18f1} + + + {302035ca-b308-4626-83f9-60c08f3015c9} + + + + + Setup Headers + + + Setup Headers + + + Setup Headers + + + Setup Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW\private + + + Headers\MSW + + + Headers\MSW + + + Headers\MSW + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\Generic + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + Headers\MSW\ole + + + + + AUI + + + AUI + + + AUI + + + AUI + + + AUI + + + AUI + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Common + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + Generic + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + MSW\ole + + + + + Common + + + + + + + MSW + + + \ No newline at end of file diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj index 279bed1a3f..b10b94bfcd 100644 --- a/Languages/Languages.vcxproj +++ b/Languages/Languages.vcxproj @@ -45,19 +45,14 @@ - <_ProjectFileVersion>10.0.30319.1 ..\Binary\$(Platform)\ ..\Binary\$(Platform)\ ..\Binary\$(Platform)\ ..\Binary\$(Platform)\ - - X64 - - diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index e5c9c7a91d..27edc2e619 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -130,7 +130,7 @@ - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -158,7 +158,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) @@ -174,7 +174,7 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) + ..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj index af68266d2f..0cd03302aa 100644 --- a/Source/DSPTool/DSPTool.vcxproj +++ b/Source/DSPTool/DSPTool.vcxproj @@ -95,7 +95,6 @@ - <_ProjectFileVersion>10.0.30319.1 AllRules.ruleset @@ -137,9 +136,6 @@ - - X64 - ../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories) @@ -162,9 +158,6 @@ - - X64 - /MP %(AdditionalOptions) ../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories) @@ -188,9 +181,6 @@ - - X64 - ../Core/Core/Src;../Core/Common/Src;%(AdditionalIncludeDirectories) diff --git a/Source/VSProps/WXWOverrides.props b/Source/VSProps/WXWOverrides.props index cf6d5d6065..d979a83c43 100644 --- a/Source/VSProps/WXWOverrides.props +++ b/Source/VSProps/WXWOverrides.props @@ -12,7 +12,7 @@ wx/wxprec.h Async 4267 - _LIB;__WXMSW__;%(PreprocessorDefinitions) + _LIB;__WXMSW__;WXBUILDING;%(PreprocessorDefinitions) ..\..\;..\..\include;..\..\..\zlib;..\..\..\libpng