From a34b81cc01feca9fbec02bc765853f5c583cb9ad Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 8 Feb 2011 04:03:48 +0000 Subject: [PATCH] vs2010: buildfix move much of the build settings to .props files -please use them as much as possible in the future, instead of changing individual projects NOTE: to avoid left over blobs, clean your builds *before* applying these changes. TODO: add DebugFast target for projects that are lacking it. Lack of DebugFast targets cause the linker to use LTCG when we don't want it. please test for regressions which could be caused by being too happy with compiler flags :) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7109 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/Bochs_disasm/Bochs_disasm.vcxproj | 86 +++------ Externals/CLRun/clrun/CLRun.vcxproj | 70 +++----- Externals/LZO/LZO.vcxproj | 74 +++----- .../SFML/build/vc2010/SFML_Network.vcxproj | 62 ++----- Externals/SOIL/SOIL.vcxproj | 78 +++----- Externals/wxWidgets/build/msw/wx_adv.vcxproj | 130 ++++---------- Externals/wxWidgets/build/msw/wx_aui.vcxproj | 131 ++++---------- Externals/wxWidgets/build/msw/wx_base.vcxproj | 130 ++++---------- Externals/wxWidgets/build/msw/wx_core.vcxproj | 131 ++++---------- Externals/zlib/zlib.vcxproj | 78 +++----- Languages/Languages.vcxproj | 26 +-- Source/Core/AudioCommon/AudioCommon.vcxproj | 142 ++++----------- Source/Core/Common/Common.vcxproj | 134 ++++---------- Source/Core/Common/SVNRevGen.vcxproj | 27 ++- Source/Core/Common/Src/Common.h | 11 -- Source/Core/Core/Core.vcxproj | 138 ++++---------- Source/Core/Core/Src/PowerPC/PowerPC.cpp | 2 +- .../DebuggerUICommon/DebuggerUICommon.vcxproj | 108 ++++------- Source/Core/DebuggerWX/Debugger.vcxproj | 129 ++++--------- Source/Core/DiscIO/DiscIO.vcxproj | 126 ++++--------- Source/Core/DolphinWX/Dolphin.vcxproj | 170 +++++------------- Source/Core/InputCommon/InputCommon.vcxproj | 116 +++--------- Source/Core/VideoCommon/VideoCommon.vcxproj | 126 ++++--------- .../Core/VideoUICommon/VideoUICommon.vcxproj | 96 +++------- Source/Dolphin_2010.sln | 33 ++-- .../Plugin_VideoDX11/Plugin_VideoDX11.vcxproj | 128 ++++--------- .../Plugin_VideoDX9/Plugin_VideoDX9.vcxproj | 111 ++++-------- .../Plugin_VideoOGL/Plugin_VideoOGL.vcxproj | 152 ++++------------ .../Plugin_VideoSoftware.vcxproj | 90 +++------- Source/VSProps/Base.props | 24 +++ Source/VSProps/CodeGen_Debug.props | 14 ++ Source/VSProps/CodeGen_DebugFast.props | 15 ++ Source/VSProps/CodeGen_Release.props | 33 ++++ Source/VSProps/Dolphin.Win32.props | 15 ++ Source/VSProps/Dolphin.x64.props | 16 ++ Source/VSProps/PrecompiledHeader.props | 13 ++ Source/VSProps/WXWOverrides.props | 16 ++ 37 files changed, 928 insertions(+), 2053 deletions(-) create mode 100644 Source/VSProps/Base.props create mode 100644 Source/VSProps/CodeGen_Debug.props create mode 100644 Source/VSProps/CodeGen_DebugFast.props create mode 100644 Source/VSProps/CodeGen_Release.props create mode 100644 Source/VSProps/Dolphin.Win32.props create mode 100644 Source/VSProps/Dolphin.x64.props create mode 100644 Source/VSProps/PrecompiledHeader.props create mode 100644 Source/VSProps/WXWOverrides.props diff --git a/Externals/Bochs_disasm/Bochs_disasm.vcxproj b/Externals/Bochs_disasm/Bochs_disasm.vcxproj index 37e24b007c..d67bb00398 100644 --- a/Externals/Bochs_disasm/Bochs_disasm.vcxproj +++ b/Externals/Bochs_disasm/Bochs_disasm.vcxproj @@ -24,99 +24,73 @@ - StaticLibrary true + StaticLibrary Unicode - StaticLibrary true + StaticLibrary Unicode - StaticLibrary false - true + StaticLibrary Unicode + true - StaticLibrary false - true + StaticLibrary Unicode + true + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + - - Level3 - Disabled - MultiThreadedDebug - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - + true - - Level3 - Disabled - MultiThreadedDebug - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - + true - - Level3 - MaxSpeed - true - true - MultiThreaded - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - + true true @@ -124,15 +98,7 @@ - - Level3 - MaxSpeed - true - true - MultiThreaded - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - + true true diff --git a/Externals/CLRun/clrun/CLRun.vcxproj b/Externals/CLRun/clrun/CLRun.vcxproj index dc54d39746..2269724b1d 100644 --- a/Externals/CLRun/clrun/CLRun.vcxproj +++ b/Externals/CLRun/clrun/CLRun.vcxproj @@ -24,73 +24,62 @@ - StaticLibrary true + StaticLibrary Unicode - StaticLibrary true + StaticLibrary Unicode - StaticLibrary false - true + StaticLibrary Unicode + true - StaticLibrary false - true + StaticLibrary Unicode + true + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + - Level3 - Disabled ..\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug true @@ -98,10 +87,7 @@ - Level3 - Disabled ..\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug true @@ -109,13 +95,7 @@ - Level3 - MaxSpeed - true - true ..\include;%(AdditionalIncludeDirectories) - MultiThreaded - true true @@ -125,13 +105,7 @@ - Level3 - MaxSpeed - true - true ..\include;%(AdditionalIncludeDirectories) - MultiThreaded - true true diff --git a/Externals/LZO/LZO.vcxproj b/Externals/LZO/LZO.vcxproj index 772672ca0a..9da4b46d1e 100644 --- a/Externals/LZO/LZO.vcxproj +++ b/Externals/LZO/LZO.vcxproj @@ -31,88 +31,66 @@ StaticLibrary true - MultiByte + Unicode StaticLibrary false - true Unicode + true StaticLibrary false + Unicode true - MultiByte + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + - - Level3 - Disabled - MultiThreadedDebug - + true - - Level3 - Disabled - MultiThreadedDebug - + true - - Level3 - MaxSpeed - true - true - MultiThreaded - + true true @@ -120,13 +98,7 @@ - - Level3 - MaxSpeed - true - true - MultiThreaded - + true true diff --git a/Externals/SFML/build/vc2010/SFML_Network.vcxproj b/Externals/SFML/build/vc2010/SFML_Network.vcxproj index 53e5ea18ed..9e913fcae1 100644 --- a/Externals/SFML/build/vc2010/SFML_Network.vcxproj +++ b/Externals/SFML/build/vc2010/SFML_Network.vcxproj @@ -31,66 +31,55 @@ StaticLibrary true - MultiByte + Unicode StaticLibrary false - true Unicode + true StaticLibrary false + Unicode true - MultiByte + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + - Level3 - Disabled ..\..\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug true @@ -98,10 +87,7 @@ - Level3 - Disabled ..\..\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug true @@ -109,12 +95,7 @@ - Level3 - MaxSpeed - true - true ..\..\include;%(AdditionalIncludeDirectories) - MultiThreaded true @@ -124,12 +105,7 @@ - Level3 - MaxSpeed - true - true ..\..\include;%(AdditionalIncludeDirectories) - MultiThreaded true diff --git a/Externals/SOIL/SOIL.vcxproj b/Externals/SOIL/SOIL.vcxproj index 22fb4e3d7b..b0841f4363 100644 --- a/Externals/SOIL/SOIL.vcxproj +++ b/Externals/SOIL/SOIL.vcxproj @@ -31,91 +31,66 @@ StaticLibrary true - MultiByte + Unicode StaticLibrary false - true Unicode + true StaticLibrary false + Unicode true - MultiByte + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + - - Level3 - Disabled - MultiThreadedDebug - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - + true - - Level3 - Disabled - MultiThreadedDebug - _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - + true - - Level3 - MaxSpeed - true - true - MultiThreaded - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - + true true @@ -123,14 +98,7 @@ - - Level3 - MaxSpeed - true - true - MultiThreaded - _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - + true true diff --git a/Externals/wxWidgets/build/msw/wx_adv.vcxproj b/Externals/wxWidgets/build/msw/wx_adv.vcxproj index 2d081c2dd0..93ba84a54d 100644 --- a/Externals/wxWidgets/build/msw/wx_adv.vcxproj +++ b/Externals/wxWidgets/build/msw/wx_adv.vcxproj @@ -26,22 +26,20 @@ StaticLibrary - false Unicode + true StaticLibrary - false Unicode StaticLibrary - false Unicode + true StaticLibrary - false Unicode @@ -49,59 +47,48 @@ - + + + + - + + + + - + + + + - + + + + <_ProjectFileVersion>10.0.30319.1 - ..\..\lib\vc_lib\$(Platform)\ - vc_mswud\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswud\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswu\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswu\$(ProjectName)\$(Platform)\ - Disabled ..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - Use - wx/wxprec.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level4 - true - ProgramDatabase + _LIB;__WXMSW__;__WXDEBUG__;%(PreprocessorDefinitions) + + 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - + - true .\..\..\lib\vc_lib/wx_adv.bsc @@ -110,69 +97,35 @@ X64 - Disabled ..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - true - Async - EnableFastChecks - MultiThreadedDebug - true - Use - wx/wxprec.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level4 - true - ProgramDatabase + _LIB;__WXMSW__;__WXDEBUG__;%(PreprocessorDefinitions) 4267;%(DisableSpecificWarnings) + + 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - + - true .\..\..\lib\vc_lib/wx_adv.bsc - MaxSpeed - OnlyExplicitInline ..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png;%(AdditionalIncludeDirectories) - WIN32;_LIB;__WXMSW__;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - Use - wx/wxprec.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level4 - true - true + _LIB;__WXMSW__;%(PreprocessorDefinitions) + + 0x0409 - $(OutDir)$(TargetName)$(TargetExt) - true - true - true .\..\..\lib\vc_lib/wx_adv.bsc @@ -181,36 +134,15 @@ X64 - /MP %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline ..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png;%(AdditionalIncludeDirectories) - WIN32;_LIB;__WXMSW__;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - Use - wx/wxprec.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level4 - true + _LIB;__WXMSW__;%(PreprocessorDefinitions) 4267;%(DisableSpecificWarnings) - true 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - true - + - true .\..\..\lib\vc_lib/wx_adv.bsc diff --git a/Externals/wxWidgets/build/msw/wx_aui.vcxproj b/Externals/wxWidgets/build/msw/wx_aui.vcxproj index 66c06b16b9..0d8ef5b402 100644 --- a/Externals/wxWidgets/build/msw/wx_aui.vcxproj +++ b/Externals/wxWidgets/build/msw/wx_aui.vcxproj @@ -26,22 +26,20 @@ StaticLibrary - false Unicode + true StaticLibrary - false Unicode StaticLibrary - false Unicode + true StaticLibrary - false Unicode @@ -49,60 +47,48 @@ - + + + + - + + + + - + + + + - + + + + <_ProjectFileVersion>10.0.30319.1 - ..\..\lib\vc_lib\$(Platform)\ - vc_mswud\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswud\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswu\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswu\$(ProjectName)\$(Platform)\ - /EHsc %(AdditionalOptions) - Disabled ..\..\lib\vc_lib\mswd;..\..\include;..\..\src\tiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - Use - wx/wxprec.h - vc_mswd\wxprec_auilib.pch - $(IntDir) - $(IntDir) - $(IntDir)wxmsw28d_aui.pdb - Level1 - true - ProgramDatabase + _LIB;__WXMSW__;__WXDEBUG__;%(PreprocessorDefinitions) + + 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - + - true .\..\..\lib\vc_lib/wx_aui.bsc @@ -111,68 +97,34 @@ X64 - /EHsc %(AdditionalOptions) - Disabled ..\..\lib\vc_lib\mswd;..\..\include;..\..\src\tiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;%(PreprocessorDefinitions) - true - MultiThreadedDebug - true - Use - wx/wxprec.h - vc_mswd\wxprec_auilib.pch - $(IntDir) - $(IntDir) - $(IntDir)wxmsw28d_aui.pdb - Level1 - true - ProgramDatabase + _LIB;__WXMSW__;__WXDEBUG__;%(PreprocessorDefinitions) + + 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - + - true .\..\..\lib\vc_lib/wx_aui.bsc - /EHsc %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline ..\..\lib\vc_lib\msw;..\..\include;..\..\src\tiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;__WXMSW__;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - Use - wx/wxprec.h - $(IntDir)wxprec_auilib.pch - $(IntDir) - $(IntDir) - $(IntDir)wxmsw28_aui.pdb - Level1 - true - true + _LIB;__WXMSW__;%(PreprocessorDefinitions) + + 0x0409 - $(OutDir)$(TargetName)$(TargetExt) - true - true - true .\..\..\lib\vc_lib/wx_aui.bsc @@ -181,35 +133,14 @@ X64 - /EHsc /MP %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline ..\..\lib\vc_lib\msw;..\..\include;..\..\src\tiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;__WXMSW__;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - Use - wx/wxprec.h - vc_msw\wxprec_auilib.pch - $(IntDir) - $(IntDir) - $(IntDir)wxmsw28_aui.pdb - Level1 - true - true + _LIB;__WXMSW__;%(PreprocessorDefinitions) 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - true - + - true .\..\..\lib\vc_lib/wx_aui.bsc diff --git a/Externals/wxWidgets/build/msw/wx_base.vcxproj b/Externals/wxWidgets/build/msw/wx_base.vcxproj index 158aa565ab..b770997301 100644 --- a/Externals/wxWidgets/build/msw/wx_base.vcxproj +++ b/Externals/wxWidgets/build/msw/wx_base.vcxproj @@ -26,87 +26,69 @@ StaticLibrary - false Unicode StaticLibrary - false Unicode + true StaticLibrary - false Unicode StaticLibrary - false Unicode + true - + + + + - + + + + - + + + + - + + + + <_ProjectFileVersion>10.0.30319.1 - ..\..\lib\vc_lib\$(Platform)\ - vc_mswu\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswu\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswud\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswud\$(ProjectName)\$(Platform)\ - MaxSpeed - OnlyExplicitInline ..\..\Include;..\..\Include\msvc;..\..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;__WXMSW__;wxUSE_GUI=0;wxUSE_BASE=1;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - true - Async - MultiThreaded - false - true - Use - wx/wxprec.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level4 - true - true + _LIB;__WXMSW__;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + + 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - comctl32.lib - true - + - true .\..\..\lib\vc_lib/wx_base.bsc @@ -115,70 +97,30 @@ X64 - /MP %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline ..\..\Include;..\..\Include\msvc;..\..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;__WXMSW__;wxUSE_GUI=0;wxUSE_BASE=1;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - true - Async - MultiThreaded - true - true - Use - wx/wxprec.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level3 - true + _LIB;__WXMSW__;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) 4267;%(DisableSpecificWarnings) - true 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - comctl32.lib - true - + - true .\..\..\lib\vc_lib/wx_base.bsc - Disabled ..\..\Include;..\..\Include\msvc;..\..\..\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;wxUSE_GUI=0;wxUSE_BASE=1;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - Use - wx/wxprec.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level4 - true - ProgramDatabase + _LIB;__WXMSW__;__WXDEBUG__;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + + 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - comctl32.lib - + - true .\..\..\lib\vc_lib/wx_base.bsc @@ -194,28 +136,18 @@ Async EnableFastChecks MultiThreadedDebug - true Use wx/wxprec.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level4 - true ProgramDatabase 4267;%(DisableSpecificWarnings) + + 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - comctl32.lib - + - true .\..\..\lib\vc_lib/wx_base.bsc diff --git a/Externals/wxWidgets/build/msw/wx_core.vcxproj b/Externals/wxWidgets/build/msw/wx_core.vcxproj index a465674e81..71d7e0af82 100644 --- a/Externals/wxWidgets/build/msw/wx_core.vcxproj +++ b/Externals/wxWidgets/build/msw/wx_core.vcxproj @@ -26,22 +26,20 @@ StaticLibrary - false Unicode + true StaticLibrary - false Unicode StaticLibrary - false Unicode + true StaticLibrary - false Unicode @@ -49,62 +47,48 @@ - + + + + - + + + + - + + + + - + + + + <_ProjectFileVersion>10.0.30319.1 - ..\..\lib\vc_lib\$(Platform)\ - vc_mswud\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswud\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswu\$(ProjectName)\$(Platform)\ - ..\..\lib\vc_lib\$(Platform)\ - vc_mswu\$(ProjectName)\$(Platform)\ - Disabled ..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATEWIN32;_LIB;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGSWIN32;_LIB;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - Use - wx/wxprec.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level4 - true - ProgramDatabase - 4267;4310;4244;%(DisableSpecificWarnings) + _LIB;__WXMSW__;__WXDEBUG__;wxUSE_BASE=0;%(PreprocessorDefinitions) + + 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - Rpcrt4.lib - + - true .\..\..\lib\vc_lib/wx_core.bsc @@ -120,63 +104,33 @@ Async EnableFastChecks MultiThreadedDebug - true Use wx/wxprec.h $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level4 - true ProgramDatabase - 4267;4310;4244;%(DisableSpecificWarnings) + + 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - Rpcrt4.lib - + - true .\..\..\lib\vc_lib/wx_core.bsc - MaxSpeed - OnlyExplicitInline ..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png;%(AdditionalIncludeDirectories) - WIN32;_LIB;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - Use - wx/wxprec.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level4 - true - 4267;4310;4244;%(DisableSpecificWarnings) - true + _LIB;__WXMSW__;wxUSE_BASE=0;%(PreprocessorDefinitions) + + 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - Rpcrt4.lib - true - + - true .\..\..\lib\vc_lib/wx_core.bsc @@ -185,37 +139,14 @@ X64 - /MP %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline ..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png;%(AdditionalIncludeDirectories) - WIN32;_LIB;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - Use - wx/wxprec.h - $(IntDir)$(TargetName).pch - $(IntDir) - $(IntDir) - $(IntDir)vc80.pdb - Level4 - true - 4267;4310;4244;%(DisableSpecificWarnings) - true + _LIB;__WXMSW__;wxUSE_BASE=0;%(PreprocessorDefinitions) 0x0409 - - $(OutDir)$(TargetName)$(TargetExt) - true - Rpcrt4.lib - true - + - true .\..\..\lib\vc_lib/wx_core.bsc diff --git a/Externals/zlib/zlib.vcxproj b/Externals/zlib/zlib.vcxproj index cf7123a2eb..76750e434b 100644 --- a/Externals/zlib/zlib.vcxproj +++ b/Externals/zlib/zlib.vcxproj @@ -31,91 +31,66 @@ StaticLibrary true - MultiByte + Unicode StaticLibrary false - true Unicode + true StaticLibrary false + Unicode true - MultiByte + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + - - Level3 - Disabled - MultiThreadedDebug - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - + true - - Level3 - Disabled - MultiThreadedDebug - _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - + true - - Level3 - MaxSpeed - true - true - MultiThreaded - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - + true true @@ -123,14 +98,7 @@ - - Level3 - MaxSpeed - true - true - MultiThreaded - _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - + true true diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj index 5203deee8a..18abcec093 100644 --- a/Languages/Languages.vcxproj +++ b/Languages/Languages.vcxproj @@ -15,46 +15,50 @@ Languages + + Utility + NotSet + Utility NotSet - true Utility NotSet - true - + Utility NotSet - true - - - + + + + + <_ProjectFileVersion>10.0.30319.1 + ..\Binary\$(Platform)\ ..\Binary\$(Platform)\ ..\Binary\$(Platform)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - ..\Binary\$(Platform)\ - $(Platform)\$(Configuration)\ + ..\Binary\$(Platform)\ X64 + + + diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index 71b90a5629..b37cbf4ce7 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -32,210 +32,144 @@ - StaticLibrary true + StaticLibrary Unicode - StaticLibrary true - MultiByte + StaticLibrary + Unicode - StaticLibrary false - true + StaticLibrary Unicode + true StaticLibrary false - true Unicode - StaticLibrary false + StaticLibrary + Unicode true - MultiByte StaticLibrary false - true - MultiByte + Unicode + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + + + + + - Level3 - Disabled ..\Common\Src;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug true - - dsound.lib;dxerr.lib - %(AdditionalLibraryDirectories) - + - Level3 - Disabled ..\Common\Src;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug true - - dsound.lib;dxerr.lib - %(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\Common\Src;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded true true true - - dsound.lib;dxerr.lib - %(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\Common\Src;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false true true true - - dsound.lib;dxerr.lib - %(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\Common\Src;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded true true true - - dsound.lib;dxerr.lib - %(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\Common\Src;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false true true true - - dsound.lib;dxerr.lib - %(AdditionalLibraryDirectories) - + diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 4b062233f5..315583dc70 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -32,37 +32,35 @@ - StaticLibrary true + StaticLibrary MultiByte - StaticLibrary true + StaticLibrary MultiByte - StaticLibrary false - true + StaticLibrary MultiByte + true StaticLibrary false - true MultiByte - StaticLibrary false - true + StaticLibrary MultiByte + true StaticLibrary false - true MultiByte @@ -70,166 +68,108 @@ + + + + + + + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - + + + + + + - Level3 - Disabled - _SECURE_SCL=0;%(PreprocessorDefinitions) .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - stdafx.h - Use true - - Kernel32.lib;Psapi.lib;Winmm.lib - + - Level3 - Disabled - _SECURE_SCL=0;%(PreprocessorDefinitions) .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - stdafx.h - Use - MultiThreadedDebug true - - Kernel32.lib;Psapi.lib;Winmm.lib - + - Level3 - MaxSpeed - true - true - _SECURE_SCL=0;%(PreprocessorDefinitions) .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - MultiThreaded - Use - stdafx.h true true true - - Kernel32.lib;Psapi.lib;Winmm.lib - + - Level3 - MaxSpeed - true - true - DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - MultiThreaded - Use - stdafx.h - false true true true - - Kernel32.lib;Psapi.lib;Winmm.lib - + - Level3 - MaxSpeed - true - true - _SECURE_SCL=0;%(PreprocessorDefinitions) .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - stdafx.h - Use - MultiThreaded true true true - - Kernel32.lib;Psapi.lib;Winmm.lib - + - Level3 - MaxSpeed - true - true - DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) .\Src;..\..\..\Externals/CLRun/include;%(AdditionalIncludeDirectories) - stdafx.h - Use - MultiThreaded - false true true true - - Kernel32.lib;Psapi.lib;Winmm.lib - + @@ -335,4 +275,4 @@ - + \ No newline at end of file diff --git a/Source/Core/Common/SVNRevGen.vcxproj b/Source/Core/Common/SVNRevGen.vcxproj index fbe3da45d1..45d6d10368 100644 --- a/Source/Core/Common/SVNRevGen.vcxproj +++ b/Source/Core/Common/SVNRevGen.vcxproj @@ -1,16 +1,16 @@  - + Release - Win32 + x64 - cscript /nologo /E:JScript "make_svnrev.h.js" - Updating svnrev.h - dummy + cscript /nologo /E:JScript "make_svnrev.h.js" + Updating svnrev.h + dummy @@ -22,26 +22,21 @@ SVNRevGen - + Utility false - true - MultiByte + Unicode - + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - + + + Level3 MaxSpeed diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 1ebc9b7fad..a79666a683 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -89,17 +89,6 @@ private: // Since it is always around on windows #define HAVE_WX 1 -// it is VERY DANGEROUS to mix _SECURE_SCL=0 and _SECURE_SCL=1 compiled libraries. -// You will get bizarre crash bugs whenever you use STL. - namespace - { - #ifndef _SECURE_SCL - #error Please define _SECURE_SCL=0 in the project settings - #else - CompileTimeAssert<_SECURE_SCL==0> volatile EnsureNoSecureSCL; - #endif - } - // Debug definitions #if defined(_DEBUG) #include diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 3c02164ed2..475d5cedbb 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -32,37 +32,35 @@ - StaticLibrary true + StaticLibrary MultiByte - StaticLibrary true + StaticLibrary MultiByte - StaticLibrary false - true + StaticLibrary MultiByte + true StaticLibrary false - true MultiByte - StaticLibrary false - true + StaticLibrary MultiByte + true StaticLibrary false - true MultiByte @@ -70,68 +68,56 @@ + + + + + + + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + + + + + - Level3 - Disabled .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug - stdafx.h - Use true @@ -139,18 +125,11 @@ - setupapi.lib - Level3 - Disabled .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug - stdafx.h - Use true @@ -158,21 +137,11 @@ - setupapi.lib - Level3 - MaxSpeed - true - true .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false - stdafx.h - Use true @@ -182,22 +151,11 @@ - setupapi.lib - Level3 - MaxSpeed - true - true .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false - stdafx.h - Use - false true @@ -207,21 +165,11 @@ - setupapi.lib - Level3 - MaxSpeed - true - true .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false - stdafx.h - Use true @@ -231,22 +179,11 @@ - setupapi.lib - Level3 - MaxSpeed - true - true .\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false - stdafx.h - Use - false true @@ -256,7 +193,6 @@ - setupapi.lib @@ -639,4 +575,4 @@ - + \ No newline at end of file diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index b339edf97d..1cea48f6e1 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -183,7 +183,7 @@ void Init(int cpu_core) if (cpu_core_base != interpreter) { - jit = dynamic_cast(cpu_core_base); + jit = static_cast(cpu_core_base); jit->Init(); mode = MODE_JIT; } diff --git a/Source/Core/DebuggerUICommon/DebuggerUICommon.vcxproj b/Source/Core/DebuggerUICommon/DebuggerUICommon.vcxproj index bd5825b825..75c8f6e30b 100644 --- a/Source/Core/DebuggerUICommon/DebuggerUICommon.vcxproj +++ b/Source/Core/DebuggerUICommon/DebuggerUICommon.vcxproj @@ -32,37 +32,35 @@ - StaticLibrary true + StaticLibrary Unicode - StaticLibrary true + StaticLibrary Unicode - StaticLibrary false - true + StaticLibrary Unicode + true StaticLibrary false - true Unicode - StaticLibrary false - true + StaticLibrary Unicode + true StaticLibrary false - true Unicode @@ -70,66 +68,50 @@ + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + + + + + - Level3 - Disabled - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug true @@ -137,11 +119,7 @@ - Level3 - Disabled - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - MultiThreadedDebug true @@ -149,13 +127,7 @@ - Level3 - MaxSpeed - true - true - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - MultiThreaded true @@ -165,14 +137,7 @@ - Level3 - MaxSpeed - true - true - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - MultiThreaded - false true @@ -182,13 +147,7 @@ - Level3 - MaxSpeed - true - true - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - MultiThreaded true @@ -198,14 +157,7 @@ - Level3 - MaxSpeed - true - true - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\Common\Src;..\Core\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - MultiThreaded - false true diff --git a/Source/Core/DebuggerWX/Debugger.vcxproj b/Source/Core/DebuggerWX/Debugger.vcxproj index 8ae2843ab9..6943561869 100644 --- a/Source/Core/DebuggerWX/Debugger.vcxproj +++ b/Source/Core/DebuggerWX/Debugger.vcxproj @@ -112,37 +112,35 @@ - StaticLibrary true + StaticLibrary Unicode - StaticLibrary true + StaticLibrary Unicode - StaticLibrary false - true + StaticLibrary Unicode + true StaticLibrary false - true Unicode - StaticLibrary false - true + StaticLibrary Unicode + true StaticLibrary false - true Unicode @@ -150,68 +148,56 @@ + + + + + + + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + + + + + - Level3 - Disabled ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreadedDebug - Use - stdafx.h true @@ -219,13 +205,7 @@ - Level3 - Disabled ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreadedDebug - Use - stdafx.h true @@ -233,15 +213,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - Use - stdafx.h true @@ -251,16 +223,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - Use - stdafx.h - false true @@ -270,16 +233,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - Use - stdafx.h - StdAfx.h true @@ -289,16 +243,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\Core\Src;..\DebuggerUICommon\Src;..\VideoCommon\Src;..\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\Bochs_disasm;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - Use - stdafx.h - false true @@ -309,4 +254,4 @@ - + \ No newline at end of file diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj index 6703618743..8c1f684213 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ b/Source/Core/DiscIO/DiscIO.vcxproj @@ -32,37 +32,35 @@ - StaticLibrary true + StaticLibrary MultiByte - StaticLibrary true + StaticLibrary MultiByte - StaticLibrary false - true + StaticLibrary MultiByte + true StaticLibrary false - true MultiByte - StaticLibrary false - true + StaticLibrary MultiByte + true StaticLibrary false - true MultiByte @@ -70,68 +68,56 @@ + + + + + + + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + + + + + - Level3 - Disabled ..\Common\Src;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreadedDebug - stdafx.h - Use true @@ -139,13 +125,7 @@ - Level3 - Disabled ..\Common\Src;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreadedDebug - stdafx.h - Use true @@ -153,15 +133,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use true @@ -171,16 +143,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - false true @@ -190,15 +153,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use true @@ -208,16 +163,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - false true diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index e03392a709..12774db94d 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -44,25 +44,23 @@ Application false - true Unicode + true Application false - true Unicode Application false - true Unicode + true Application false - true Unicode @@ -70,80 +68,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - ..\..\..\Binary\$(PlatformName)\ - - - ..\..\..\Binary\$(PlatformName)\ - - - $(PlatformName)\$(Configuration)\ $(ProjectName)D - $(PlatformName)\$(Configuration)\ $(ProjectName)D - - ..\..\..\Binary\$(PlatformName)\ - + + + + + - ..\..\..\Binary\$(PlatformName)\ - - - ..\..\..\Binary\$(PlatformName)\ - - - ..\..\..\Binary\$(PlatformName)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ $(ProjectName)DF - - $(PlatformName)\$(Configuration)\ - + - $(PlatformName)\$(Configuration)\ $(ProjectName)DF - Level3 - Disabled ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreadedDebug - stdafx.h - Use - - true - Iphlpapi.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - 0x00400000 - + xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls @@ -155,21 +145,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - Level3 - Disabled ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreadedDebug - stdafx.h - Use - - true - Iphlpapi.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - 0x00400000 - + xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls @@ -181,25 +159,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - Level3 - MaxSpeed - true - true ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - - true - true - true - Iphlpapi.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - 0x00400000 - + xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls @@ -211,27 +173,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - Level3 - MaxSpeed - true - true ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - false - - true - true - true - Iphlpapi.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - 0x00400000 - Default - + xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls @@ -243,25 +187,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - Level3 - MaxSpeed - true - true ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - - true - true - true - Iphlpapi.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - 0x00400000 - + xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls @@ -273,27 +201,9 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / - Level3 - MaxSpeed - true - true ..\Common\Src;..\AudioCommon\Src;..\Core\Src;..\DebuggerWX\Src;..\DebuggerUICommon\Src;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - false - - true - true - true - Iphlpapi.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - 0x00400000 - Default - + xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index f7ee5fa3d7..80aaeaa140 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -39,191 +39,131 @@ StaticLibrary true - MultiByte + Unicode StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode StaticLibrary false + Unicode true - MultiByte StaticLibrary false - true - MultiByte + Unicode + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(PlatformName)\$(Configuration)\ - + + + + + + - Level3 - Disabled ..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug true - - xinput.lib - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - + - Level3 - Disabled ..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug true - - xinput.lib - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded true true true - - xinput.lib - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false true true true - - xinput.lib - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded true true true - - xinput.lib - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\Common\Src;..\..\..\Externals\SDL\Include_1.2;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false true true true - - xinput.lib - ..\..\..\Externals\SDL\$(PlatformName);%(AdditionalLibraryDirectories) - + diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index e4bc517e90..04c082c1f2 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -44,25 +44,23 @@ StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode @@ -70,166 +68,108 @@ + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + + + + + - Level3 - Disabled ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug true - - Vfw32.lib - + - Level3 - Disabled ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug true - - Vfw32.lib - + - Level3 - MaxSpeed - true - true ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded true true true - - Vfw32.lib - + - Level3 - MaxSpeed - true - true ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false true true true - - Vfw32.lib - + - Level3 - MaxSpeed - true - true ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded true true true - - Vfw32.lib - + - Level3 - MaxSpeed - true - true ..\Common\Src;..\Core\Src;..\..\..\Externals\SOIL;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false true true true - - Vfw32.lib - + @@ -356,4 +296,4 @@ - + \ No newline at end of file diff --git a/Source/Core/VideoUICommon/VideoUICommon.vcxproj b/Source/Core/VideoUICommon/VideoUICommon.vcxproj index 1515c334cd..ea09cb81c3 100644 --- a/Source/Core/VideoUICommon/VideoUICommon.vcxproj +++ b/Source/Core/VideoUICommon/VideoUICommon.vcxproj @@ -44,25 +44,23 @@ StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode @@ -70,66 +68,52 @@ + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - + $(PlatformName)\$(Configuration)\ - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + + + - Level3 - Disabled ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug true @@ -137,11 +121,7 @@ - Level3 - Disabled ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug true @@ -149,13 +129,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded true @@ -165,14 +139,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false true @@ -182,13 +149,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded true @@ -198,14 +159,7 @@ - Level3 - MaxSpeed - true - true ..\Common\Src;..\VideoCommon\Src;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - false true diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln index 0902b296b9..608a57cedb 100644 --- a/Source/Dolphin_2010.sln +++ b/Source/Dolphin_2010.sln @@ -48,21 +48,26 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAdv28", "..\Externals\wxWidgets\build\msw\wx_adv.vcxproj", "{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}" ProjectSection(ProjectDependencies) = postProject {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAui", "..\Externals\wxWidgets\build\msw\wx_aui.vcxproj", "{05C75041-D67D-4903-A362-8395A7B35C75}" ProjectSection(ProjectDependencies) = postProject {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} + {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "..\Externals\wxWidgets\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}" ProjectSection(ProjectDependencies) = postProject {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore28", "..\Externals\wxWidgets\build\msw\wx_core.vcxproj", "{11F55366-12EC-4C44-A8CB-1D4E315D61ED}" ProjectSection(ProjectDependencies) = postProject {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoUICommon", "Core\VideoUICommon\VideoUICommon.vcxproj", "{281F6001-D032-4C3B-87AF-0B00962B4006}" @@ -98,8 +103,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DebuggerUICommon", "Core\De EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Debugger", "Core\DebuggerWX\Debugger.vcxproj", "{518F8625-9BFD-402F-AACB-01CE9A1CED8A}" ProjectSection(ProjectDependencies) = postProject + {8C60E805-0DA5-4E25-8F84-038DB504BB0D} = {8C60E805-0DA5-4E25-8F84-038DB504BB0D} {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} = {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + {C5A30052-1FC7-4A30-B4A2-6B06DA298AB3} = {C5A30052-1FC7-4A30-B4A2-6B06DA298AB3} + {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{8C60E805-0DA5-4E25-8F84-038DB504BB0D}" @@ -122,6 +130,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscI ProjectSection(ProjectDependencies) = postProject {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} + {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX9", "Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcxproj", "{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}" @@ -197,18 +206,18 @@ Global {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|Win32.Build.0 = Release|Win32 {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.ActiveCfg = Release|x64 {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.Build.0 = Release|x64 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.ActiveCfg = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.Build.0 = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.ActiveCfg = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.Build.0 = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|Win32 - {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|Win32 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.ActiveCfg = Debug|Win32 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.Build.0 = Debug|Win32 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj index 89e30bae04..2f133daada 100644 --- a/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj +++ b/Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj @@ -45,25 +45,23 @@ StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode @@ -71,72 +69,60 @@ + + + + + + + + + + + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)D - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)D - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)DF - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)DF - + + + + + + + + + + + + - Level3 - Disabled ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug - stdafx.h - Use true @@ -146,13 +132,7 @@ - Level3 - Disabled ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug - stdafx.h - Use true @@ -162,15 +142,7 @@ - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use true @@ -182,16 +154,7 @@ - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - false true @@ -203,15 +166,7 @@ - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use true @@ -223,16 +178,7 @@ - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - false true @@ -295,4 +241,4 @@ - + \ No newline at end of file diff --git a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj index 8b5ec87fa1..8866fcb095 100644 --- a/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj +++ b/Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj @@ -45,25 +45,23 @@ StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode @@ -71,66 +69,59 @@ + + + + + + + + + + + + + + + + + + $(PlatformName)\$(Configuration)\ - - $(PlatformName)\$(Configuration)\ - + - $(PlatformName)\$(Configuration)\ $(ProjectName)D - - $(PlatformName)\$(Configuration)\ - $(ProjectName)D - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)DF - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)DF - + + + + + + + + + - Level3 Disabled ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -145,13 +136,7 @@ - Level3 - Disabled ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug - stdafx.h - Use true @@ -160,15 +145,7 @@ - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use true @@ -179,16 +156,7 @@ - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - false true @@ -199,15 +167,7 @@ - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use true @@ -218,16 +178,7 @@ - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;%(AdditionalIncludeDirectories) - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - false true @@ -287,4 +238,4 @@ - + \ No newline at end of file diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj index 69eb18d032..027124f48f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj @@ -45,25 +45,23 @@ StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode @@ -71,72 +69,56 @@ + + + + + + + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)D - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)D - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)DF - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)DF - + + + + + + + + + + + + - Level3 - Disabled ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug - stdafx.h - Use true @@ -144,20 +126,11 @@ ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) - - cg.lib;cgGL.lib;opengl32.lib;glew32s.lib;glu32.lib - ..\..\..\Externals\Cg;..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) - + - Level3 - Disabled ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDebug - stdafx.h - Use true @@ -165,22 +138,11 @@ ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) - - cg.lib;cgGL.lib;opengl32.lib;glew64s.lib;glu32.lib - ..\..\..\Externals\Cg64;..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use true @@ -190,23 +152,11 @@ ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) - - cg.lib;cgGL.lib;opengl32.lib;glew32s.lib;glu32.lib - ..\..\..\Externals\Cg;..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - false true @@ -216,22 +166,11 @@ ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) - - cg.lib;cgGL.lib;opengl32.lib;glew32s.lib;glu32.lib - ..\..\..\Externals\Cg;..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use true @@ -241,23 +180,11 @@ ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) - - cg.lib;cgGL.lib;opengl32.lib;glew64s.lib;glu32.lib - ..\..\..\Externals\Cg64;..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) - + - Level3 - MaxSpeed - true - true ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\GLew\include;..\..\..\Externals - DEBUGFAST;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreaded - stdafx.h - Use - false true @@ -267,10 +194,7 @@ ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) - - cg.lib;cgGL.lib;opengl32.lib;glew64s.lib;glu32.lib - ..\..\..\Externals\Cg64;..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) - + diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj index 64c067d14c..aac448d24e 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj @@ -37,66 +37,54 @@ StaticLibrary false - true Unicode + true StaticLibrary false - true Unicode + true + + + + + + + + + + + + - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)D - - - $(PlatformName)\$(Configuration)\ - $(ProjectName)D - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - - - $(PlatformName)\$(Configuration)\ - + + + + + + + + - Level3 - Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - stdafx.h - Use + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -107,13 +95,7 @@ - Level3 - Disabled - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - stdafx.h - Use + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -124,16 +106,7 @@ - Level3 - MaxSpeed - true - true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - MultiThreaded - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - stdafx.h - Use - true + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -146,16 +119,7 @@ - Level3 - MaxSpeed - true - true - ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;%(AdditionalIncludeDirectories) - MultiThreaded - _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - stdafx.h - Use - true + ..\..\Core\Common\Src;..\..\Core\Core\Src;..\..\Core\VideoCommon\Src;..\..\Core\VideoUICommon\Src;..\..\..\Externals\GLew\include;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals;%(AdditionalIncludeDirectories) true @@ -249,4 +213,4 @@ - + \ No newline at end of file diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props new file mode 100644 index 0000000000..45c71a1f3b --- /dev/null +++ b/Source/VSProps/Base.props @@ -0,0 +1,24 @@ + + + + + + $(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + + _CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + Level3 + true + 16Bytes + true + false + + + true + 0x00400000 + + + + \ No newline at end of file diff --git a/Source/VSProps/CodeGen_Debug.props b/Source/VSProps/CodeGen_Debug.props new file mode 100644 index 0000000000..13c1294872 --- /dev/null +++ b/Source/VSProps/CodeGen_Debug.props @@ -0,0 +1,14 @@ + + + + + + + + _DEBUG;_SECURE_SCL=1;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDebug + Disabled + + + + \ No newline at end of file diff --git a/Source/VSProps/CodeGen_DebugFast.props b/Source/VSProps/CodeGen_DebugFast.props new file mode 100644 index 0000000000..f62fb7b423 --- /dev/null +++ b/Source/VSProps/CodeGen_DebugFast.props @@ -0,0 +1,15 @@ + + + + + + <_PropertySheetDisplayName>CodeGen_DebugFast + + + + DEBUGFAST;_SECURE_SCL=0;%(PreprocessorDefinitions) + MultiThreaded + + + + \ No newline at end of file diff --git a/Source/VSProps/CodeGen_Release.props b/Source/VSProps/CodeGen_Release.props new file mode 100644 index 0000000000..c32567881c --- /dev/null +++ b/Source/VSProps/CodeGen_Release.props @@ -0,0 +1,33 @@ + + + + + + <_PropertySheetDisplayName>CodeGen_Release + + + + AnySuitable + true + Speed + true + true + true + true + false + MultiThreaded + false + false + true + _SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + StreamingSIMDExtensions2 + Fast + + + true + true + UseLinkTimeCodeGeneration + + + + \ No newline at end of file diff --git a/Source/VSProps/Dolphin.Win32.props b/Source/VSProps/Dolphin.Win32.props new file mode 100644 index 0000000000..b905ef7260 --- /dev/null +++ b/Source/VSProps/Dolphin.Win32.props @@ -0,0 +1,15 @@ + + + + + + ..\..\..\Binary\$(PlatformName)\ + + + + ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg + dsound.lib;dxerr.lib;iphlpapi.lib;psapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) + + + + \ No newline at end of file diff --git a/Source/VSProps/Dolphin.x64.props b/Source/VSProps/Dolphin.x64.props new file mode 100644 index 0000000000..1ba8ecdf12 --- /dev/null +++ b/Source/VSProps/Dolphin.x64.props @@ -0,0 +1,16 @@ + + + + + + <_PropertySheetDisplayName>Dolphin.x64 + ..\..\..\Binary\$(PlatformName)\ + + + + ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg64 + dsound.lib;dxerr.lib;iphlpapi.lib;psapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) + + + + \ No newline at end of file diff --git a/Source/VSProps/PrecompiledHeader.props b/Source/VSProps/PrecompiledHeader.props new file mode 100644 index 0000000000..c305a1f4c5 --- /dev/null +++ b/Source/VSProps/PrecompiledHeader.props @@ -0,0 +1,13 @@ + + + + + + + + Use + stdafx.h + + + + \ No newline at end of file diff --git a/Source/VSProps/WXWOverrides.props b/Source/VSProps/WXWOverrides.props new file mode 100644 index 0000000000..ad7c260a76 --- /dev/null +++ b/Source/VSProps/WXWOverrides.props @@ -0,0 +1,16 @@ + + + + + + $(ProjectName)$(Platform)\$(Configuration)\ + + + + + + wx/wxprec.h + + + + \ No newline at end of file