diff --git a/3rdparty/3rdparty.props b/3rdparty/3rdparty.props index 99145af049..6c96234540 100644 --- a/3rdparty/3rdparty.props +++ b/3rdparty/3rdparty.props @@ -2,7 +2,7 @@ <_ProjectFileVersion>10.0.30128.1 - $(SvnRootDir)\deps\$(PlatformName)\$(Configuration)\ + $(SolutionDir)deps\$(PlatformName)\$(Configuration)\ $(PlatformName)\$(Configuration)\ *.bsc;*.idb;*.sbr;*.res;*.pch;*.pdb;*.obj;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean) @@ -18,4 +18,4 @@ Default - \ No newline at end of file + diff --git a/3rdparty/libjpeg/libjpeg.vcxproj b/3rdparty/libjpeg/libjpeg.vcxproj index 3734ee1bb6..a08b5f3c24 100644 --- a/3rdparty/libjpeg/libjpeg.vcxproj +++ b/3rdparty/libjpeg/libjpeg.vcxproj @@ -5,92 +5,53 @@ Debug Win32 + + Debug + x64 + Devel Win32 + + Devel + x64 + Release Win32 + + Release + x64 + - libjpeg7 {BC236261-77E8-4567-8D09-45CD02965EB6} - libjpeg - Win32Proj - + StaticLibrary - Unicode - false $(DefaultPlatformToolset) - - - StaticLibrary Unicode - true - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - $(DefaultPlatformToolset) + true + true + false - - - - + + - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.30319.1 - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - $(ProjectName)-dev + AllRules.ruleset - - - - - - - - - - - - - - - - - - @@ -154,10 +115,7 @@ - - - - - \ No newline at end of file + + diff --git a/3rdparty/libjpeg/libjpeg.vcxproj.filters b/3rdparty/libjpeg/libjpeg.vcxproj.filters index cd675bb7ee..c940acd9b4 100644 --- a/3rdparty/libjpeg/libjpeg.vcxproj.filters +++ b/3rdparty/libjpeg/libjpeg.vcxproj.filters @@ -179,6 +179,5 @@ - \ No newline at end of file diff --git a/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj b/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj index 06ea773fa3..9ecd14607a 100644 --- a/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj +++ b/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj @@ -5,151 +5,66 @@ Debug Win32 + + Debug + x64 + Devel Win32 + + Devel + x64 + Release Win32 + + Release + x64 + - libpng {D6973076-9317-4EF2-A0B8-B7A18AC0713E} - + StaticLibrary - Unicode - false $(DefaultPlatformToolset) - - - StaticLibrary - true Unicode - $(DefaultPlatformToolset) - - - StaticLibrary - true - Unicode - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - - - - + + + + - - false - - - $(SolutionDir)\deps\$(PlatformName)\$(Configuration)\ + + AllRules.ruleset - - false - - - $(SolutionDir)\deps\$(PlatformName)\$(Configuration)\ - - - false - - $(SolutionDir)\deps\$(PlatformName)\$(Configuration)\ - - + Use - Level4 - ProgramDatabase - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - false pngpriv.h + true CompileAsC 4996;4127 - $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + $(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories) true - Disabled - - Windows - true - zlib.lib - 16 - $(OutDir) - - - - - Level4 - Use - ProgramDatabase - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - false - pngpriv.h - CompileAsC - 4996;4127 - $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) - true - Full - - - Windows - true - true - true - zlib.lib - 16 - $(OutDir) - - - - - Level4 - Use - ProgramDatabase - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - false - pngpriv.h - CompileAsC - 4996;4127 - $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) - true - Full - - - Windows - true - true - true - zlib.lib - 16 - $(OutDir) - - Create - Create - Create + Create @@ -172,6 +87,5 @@ - - - \ No newline at end of file + + diff --git a/3rdparty/opencl/opencl.vcxproj b/3rdparty/opencl/opencl.vcxproj index b8da9268d7..c827ac1222 100644 --- a/3rdparty/opencl/opencl.vcxproj +++ b/3rdparty/opencl/opencl.vcxproj @@ -20,120 +20,29 @@ {D80D4A75-C385-41BD-AE62-83D2E2B595A7} - Win32Proj - opencl - + StaticLibrary - true $(DefaultPlatformToolset) MultiByte - - - StaticLibrary - true - $(DefaultPlatformToolset) - MultiByte - - - StaticLibrary - false - $(DefaultPlatformToolset) - true - MultiByte - - - StaticLibrary - false - $(DefaultPlatformToolset) - true - MultiByte + true + true + false - - - - - - - - - - - - - - - + + + + + - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - - + + AllRules.ruleset + @@ -151,6 +60,5 @@ - - - \ No newline at end of file + + diff --git a/3rdparty/portaudio/build/msvc/portaudio.vcxproj b/3rdparty/portaudio/build/msvc/portaudio.vcxproj index 91e1214e6c..d6ef25dc02 100644 --- a/3rdparty/portaudio/build/msvc/portaudio.vcxproj +++ b/3rdparty/portaudio/build/msvc/portaudio.vcxproj @@ -17,6 +17,22 @@ Debug x64 + + Devel (NO ASIO) + Win32 + + + Devel (NO ASIO) + x64 + + + Devel + Win32 + + + Devel + x64 + Release (NO ASIO) Win32 @@ -36,432 +52,43 @@ {0A18A071-125E-442F-AFF7-A3F68ABECF99} - portaudio - portaudio - + StaticLibrary - false - $(DefaultPlatformToolset) - Unicode - - - StaticLibrary - false - true - $(DefaultPlatformToolset) - Unicode - - - StaticLibrary - false - $(DefaultPlatformToolset) - Unicode - - - StaticLibrary - false - true - $(DefaultPlatformToolset) - Unicode - - - DynamicLibrary - false - $(DefaultPlatformToolset) - Unicode - - - DynamicLibrary - false - $(DefaultPlatformToolset) - Unicode - - - DynamicLibrary - false - $(DefaultPlatformToolset) - Unicode - - - DynamicLibrary - false $(DefaultPlatformToolset) Unicode + true + true + false - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - <_ProjectFileVersion>10.0.30319.1 - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - + AllRules.ruleset - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release_x86/portaudio.tlb - - - + - OnlyExplicitInline - ..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories) - _USRDLL;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_DS=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1;PA_USE_WMME=0;PA_USE_ASIO=1;%(PreprocessorDefinitions) + ..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories) + ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_DS=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1;PA_USE_WMME=0;PA_USE_ASIO=0;%(PreprocessorDefinitions) + PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_DS=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1;PA_USE_WMME=0;PA_USE_ASIO=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_DS=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1;PA_USE_WMME=0;PA_USE_ASIO=1;%(PreprocessorDefinitions) + PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_DS=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1;PA_USE_WMME=0;PA_USE_ASIO=1;%(PreprocessorDefinitions) - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - $(Platform)\$(Configuration)\portaudio.bsc - ksuser.lib - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release_x86/portaudio.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(Platform)\$(Configuration)\portaudio.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ksuser.lib;%(AdditionalDependencies) - $(Platform)\$(Configuration)\portaudio_x64.dll - true - .\portaudio.def - $(Platform)\$(Configuration)/portaudio_x64.pdb - false - - - $(Platform)\$(Configuration)/portaudio_x64.lib - MachineX64 - - - true - $(Platform)\$(Configuration)\portaudio_x64.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug_x86/portaudio.tlb - - - - - ..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories) - _DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_DS=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1;PA_USE_WMME=0;PA_USE_ASIO=1;%(PreprocessorDefinitions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - $(Platform)\$(Configuration)\portaudio.bsc - - - false - ksuser.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug_x86/portaudio.tlb - - - - - Disabled - ..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(Platform)\$(Configuration)\portaudio.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ksuser.lib;%(AdditionalDependencies) - $(Platform)\$(Configuration)\portaudio_x64.dll - true - .\portaudio.def - true - $(Platform)\$(Configuration)/portaudio_x64.pdb - false - - - $(Platform)\$(Configuration)\portaudio_x64.lib - MachineX64 - - - true - $(Platform)\$(Configuration)/portaudio_x64.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release_x86/portaudio.tlb - - - - - OnlyExplicitInline - ..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories) - _USRDLL;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_DS=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1;PA_USE_WMME=0;PA_USE_ASIO=0;%(PreprocessorDefinitions) - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - $(Platform)\$(Configuration)\portaudio.bsc - - - ksuser.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release_x86/portaudio.tlb - - - - - MaxSpeed - OnlyExplicitInline - ..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - $(Platform)\$(Configuration)\portaudio.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ksuser.lib;%(AdditionalDependencies) - $(Platform)\$(Configuration)\portaudio_x64.dll - true - .\portaudio.def - $(Platform)\$(Configuration)/portaudio_x64.pdb - false - - - $(Platform)\$(Configuration)/portaudio_x64.lib - MachineX64 - - - true - $(Platform)\$(Configuration)\portaudio_x64.bsc - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug_x86/portaudio.tlb - - - - - ..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories) - _DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;PA_USE_DS=1;PA_USE_WASAPI=1;PA_USE_WDMKS=1;PA_USE_WMME=0;PA_USE_ASIO=0;%(PreprocessorDefinitions) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - $(Platform)\$(Configuration)\portaudio.bsc - - - ksuser.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug_x86/portaudio.tlb - - - - - Disabled - ..\..\src\common;..\..\include;.\;..\..\src\os\win;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_USRDLL;PA_ENABLE_DEBUG_OUTPUT;_CRT_SECURE_NO_DEPRECATE;PAWIN_USE_WDMKS_DEVICE_INFO;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - $(Platform)\$(Configuration)\portaudio.pch - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - Level3 - true - ProgramDatabase - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ksuser.lib;%(AdditionalDependencies) - $(Platform)\$(Configuration)\portaudio_x64.dll - true - .\portaudio.def - true - $(Platform)\$(Configuration)/portaudio_x64.pdb - false - - - $(Platform)\$(Configuration)\portaudio_x64.lib - MachineX64 - - - true - $(Platform)\$(Configuration)/portaudio_x64.bsc - - @@ -474,164 +101,28 @@ - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + true - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + true - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + true - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + true - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + true - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + true - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + true - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - true - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - ..\..\src\hostapi\asio\ASIOSDK\host;..\..\src\hostapi\asio\ASIOSDK\host\pc;..\..\src\hostapi\asio\ASIOSDK\common;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + true @@ -664,6 +155,5 @@ - - - \ No newline at end of file + + diff --git a/3rdparty/pthreads4w/build/pthreads4w.vcxproj b/3rdparty/pthreads4w/build/pthreads4w.vcxproj index cdbf472e57..15ebd11015 100644 --- a/3rdparty/pthreads4w/build/pthreads4w.vcxproj +++ b/3rdparty/pthreads4w/build/pthreads4w.vcxproj @@ -28,27 +28,31 @@ {0FAE817D-9A32-4830-857E-81DA57246E16} - pthreads4w - pthreads4w StaticLibrary $(DefaultPlatformToolset) - true - false - true + MultiByte + true + true + false + - - - - + + + + + + + AllRules.ruleset + HAVE_PTW32_CONFIG_H;PTW32_BUILD_INLINED;%(PreprocessorDefinitions) @@ -59,6 +63,10 @@ PTW32_ARCHx86;%(PreprocessorDefinitions) PTW32_ARCHx64;%(PreprocessorDefinitions) + + MachineX86 + MachineX64 + @@ -76,4 +84,5 @@ - \ No newline at end of file + + diff --git a/3rdparty/soundtouch/SoundTouch.vcxproj b/3rdparty/soundtouch/SoundTouch.vcxproj index 444fe5a411..2885aeae27 100644 --- a/3rdparty/soundtouch/SoundTouch.vcxproj +++ b/3rdparty/soundtouch/SoundTouch.vcxproj @@ -28,26 +28,30 @@ {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D} - SoundTouch - SoundTouch StaticLibrary $(DefaultPlatformToolset) - true - false - true + Unicode + true + true + false + - - - - + + + + + + + AllRules.ruleset + $(ProjectDir)soundtouch;%(AdditionalIncludeDirectories) @@ -88,4 +92,5 @@ - \ No newline at end of file + + diff --git a/3rdparty/wxwidgets3.0/build/msw/Common.props b/3rdparty/wxwidgets3.0/build/msw/Common.props index 1a786396ef..ff93641f6c 100644 --- a/3rdparty/wxwidgets3.0/build/msw/Common.props +++ b/3rdparty/wxwidgets3.0/build/msw/Common.props @@ -4,10 +4,8 @@ $(ProjectDir)..\.. - <_ProjectFileVersion>10.0.30128.1 - <_PropertySheetDisplayName>wxCommon $(PlatformName)\$(Configuration)\$(ProjectName)\ - $(SolutionDir)\deps\$(PlatformName)\$(Configuration)\ + $(SolutionDir)deps\$(PlatformName)\$(Configuration)\ @@ -19,12 +17,16 @@ Async true Default - $(ProjectRootDir)\include;$(SolutionDir)\3rdparty\libpng;$(SolutionDir)\3rdparty\libjpeg;$(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + $(ProjectRootDir)\include;$(SolutionDir)3rdparty\libpng;$(SolutionDir)3rdparty\libjpeg;$(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories) false - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) + Level4 + Use + wx/wxprec.h - $(ProjectRootDir)\include;$(SolutionDir)\3rdparty\libpng;$(SolutionDir)\3rdparty\libjpeg;$(SolutionDir)\3rdparty\zlib + $(ProjectRootDir)\include;$(SolutionDir)3rdparty\libpng;$(SolutionDir)3rdparty\libjpeg;$(SolutionDir)3rdparty\zlib + _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;WXBUILDING;%(PreprocessorDefinitions) - \ No newline at end of file + diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj index dd4114b883..e5ef38ab0e 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj @@ -27,277 +27,37 @@ - wxAdv30 {24C45343-FD20-5C92-81C1-35A2AE841E79} - + StaticLibrary - false - Unicode $(DefaultPlatformToolset) - true - - - StaticLibrary - false Unicode - $(DefaultPlatformToolset) - true - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) - true - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) - true - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - _DEBUG;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - AnySuitable - true - Speed - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - AnySuitable - true - Speed - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - Create - Create - Create - Create - Create - Create + Create @@ -347,22 +107,12 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -370,12 +120,7 @@ - true - true - true - true - true - true + true @@ -440,6 +185,5 @@ - - - \ No newline at end of file + + diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj index 4b15f43fdc..377518fb89 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj @@ -27,268 +27,34 @@ - wxBase30 {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - + StaticLibrary - false - Unicode $(DefaultPlatformToolset) - true - - - StaticLibrary - false Unicode - $(DefaultPlatformToolset) - true - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) - true - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) - true - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - + - Disabled - _DEBUG;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - _DEBUG;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - @@ -307,12 +73,7 @@ - Create - Create - Create - Create - Create - Create + Create @@ -321,18 +82,7 @@ - - - - - - - - - - - - + NotUsing @@ -428,22 +178,12 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -455,12 +195,7 @@ - true - true - true - true - true - true + true @@ -477,9 +212,7 @@ - true - true - true + true @@ -645,6 +378,5 @@ - - - \ No newline at end of file + + diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj index 3c97c4d914..b69f546de4 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_config.vcxproj @@ -27,130 +27,33 @@ - wxConfig30 {01F4CE10-2CFB-41A8-B41F-E54337868A1D} - + Utility - false - Unicode - $(DefaultPlatformToolset) - - - Utility - false - Unicode - $(DefaultPlatformToolset) - - - Utility - false - Unicode - $(DefaultPlatformToolset) - - - Utility - false - Unicode - $(DefaultPlatformToolset) - - - Utility - false - Unicode - $(DefaultPlatformToolset) - - - Utility - false Unicode $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - + + - - <_ProjectFileVersion>10.0.40219.1 - - - - - - - - - - - - Creating ..\..\include\wx\setup.h - Creating ..\..\include\wx\setup.h - copy "%(Identity)" "..\..\include\wx\setup.h" - copy "%(Identity)" "..\..\include\wx\setup.h" - ..\..\include\wx\setup.h;%(Outputs) - ..\..\include\wx\setup.h;%(Outputs) - Creating ..\..\include\wx\setup.h - Creating ..\..\include\wx\setup.h - Creating ..\..\include\wx\setup.h - Creating ..\..\include\wx\setup.h - copy "%(Identity)" "..\..\include\wx\setup.h" - copy "%(Identity)" "..\..\include\wx\setup.h" - copy "%(Identity)" "..\..\include\wx\setup.h" - copy "%(Identity)" "..\..\include\wx\setup.h" - ..\..\include\wx\setup.h;%(Outputs) - ..\..\include\wx\setup.h;%(Outputs) - ..\..\include\wx\setup.h;%(Outputs) - ..\..\include\wx\setup.h;%(Outputs) + Creating ..\..\include\wx\setup.h + copy "%(Identity)" "..\..\include\wx\setup.h" + ..\..\include\wx\setup.h;%(Outputs) - Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h - Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h - cl /EP /nologo "%(Identity)" > "..\..\$(PlatformName)\wx\msw\rcdefs.h" - cl /EP /nologo "%(Identity)" > "..\..\$(PlatformName)\wx\msw\rcdefs.h" - ..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs) - ..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs) - ..\..\$(PlatformName)\wx\msw;%(AdditionalInputs) - ..\..\$(PlatformName)\wx\msw;%(AdditionalInputs) - Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h - Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h - Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h - Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h - cl /EP /nologo "%(Identity)" > "..\..\$(PlatformName)\wx\msw\rcdefs.h" - cl /EP /nologo "%(Identity)" > "..\..\$(PlatformName)\wx\msw\rcdefs.h" - cl /EP /nologo "%(Identity)" > "..\..\$(PlatformName)\wx\msw\rcdefs.h" - cl /EP /nologo "%(Identity)" > "..\..\$(PlatformName)\wx\msw\rcdefs.h" - ..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs) - ..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs) - ..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs) - ..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs) - ..\..\$(PlatformName)\wx\msw;%(AdditionalInputs) - ..\..\$(PlatformName)\wx\msw;%(AdditionalInputs) - ..\..\$(PlatformName)\wx\msw;%(AdditionalInputs) - ..\..\$(PlatformName)\wx\msw;%(AdditionalInputs="") + Creating ..\..\$(PlatformName)\wx\msw\rcdefs.h + cl /EP /nologo "%(Identity)" > "..\..\$(PlatformName)\wx\msw\rcdefs.h" + ..\..\$(PlatformName)\wx\msw\rcdefs.h;%(Outputs) + ..\..\$(PlatformName)\wx\msw;%(AdditionalInputs) - - - \ No newline at end of file + + diff --git a/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj b/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj index 083f1c7d53..8d91d0e8a6 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj @@ -27,268 +27,34 @@ - wxCore30 {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - + StaticLibrary - false - Unicode $(DefaultPlatformToolset) - true - - - StaticLibrary - false Unicode - $(DefaultPlatformToolset) - true - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) - true - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) - true - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) - - - StaticLibrary - false - Unicode - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.40219.1 + AllRules.ruleset - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - + - Disabled - _DEBUG;wxUSE_BASE=0;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - _DEBUG;wxUSE_BASE=0;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed wxUSE_BASE=0;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - wxUSE_BASE=0;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - wxUSE_BASE=0;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - wxUSE_BASE=0;%(PreprocessorDefinitions) - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - @@ -331,12 +97,7 @@ - Create - Create - Create - Create - Create - Create + Create @@ -432,12 +193,7 @@ - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj @@ -447,66 +203,31 @@ - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj @@ -517,12 +238,7 @@ - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj @@ -534,12 +250,7 @@ - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj @@ -548,12 +259,7 @@ - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj @@ -566,30 +272,15 @@ - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj @@ -600,12 +291,7 @@ - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj @@ -618,115 +304,50 @@ - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj + $(IntDir)msw_%(Filename).obj @@ -739,12 +360,7 @@ - true - true - true - true - true - true + true @@ -753,50 +369,25 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -804,22 +395,12 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -836,12 +417,7 @@ - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj + $(IntDir)generic_%(Filename).obj @@ -851,32 +427,17 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -930,12 +491,7 @@ - true - true - true - true - true - true + true @@ -1065,143 +621,58 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -1210,54 +681,24 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -1268,12 +709,7 @@ - true - true - true - true - true - true + true @@ -1296,12 +732,7 @@ - true - true - true - true - true - true + true @@ -1331,12 +762,7 @@ - true - true - true - true - true - true + true @@ -1344,12 +770,7 @@ - true - true - true - true - true - true + true @@ -1360,12 +781,7 @@ - true - true - true - true - true - true + true @@ -1376,20 +792,10 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -1432,12 +838,7 @@ - true - true - true - true - true - true + true @@ -1458,22 +859,12 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -1487,52 +878,22 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -1544,172 +905,67 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -1734,28 +990,13 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -1769,12 +1010,7 @@ - true - true - true - true - true - true + true @@ -1807,516 +1043,196 @@ - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true - true - true - true - true - true - true + true @@ -2333,6 +1249,5 @@ - - - \ No newline at end of file + + diff --git a/3rdparty/zlib/zlib.vcxproj b/3rdparty/zlib/zlib.vcxproj index 59229f5316..14f8625ff0 100644 --- a/3rdparty/zlib/zlib.vcxproj +++ b/3rdparty/zlib/zlib.vcxproj @@ -5,85 +5,54 @@ Debug Win32 + + Debug + x64 + Devel Win32 + + Devel + x64 + Release Win32 + + Release + x64 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47} - zlib - zlib - + StaticLibrary - MultiByte - false $(DefaultPlatformToolset) - - - StaticLibrary MultiByte - true - $(DefaultPlatformToolset) - - - StaticLibrary - MultiByte - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.30319.1 - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - $(ProjectName)-dev + AllRules.ruleset - - - _CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Level3 - - - - - _CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Level3 - - - + _CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) Level3 @@ -119,6 +88,5 @@ - - - \ No newline at end of file + + diff --git a/PCSX2_suite.sln b/PCSX2_suite.sln index caa077691c..a05369aa3f 100644 --- a/PCSX2_suite.sln +++ b/PCSX2_suite.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nulls", "Nulls", "{E1828E40-2FBB-48FE-AE7F-5587755DCE0E}" EndProject @@ -37,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{2D6F0A62 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcsx2", "pcsx2\windows\VCprojects\pcsx2.vcxproj", "{1CEFD830-2B76-4596-A4EE-BCD7280A60BD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPU2-X", "plugins\spu2-x\src\Windows\Spu2-X.vcxproj", "{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Spu2-X", "plugins\spu2-x\src\Windows\Spu2-X.vcxproj", "{5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GSdx", "plugins\GSdx\GSdx.vcxproj", "{18E42F6F-3A62-41EE-B42F-79366C4F1E95}" EndProject @@ -61,7 +61,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilities", "common\build\U EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bin2cpp", "tools\bin2cpp\bin2c.vcxproj", "{677B7D11-D5E1-40B3-88B1-9A4DF83D2213}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg7", "3rdparty\libjpeg\libjpeg.vcxproj", "{BC236261-77E8-4567-8D09-45CD02965EB6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "3rdparty\libjpeg\libjpeg.vcxproj", "{BC236261-77E8-4567-8D09-45CD02965EB6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdvdGigaherz", "plugins\cdvdGigaherz\src\Windows\cdvdGigaherz.vcxproj", "{5CF88D5F-64DD-4EDC-9F1A-436BD502940A}" EndProject @@ -75,13 +75,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Experimental", "Experimenta EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opencl", "3rdparty\opencl\opencl.vcxproj", "{D80D4A75-C385-41BD-AE62-83D2E2B595A7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxConfig30", "3rdparty\wxwidgets3.0\build\msw\wx30_config.vcxproj", "{01F4CE10-2CFB-41A8-B41F-E54337868A1D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wx30_config", "3rdparty\wxwidgets3.0\build\msw\wx30_config.vcxproj", "{01F4CE10-2CFB-41A8-B41F-E54337868A1D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase30", "3rdparty\wxwidgets3.0\build\msw\wx30_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wx30_base", "3rdparty\wxwidgets3.0\build\msw\wx30_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAdv30", "3rdparty\wxwidgets3.0\build\msw\wx30_adv.vcxproj", "{24C45343-FD20-5C92-81C1-35A2AE841E79}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wx30_adv", "3rdparty\wxwidgets3.0\build\msw\wx30_adv.vcxproj", "{24C45343-FD20-5C92-81C1-35A2AE841E79}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore30", "3rdparty\wxwidgets3.0\build\msw\wx30_core.vcxproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wx30_core", "3rdparty\wxwidgets3.0\build\msw\wx30_core.vcxproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "3rdparty\libpng\projects\vstudio\libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}" EndProject @@ -109,46 +109,60 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Debug|Win32.ActiveCfg = Debug|Win32 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Debug|Win32.Build.0 = Debug|Win32 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Debug|x64.ActiveCfg = Debug|Win32 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Debug|x64.ActiveCfg = Debug|x64 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Debug|x64.Build.0 = Debug|x64 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Devel|Win32.ActiveCfg = Devel|Win32 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Devel|Win32.Build.0 = Devel|Win32 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Devel|x64.ActiveCfg = Devel|Win32 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Devel|x64.ActiveCfg = Devel|x64 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Devel|x64.Build.0 = Devel|x64 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX|Win32.ActiveCfg = Release|Win32 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX|Win32.Build.0 = Release|Win32 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX|x64.ActiveCfg = Release|Win32 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX|x64.ActiveCfg = Release|x64 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX|x64.Build.0 = Release|x64 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX2|Win32.ActiveCfg = Release|Win32 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX2|Win32.Build.0 = Release|Win32 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX2|x64.ActiveCfg = Release|Win32 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX2|x64.ActiveCfg = Release|x64 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release AVX2|x64.Build.0 = Release|x64 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release SSE4|Win32.ActiveCfg = Release|Win32 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release SSE4|Win32.Build.0 = Release|Win32 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release SSE4|x64.ActiveCfg = Release|Win32 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release SSE4|x64.ActiveCfg = Release|x64 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release SSE4|x64.Build.0 = Release|x64 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release SSSE3|Win32.Build.0 = Release|Win32 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release SSSE3|x64.ActiveCfg = Release|x64 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release SSSE3|x64.Build.0 = Release|x64 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release|Win32.ActiveCfg = Release|Win32 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release|Win32.Build.0 = Release|Win32 - {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release|x64.ActiveCfg = Release|Win32 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release|x64.ActiveCfg = Release|x64 + {1CEFD830-2B76-4596-A4EE-BCD7280A60BD}.Release|x64.Build.0 = Release|x64 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug|Win32.ActiveCfg = Debug|Win32 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug|Win32.Build.0 = Debug|Win32 - {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug|x64.ActiveCfg = Debug|Win32 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug|x64.ActiveCfg = Debug|x64 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Debug|x64.Build.0 = Debug|x64 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel|Win32.ActiveCfg = Devel|Win32 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel|Win32.Build.0 = Devel|Win32 - {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel|x64.ActiveCfg = Devel|Win32 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel|x64.ActiveCfg = Devel|x64 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Devel|x64.Build.0 = Devel|x64 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release AVX|Win32.ActiveCfg = Release|Win32 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release AVX|Win32.Build.0 = Release|Win32 - {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release AVX|x64.ActiveCfg = Release|Win32 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release AVX|x64.ActiveCfg = Release|x64 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release AVX|x64.Build.0 = Release|x64 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release AVX2|Win32.ActiveCfg = Release|Win32 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release AVX2|Win32.Build.0 = Release|Win32 - {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release AVX2|x64.ActiveCfg = Release|Win32 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release AVX2|x64.ActiveCfg = Release|x64 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release AVX2|x64.Build.0 = Release|x64 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release SSE4|Win32.ActiveCfg = Release|Win32 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release SSE4|Win32.Build.0 = Release|Win32 - {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release SSE4|x64.ActiveCfg = Release|Win32 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release SSE4|x64.ActiveCfg = Release|x64 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release SSE4|x64.Build.0 = Release|x64 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release SSSE3|Win32.Build.0 = Release|Win32 - {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release SSSE3|x64.ActiveCfg = Release|x64 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release SSSE3|x64.Build.0 = Release|x64 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release|Win32.ActiveCfg = Release|Win32 {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release|Win32.Build.0 = Release|Win32 - {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release|x64.ActiveCfg = Release|Win32 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release|x64.ActiveCfg = Release|x64 + {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4}.Release|x64.Build.0 = Release|x64 {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Debug|Win32.ActiveCfg = Debug|Win32 {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Debug|Win32.Build.0 = Debug|Win32 {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Debug|x64.ActiveCfg = Debug|x64 @@ -163,8 +177,8 @@ Global {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Release AVX|x64.Build.0 = Release AVX|x64 {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Release AVX2|Win32.ActiveCfg = Release AVX2|Win32 {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Release AVX2|Win32.Build.0 = Release AVX2|Win32 - {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Release AVX2|x64.ActiveCfg = Release AVX|x64 - {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Release AVX2|x64.Build.0 = Release AVX|x64 + {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Release AVX2|x64.ActiveCfg = Release AVX2|x64 + {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Release AVX2|x64.Build.0 = Release AVX2|x64 {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Release SSE4|Win32.ActiveCfg = Release SSE4|Win32 {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Release SSE4|Win32.Build.0 = Release SSE4|Win32 {18E42F6F-3A62-41EE-B42F-79366C4F1E95}.Release SSE4|x64.ActiveCfg = Release SSE4|x64 @@ -207,25 +221,32 @@ Global {E9B51944-7E6D-4BCD-83F2-7BBD5A46182D}.Release|x64.Build.0 = Release|x64 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Debug|Win32.ActiveCfg = Debug|Win32 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Debug|Win32.Build.0 = Debug|Win32 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Debug|x64.ActiveCfg = Debug|Win32 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Debug|x64.ActiveCfg = Debug|x64 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Debug|x64.Build.0 = Debug|x64 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Devel|Win32.ActiveCfg = Devel|Win32 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Devel|Win32.Build.0 = Devel|Win32 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Devel|x64.ActiveCfg = Devel|Win32 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Devel|x64.ActiveCfg = Devel|x64 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Devel|x64.Build.0 = Devel|x64 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX|Win32.ActiveCfg = Release|Win32 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX|Win32.Build.0 = Release|Win32 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX|x64.ActiveCfg = Release|Win32 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX|x64.ActiveCfg = Release|x64 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX|x64.Build.0 = Release|x64 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX2|Win32.ActiveCfg = Release|Win32 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX2|Win32.Build.0 = Release|Win32 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX2|x64.ActiveCfg = Release|Win32 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX2|x64.ActiveCfg = Release|x64 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release AVX2|x64.Build.0 = Release|x64 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release SSE4|Win32.ActiveCfg = Release|Win32 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release SSE4|Win32.Build.0 = Release|Win32 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release SSE4|x64.ActiveCfg = Release|Win32 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release SSE4|x64.ActiveCfg = Release|x64 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release SSE4|x64.Build.0 = Release|x64 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release SSSE3|Win32.Build.0 = Release|Win32 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release SSSE3|x64.ActiveCfg = Release|x64 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release SSSE3|x64.Build.0 = Release|x64 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release|Win32.ActiveCfg = Release|Win32 {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release|Win32.Build.0 = Release|Win32 - {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release|x64.ActiveCfg = Release|Win32 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release|x64.ActiveCfg = Release|x64 + {2F6C0388-20CB-4242-9F6C-A6EBB6A83F47}.Release|x64.Build.0 = Release|x64 {E4081455-398C-4610-A87C-90A8A7D72DC3}.Debug|Win32.ActiveCfg = Debug|Win32 {E4081455-398C-4610-A87C-90A8A7D72DC3}.Debug|Win32.Build.0 = Debug|Win32 {E4081455-398C-4610-A87C-90A8A7D72DC3}.Debug|x64.ActiveCfg = Debug|x64 @@ -284,180 +305,236 @@ Global {6F3C4136-5801-4EBC-AC6E-37DF6FAB150A}.Release|x64.Build.0 = Release|x64 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Debug|Win32.ActiveCfg = Debug|Win32 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Debug|Win32.Build.0 = Debug|Win32 - {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Debug|x64.ActiveCfg = Debug|Win32 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Debug|x64.ActiveCfg = Debug|x64 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Debug|x64.Build.0 = Debug|x64 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Devel|Win32.ActiveCfg = Release|Win32 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Devel|Win32.Build.0 = Release|Win32 - {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Devel|x64.ActiveCfg = Release|Win32 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Devel|x64.ActiveCfg = Release|x64 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Devel|x64.Build.0 = Release|x64 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release AVX|Win32.ActiveCfg = Release|Win32 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release AVX|Win32.Build.0 = Release|Win32 - {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release AVX|x64.ActiveCfg = Release|Win32 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release AVX|x64.ActiveCfg = Release|x64 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release AVX|x64.Build.0 = Release|x64 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release AVX2|Win32.ActiveCfg = Release|Win32 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release AVX2|Win32.Build.0 = Release|Win32 - {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release AVX2|x64.ActiveCfg = Release|Win32 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release AVX2|x64.ActiveCfg = Release|x64 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release AVX2|x64.Build.0 = Release|x64 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release SSE4|Win32.ActiveCfg = Release|Win32 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release SSE4|Win32.Build.0 = Release|Win32 - {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release SSE4|x64.ActiveCfg = Release|Win32 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release SSE4|x64.ActiveCfg = Release|x64 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release SSE4|x64.Build.0 = Release|x64 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release SSSE3|Win32.Build.0 = Release|Win32 - {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release SSSE3|x64.ActiveCfg = Release|x64 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release SSSE3|x64.Build.0 = Release|x64 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release|Win32.ActiveCfg = Release|Win32 {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release|Win32.Build.0 = Release|Win32 - {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release|x64.ActiveCfg = Release|Win32 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release|x64.ActiveCfg = Release|x64 + {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70}.Release|x64.Build.0 = Release|x64 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Debug|Win32.ActiveCfg = Debug|Win32 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Debug|Win32.Build.0 = Debug|Win32 - {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Debug|x64.ActiveCfg = Debug|Win32 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Debug|x64.ActiveCfg = Debug|x64 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Debug|x64.Build.0 = Debug|x64 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Devel|Win32.ActiveCfg = Release|Win32 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Devel|Win32.Build.0 = Release|Win32 - {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Devel|x64.ActiveCfg = Release|Win32 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Devel|x64.ActiveCfg = Release|x64 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Devel|x64.Build.0 = Release|x64 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release AVX|Win32.ActiveCfg = Release|Win32 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release AVX|Win32.Build.0 = Release|Win32 - {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release AVX|x64.ActiveCfg = Release|Win32 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release AVX|x64.ActiveCfg = Release|x64 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release AVX|x64.Build.0 = Release|x64 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release AVX2|Win32.ActiveCfg = Release|Win32 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release AVX2|Win32.Build.0 = Release|Win32 - {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release AVX2|x64.ActiveCfg = Release|Win32 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release AVX2|x64.ActiveCfg = Release|x64 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release AVX2|x64.Build.0 = Release|x64 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release SSE4|Win32.ActiveCfg = Release|Win32 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release SSE4|Win32.Build.0 = Release|Win32 - {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release SSE4|x64.ActiveCfg = Release|Win32 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release SSE4|x64.ActiveCfg = Release|x64 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release SSE4|x64.Build.0 = Release|x64 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release SSSE3|Win32.Build.0 = Release|Win32 - {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release SSSE3|x64.ActiveCfg = Release|x64 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release SSSE3|x64.Build.0 = Release|x64 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release|Win32.ActiveCfg = Release|Win32 {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release|Win32.Build.0 = Release|Win32 - {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release|x64.ActiveCfg = Release|Win32 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release|x64.ActiveCfg = Release|x64 + {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}.Release|x64.Build.0 = Release|x64 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Debug|Win32.ActiveCfg = Debug|Win32 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Debug|Win32.Build.0 = Debug|Win32 - {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Debug|x64.ActiveCfg = Debug|Win32 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Debug|x64.ActiveCfg = Debug|x64 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Debug|x64.Build.0 = Debug|x64 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Devel|Win32.ActiveCfg = Release|Win32 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Devel|Win32.Build.0 = Release|Win32 - {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Devel|x64.ActiveCfg = Release|Win32 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Devel|x64.ActiveCfg = Release|x64 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Devel|x64.Build.0 = Release|x64 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release AVX|Win32.ActiveCfg = Release|Win32 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release AVX|Win32.Build.0 = Release|Win32 - {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release AVX|x64.ActiveCfg = Release|Win32 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release AVX|x64.ActiveCfg = Release|x64 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release AVX|x64.Build.0 = Release|x64 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release AVX2|Win32.ActiveCfg = Release|Win32 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release AVX2|Win32.Build.0 = Release|Win32 - {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release AVX2|x64.ActiveCfg = Release|Win32 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release AVX2|x64.ActiveCfg = Release|x64 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release AVX2|x64.Build.0 = Release|x64 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release SSE4|Win32.ActiveCfg = Release|Win32 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release SSE4|Win32.Build.0 = Release|Win32 - {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release SSE4|x64.ActiveCfg = Release|Win32 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release SSE4|x64.ActiveCfg = Release|x64 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release SSE4|x64.Build.0 = Release|x64 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release SSSE3|Win32.Build.0 = Release|Win32 - {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release SSSE3|x64.ActiveCfg = Release|x64 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release SSSE3|x64.Build.0 = Release|x64 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release|Win32.ActiveCfg = Release|Win32 {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release|Win32.Build.0 = Release|Win32 - {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release|x64.ActiveCfg = Release|Win32 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release|x64.ActiveCfg = Release|x64 + {04439C5F-05FB-4A9C-AAD1-5388C25377DB}.Release|x64.Build.0 = Release|x64 {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug|Win32.ActiveCfg = Debug|Win32 {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug|Win32.Build.0 = Debug|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug|x64.ActiveCfg = Debug|Win32 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug|x64.ActiveCfg = Debug|x64 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Debug|x64.Build.0 = Debug|x64 {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel|Win32.ActiveCfg = Devel|Win32 {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel|Win32.Build.0 = Devel|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel|x64.ActiveCfg = Devel|Win32 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel|x64.ActiveCfg = Devel|x64 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Devel|x64.Build.0 = Devel|x64 {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX|Win32.ActiveCfg = Release|Win32 {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX|Win32.Build.0 = Release|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX|x64.ActiveCfg = Release|Win32 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX|x64.ActiveCfg = Release|x64 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX|x64.Build.0 = Release|x64 {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX2|Win32.ActiveCfg = Release|Win32 {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX2|Win32.Build.0 = Release|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX2|x64.ActiveCfg = Release|Win32 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX2|x64.ActiveCfg = Release|x64 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Release AVX2|x64.Build.0 = Release|x64 {A51123F5-9505-4EAE-85E7-D320290A272C}.Release SSE4|Win32.ActiveCfg = Release|Win32 {A51123F5-9505-4EAE-85E7-D320290A272C}.Release SSE4|Win32.Build.0 = Release|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release SSE4|x64.ActiveCfg = Release|Win32 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Release SSE4|x64.ActiveCfg = Release|x64 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Release SSE4|x64.Build.0 = Release|x64 {A51123F5-9505-4EAE-85E7-D320290A272C}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {A51123F5-9505-4EAE-85E7-D320290A272C}.Release SSSE3|Win32.Build.0 = Release|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Release SSSE3|x64.ActiveCfg = Release|x64 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Release SSSE3|x64.Build.0 = Release|x64 {A51123F5-9505-4EAE-85E7-D320290A272C}.Release|Win32.ActiveCfg = Release|Win32 {A51123F5-9505-4EAE-85E7-D320290A272C}.Release|Win32.Build.0 = Release|Win32 - {A51123F5-9505-4EAE-85E7-D320290A272C}.Release|x64.ActiveCfg = Release|Win32 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Release|x64.ActiveCfg = Release|x64 + {A51123F5-9505-4EAE-85E7-D320290A272C}.Release|x64.Build.0 = Release|x64 {4639972E-424E-4E13-8B07-CA403C481346}.Debug|Win32.ActiveCfg = Debug|Win32 {4639972E-424E-4E13-8B07-CA403C481346}.Debug|Win32.Build.0 = Debug|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Debug|x64.ActiveCfg = Debug|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Debug|x64.ActiveCfg = Debug|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Debug|x64.Build.0 = Debug|x64 {4639972E-424E-4E13-8B07-CA403C481346}.Devel|Win32.ActiveCfg = Devel|Win32 {4639972E-424E-4E13-8B07-CA403C481346}.Devel|Win32.Build.0 = Devel|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Devel|x64.ActiveCfg = Devel|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Devel|x64.ActiveCfg = Devel|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Devel|x64.Build.0 = Devel|x64 {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX|Win32.ActiveCfg = Release|Win32 {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX|Win32.Build.0 = Release|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX|x64.ActiveCfg = Release|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX|x64.ActiveCfg = Release|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX|x64.Build.0 = Release|x64 {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|Win32.ActiveCfg = Release|Win32 {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|Win32.Build.0 = Release|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|x64.ActiveCfg = Release|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|x64.ActiveCfg = Release|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Release AVX2|x64.Build.0 = Release|x64 {4639972E-424E-4E13-8B07-CA403C481346}.Release SSE4|Win32.ActiveCfg = Release|Win32 {4639972E-424E-4E13-8B07-CA403C481346}.Release SSE4|Win32.Build.0 = Release|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Release SSE4|x64.ActiveCfg = Release|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Release SSE4|x64.ActiveCfg = Release|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Release SSE4|x64.Build.0 = Release|x64 {4639972E-424E-4E13-8B07-CA403C481346}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {4639972E-424E-4E13-8B07-CA403C481346}.Release SSSE3|Win32.Build.0 = Release|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Release SSSE3|x64.ActiveCfg = Release|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Release SSSE3|x64.Build.0 = Release|x64 {4639972E-424E-4E13-8B07-CA403C481346}.Release|Win32.ActiveCfg = Release|Win32 {4639972E-424E-4E13-8B07-CA403C481346}.Release|Win32.Build.0 = Release|Win32 - {4639972E-424E-4E13-8B07-CA403C481346}.Release|x64.ActiveCfg = Release|Win32 + {4639972E-424E-4E13-8B07-CA403C481346}.Release|x64.ActiveCfg = Release|x64 + {4639972E-424E-4E13-8B07-CA403C481346}.Release|x64.Build.0 = Release|x64 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug|Win32.ActiveCfg = Debug|Win32 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug|Win32.Build.0 = Debug|Win32 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug|x64.ActiveCfg = Debug|Win32 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug|x64.ActiveCfg = Debug|x64 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Debug|x64.Build.0 = Debug|x64 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Devel|Win32.ActiveCfg = Release|Win32 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Devel|Win32.Build.0 = Release|Win32 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Devel|x64.ActiveCfg = Release|Win32 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Devel|x64.ActiveCfg = Release|x64 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Devel|x64.Build.0 = Release|x64 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX|Win32.ActiveCfg = Release|Win32 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX|Win32.Build.0 = Release|Win32 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX|x64.ActiveCfg = Release|Win32 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX|x64.ActiveCfg = Release|x64 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX|x64.Build.0 = Release|x64 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX2|Win32.ActiveCfg = Release|Win32 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX2|Win32.Build.0 = Release|Win32 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX2|x64.ActiveCfg = Release|Win32 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX2|x64.ActiveCfg = Release|x64 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release AVX2|x64.Build.0 = Release|x64 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release SSE4|Win32.ActiveCfg = Release|Win32 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release SSE4|Win32.Build.0 = Release|Win32 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release SSE4|x64.ActiveCfg = Release|Win32 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release SSE4|x64.ActiveCfg = Release|x64 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release SSE4|x64.Build.0 = Release|x64 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release SSSE3|Win32.Build.0 = Release|Win32 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release SSSE3|x64.ActiveCfg = Release|x64 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release SSSE3|x64.Build.0 = Release|x64 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release|Win32.ActiveCfg = Release|Win32 {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release|Win32.Build.0 = Release|Win32 - {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release|x64.ActiveCfg = Release|Win32 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release|x64.ActiveCfg = Release|x64 + {677B7D11-D5E1-40B3-88B1-9A4DF83D2213}.Release|x64.Build.0 = Release|x64 {BC236261-77E8-4567-8D09-45CD02965EB6}.Debug|Win32.ActiveCfg = Debug|Win32 {BC236261-77E8-4567-8D09-45CD02965EB6}.Debug|Win32.Build.0 = Debug|Win32 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Debug|x64.ActiveCfg = Debug|Win32 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Debug|x64.ActiveCfg = Debug|x64 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Debug|x64.Build.0 = Debug|x64 {BC236261-77E8-4567-8D09-45CD02965EB6}.Devel|Win32.ActiveCfg = Devel|Win32 {BC236261-77E8-4567-8D09-45CD02965EB6}.Devel|Win32.Build.0 = Devel|Win32 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Devel|x64.ActiveCfg = Devel|Win32 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Devel|x64.ActiveCfg = Devel|x64 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Devel|x64.Build.0 = Devel|x64 {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX|Win32.ActiveCfg = Release|Win32 {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX|Win32.Build.0 = Release|Win32 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX|x64.ActiveCfg = Release|Win32 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX|x64.ActiveCfg = Release|x64 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX|x64.Build.0 = Release|x64 {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX2|Win32.ActiveCfg = Release|Win32 {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX2|Win32.Build.0 = Release|Win32 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX2|x64.ActiveCfg = Release|Win32 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX2|x64.ActiveCfg = Release|x64 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Release AVX2|x64.Build.0 = Release|x64 {BC236261-77E8-4567-8D09-45CD02965EB6}.Release SSE4|Win32.ActiveCfg = Release|Win32 {BC236261-77E8-4567-8D09-45CD02965EB6}.Release SSE4|Win32.Build.0 = Release|Win32 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Release SSE4|x64.ActiveCfg = Release|Win32 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Release SSE4|x64.ActiveCfg = Release|x64 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Release SSE4|x64.Build.0 = Release|x64 {BC236261-77E8-4567-8D09-45CD02965EB6}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {BC236261-77E8-4567-8D09-45CD02965EB6}.Release SSSE3|Win32.Build.0 = Release|Win32 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Release SSSE3|x64.ActiveCfg = Release|x64 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Release SSSE3|x64.Build.0 = Release|x64 {BC236261-77E8-4567-8D09-45CD02965EB6}.Release|Win32.ActiveCfg = Release|Win32 {BC236261-77E8-4567-8D09-45CD02965EB6}.Release|Win32.Build.0 = Release|Win32 - {BC236261-77E8-4567-8D09-45CD02965EB6}.Release|x64.ActiveCfg = Release|Win32 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Release|x64.ActiveCfg = Release|x64 + {BC236261-77E8-4567-8D09-45CD02965EB6}.Release|x64.Build.0 = Release|x64 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Debug|Win32.ActiveCfg = Debug|Win32 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Debug|Win32.Build.0 = Debug|Win32 - {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Debug|x64.ActiveCfg = Debug|Win32 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Debug|x64.ActiveCfg = Debug|x64 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Debug|x64.Build.0 = Debug|x64 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Devel|Win32.ActiveCfg = Release|Win32 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Devel|Win32.Build.0 = Release|Win32 - {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Devel|x64.ActiveCfg = Release|Win32 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Devel|x64.ActiveCfg = Release|x64 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Devel|x64.Build.0 = Release|x64 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release AVX|Win32.ActiveCfg = Release|Win32 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release AVX|Win32.Build.0 = Release|Win32 - {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release AVX|x64.ActiveCfg = Release|Win32 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release AVX|x64.ActiveCfg = Release|x64 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release AVX|x64.Build.0 = Release|x64 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release AVX2|Win32.ActiveCfg = Release|Win32 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release AVX2|Win32.Build.0 = Release|Win32 - {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release AVX2|x64.ActiveCfg = Release|Win32 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release AVX2|x64.ActiveCfg = Release|x64 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release AVX2|x64.Build.0 = Release|x64 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release SSE4|Win32.ActiveCfg = Release|Win32 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release SSE4|Win32.Build.0 = Release|Win32 - {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release SSE4|x64.ActiveCfg = Release|Win32 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release SSE4|x64.ActiveCfg = Release|x64 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release SSE4|x64.Build.0 = Release|x64 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release SSSE3|Win32.Build.0 = Release|Win32 - {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release SSSE3|x64.ActiveCfg = Release|x64 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release SSSE3|x64.Build.0 = Release|x64 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release|Win32.ActiveCfg = Release|Win32 {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release|Win32.Build.0 = Release|Win32 - {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release|x64.ActiveCfg = Release|Win32 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release|x64.ActiveCfg = Release|x64 + {5CF88D5F-64DD-4EDC-9F1A-436BD502940A}.Release|x64.Build.0 = Release|x64 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.ActiveCfg = Debug (NO ASIO)|Win32 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|Win32.Build.0 = Debug (NO ASIO)|Win32 - {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug|x64 - {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug|x64 - {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Devel|Win32.ActiveCfg = Release (NO ASIO)|Win32 - {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Devel|Win32.Build.0 = Release (NO ASIO)|Win32 - {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Devel|x64.ActiveCfg = Release (NO ASIO)|x64 - {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Devel|x64.Build.0 = Release (NO ASIO)|x64 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.ActiveCfg = Debug (NO ASIO)|x64 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Debug|x64.Build.0 = Debug (NO ASIO)|x64 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Devel|Win32.ActiveCfg = Devel (NO ASIO)|Win32 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Devel|Win32.Build.0 = Devel (NO ASIO)|Win32 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Devel|x64.ActiveCfg = Devel (NO ASIO)|x64 + {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Devel|x64.Build.0 = Devel (NO ASIO)|x64 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release AVX|Win32.ActiveCfg = Release (NO ASIO)|Win32 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release AVX|Win32.Build.0 = Release (NO ASIO)|Win32 {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release AVX|x64.ActiveCfg = Release (NO ASIO)|x64 @@ -480,46 +557,60 @@ Global {0A18A071-125E-442F-AFF7-A3F68ABECF99}.Release|x64.Build.0 = Release (NO ASIO)|x64 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Debug|Win32.ActiveCfg = Debug|Win32 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Debug|Win32.Build.0 = Debug|Win32 - {E613DA9F-41B4-4613-9911-E418EF5533BC}.Debug|x64.ActiveCfg = Debug|Win32 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Debug|x64.ActiveCfg = Debug|x64 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Debug|x64.Build.0 = Debug|x64 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Devel|Win32.ActiveCfg = Devel|Win32 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Devel|Win32.Build.0 = Devel|Win32 - {E613DA9F-41B4-4613-9911-E418EF5533BC}.Devel|x64.ActiveCfg = Devel|Win32 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Devel|x64.ActiveCfg = Devel|x64 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Devel|x64.Build.0 = Devel|x64 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release AVX|Win32.ActiveCfg = Release|Win32 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release AVX|Win32.Build.0 = Release|Win32 - {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release AVX|x64.ActiveCfg = Release|Win32 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release AVX|x64.ActiveCfg = Release|x64 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release AVX|x64.Build.0 = Release|x64 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release AVX2|Win32.ActiveCfg = Release|Win32 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release AVX2|Win32.Build.0 = Release|Win32 - {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release AVX2|x64.ActiveCfg = Release|Win32 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release AVX2|x64.ActiveCfg = Release|x64 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release AVX2|x64.Build.0 = Release|x64 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release SSE4|Win32.ActiveCfg = Release|Win32 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release SSE4|Win32.Build.0 = Release|Win32 - {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release SSE4|x64.ActiveCfg = Release|Win32 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release SSE4|x64.ActiveCfg = Release|x64 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release SSE4|x64.Build.0 = Release|x64 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release SSSE3|Win32.Build.0 = Release|Win32 - {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release SSSE3|x64.ActiveCfg = Release|x64 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release SSSE3|x64.Build.0 = Release|x64 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release|Win32.ActiveCfg = Release|Win32 {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release|Win32.Build.0 = Release|Win32 - {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release|x64.ActiveCfg = Release|Win32 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release|x64.ActiveCfg = Release|x64 + {E613DA9F-41B4-4613-9911-E418EF5533BC}.Release|x64.Build.0 = Release|x64 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Debug|Win32.ActiveCfg = Debug|Win32 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Debug|Win32.Build.0 = Debug|Win32 - {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Debug|x64.ActiveCfg = Debug|Win32 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Debug|x64.ActiveCfg = Debug|x64 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Debug|x64.Build.0 = Debug|x64 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Devel|Win32.ActiveCfg = Release|Win32 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Devel|Win32.Build.0 = Release|Win32 - {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Devel|x64.ActiveCfg = Release|Win32 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Devel|x64.ActiveCfg = Release|x64 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Devel|x64.Build.0 = Release|x64 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release AVX|Win32.ActiveCfg = Release|Win32 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release AVX|Win32.Build.0 = Release|Win32 - {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release AVX|x64.ActiveCfg = Release|Win32 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release AVX|x64.ActiveCfg = Release|x64 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release AVX|x64.Build.0 = Release|x64 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release AVX2|Win32.ActiveCfg = Release|Win32 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release AVX2|Win32.Build.0 = Release|Win32 - {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release AVX2|x64.ActiveCfg = Release|Win32 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release AVX2|x64.ActiveCfg = Release|x64 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release AVX2|x64.Build.0 = Release|x64 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release SSE4|Win32.ActiveCfg = Release|Win32 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release SSE4|Win32.Build.0 = Release|Win32 - {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release SSE4|x64.ActiveCfg = Release|Win32 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release SSE4|x64.ActiveCfg = Release|x64 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release SSE4|x64.Build.0 = Release|x64 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release SSSE3|Win32.Build.0 = Release|Win32 - {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release SSSE3|x64.ActiveCfg = Release|x64 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release SSSE3|x64.Build.0 = Release|x64 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release|Win32.ActiveCfg = Release|Win32 {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release|Win32.Build.0 = Release|Win32 - {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release|x64.ActiveCfg = Release|Win32 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release|x64.ActiveCfg = Release|x64 + {BBE4E5FB-530A-4D18-A633-35AF0577B7F3}.Release|x64.Build.0 = Release|x64 {D80D4A75-C385-41BD-AE62-83D2E2B595A7}.Debug|Win32.ActiveCfg = Debug|Win32 {D80D4A75-C385-41BD-AE62-83D2E2B595A7}.Debug|Win32.Build.0 = Debug|Win32 {D80D4A75-C385-41BD-AE62-83D2E2B595A7}.Debug|x64.ActiveCfg = Debug|x64 @@ -662,25 +753,32 @@ Global {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.ActiveCfg = Debug|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.Build.0 = Debug|Win32 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.ActiveCfg = Debug|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.ActiveCfg = Debug|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.Build.0 = Debug|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Devel|Win32.ActiveCfg = Devel|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Devel|Win32.Build.0 = Devel|Win32 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Devel|x64.ActiveCfg = Devel|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Devel|x64.ActiveCfg = Devel|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Devel|x64.Build.0 = Devel|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX|Win32.ActiveCfg = Release|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX|Win32.Build.0 = Release|Win32 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX|x64.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX|x64.ActiveCfg = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX|x64.Build.0 = Release|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX2|Win32.ActiveCfg = Release|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX2|Win32.Build.0 = Release|Win32 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX2|x64.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX2|x64.ActiveCfg = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release AVX2|x64.Build.0 = Release|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release SSE4|Win32.ActiveCfg = Release|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release SSE4|Win32.Build.0 = Release|Win32 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release SSE4|x64.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release SSE4|x64.ActiveCfg = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release SSE4|x64.Build.0 = Release|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release SSSE3|Win32.ActiveCfg = Release|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release SSSE3|Win32.Build.0 = Release|Win32 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release SSSE3|x64.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release SSSE3|x64.ActiveCfg = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release SSSE3|x64.Build.0 = Release|x64 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.ActiveCfg = Release|Win32 {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.Build.0 = Release|Win32 - {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.ActiveCfg = Release|Win32 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.ActiveCfg = Release|x64 + {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.Build.0 = Release|x64 {0FAE817D-9A32-4830-857E-81DA57246E16}.Debug|Win32.ActiveCfg = Debug|Win32 {0FAE817D-9A32-4830-857E-81DA57246E16}.Debug|Win32.Build.0 = Debug|Win32 {0FAE817D-9A32-4830-857E-81DA57246E16}.Debug|x64.ActiveCfg = Debug|x64 @@ -715,8 +813,8 @@ Global {27F17499-A372-4408-8AFA-4F9F4584FBD3}.Debug|x64.Build.0 = Debug|x64 {27F17499-A372-4408-8AFA-4F9F4584FBD3}.Devel|Win32.ActiveCfg = Release|Win32 {27F17499-A372-4408-8AFA-4F9F4584FBD3}.Devel|Win32.Build.0 = Release|Win32 - {27F17499-A372-4408-8AFA-4F9F4584FBD3}.Devel|x64.ActiveCfg = Debug|x64 - {27F17499-A372-4408-8AFA-4F9F4584FBD3}.Devel|x64.Build.0 = Debug|x64 + {27F17499-A372-4408-8AFA-4F9F4584FBD3}.Devel|x64.ActiveCfg = Release|x64 + {27F17499-A372-4408-8AFA-4F9F4584FBD3}.Devel|x64.Build.0 = Release|x64 {27F17499-A372-4408-8AFA-4F9F4584FBD3}.Release AVX|Win32.ActiveCfg = Release|Win32 {27F17499-A372-4408-8AFA-4F9F4584FBD3}.Release AVX|Win32.Build.0 = Release|Win32 {27F17499-A372-4408-8AFA-4F9F4584FBD3}.Release AVX|x64.ActiveCfg = Release|x64 diff --git a/common/build/Utilities/utilities.vcxproj b/common/build/Utilities/utilities.vcxproj index fafaa6ee73..da2660f357 100644 --- a/common/build/Utilities/utilities.vcxproj +++ b/common/build/Utilities/utilities.vcxproj @@ -5,91 +5,55 @@ Debug Win32 + + Debug + x64 + Devel Win32 + + Devel + x64 + Release Win32 + + Release + x64 + {4639972E-424E-4E13-8B07-CA403C481346} - x86emitter - Win32Proj - utilities - + StaticLibrary - Unicode - true $(DefaultPlatformToolset) - - - StaticLibrary Unicode - true - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.30319.1 - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - + AllRules.ruleset - + - _LIB;%(PreprocessorDefinitions) - Async - Use - PrecompiledHeader.h - - - - - _LIB;%(PreprocessorDefinitions) - Async - Use - PrecompiledHeader.h - - - - - _LIB;%(PreprocessorDefinitions) Async Use PrecompiledHeader.h @@ -97,9 +61,7 @@ - true - true - true + true @@ -116,9 +78,7 @@ - Create - Create - Create + Create @@ -129,19 +89,13 @@ - true - true - true + true - true - true - true + true - true - true - true + true @@ -201,6 +155,5 @@ - - - \ No newline at end of file + + diff --git a/common/build/x86emitter/x86emitter.vcxproj b/common/build/x86emitter/x86emitter.vcxproj index 2550012d0f..0a6b4c6263 100644 --- a/common/build/x86emitter/x86emitter.vcxproj +++ b/common/build/x86emitter/x86emitter.vcxproj @@ -5,94 +5,55 @@ Debug Win32 + + Debug + x64 + Devel Win32 + + Devel + x64 + Release Win32 + + Release + x64 + {A51123F5-9505-4EAE-85E7-D320290A272C} - x86emitter - Win32Proj - x86emitter - + StaticLibrary - Unicode - true $(DefaultPlatformToolset) - - - StaticLibrary Unicode - true - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.30319.1 - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - + AllRules.ruleset - + - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - Use - PrecompiledHeader.h - - - - - MaxSpeed - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - Use - PrecompiledHeader.h - - - - - MaxSpeed - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) Use PrecompiledHeader.h @@ -107,16 +68,12 @@ - Create - Create - Create + Create - true - true - true + true @@ -156,6 +113,5 @@ - - - \ No newline at end of file + + diff --git a/common/vsprops/IncrementalLinking.props b/common/vsprops/IncrementalLinking.props index 44bb578b20..d9e723a60e 100644 --- a/common/vsprops/IncrementalLinking.props +++ b/common/vsprops/IncrementalLinking.props @@ -1,9 +1,7 @@  - <_ProjectFileVersion>10.0.30128.1 true - $(ProjectName)-dbg @@ -14,8 +12,7 @@ false - false false - \ No newline at end of file + diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj index 47fee24e46..ae62bf350c 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj @@ -5,147 +5,64 @@ Debug Win32 + + Debug + x64 + Devel Win32 + + Devel + x64 + Release Win32 + + Release + x64 + - pcsx2 {1CEFD830-2B76-4596-A4EE-BCD7280A60BD} - pcsx2 - + Application - false - Unicode - true - $(DefaultPlatformToolset) - - - Application - false - Unicode - false - $(DefaultPlatformToolset) - - - Application - false Unicode $(DefaultPlatformToolset) + true + true + false - - - - + + - - - - - - - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.30319.1 - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - $(ProjectName)-dev + AllRules.ruleset - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/pcsx2.tlb - + $(ProjectRootDir)/gui;%(AdditionalIncludeDirectories) Async Use PrecompiledHeader.h - CompileAsCpp NoExtensions - $(OutDir)$(ProjectName)-dbg.exe - Yes - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/pcsx2.tlb - - - $(ProjectRootDir)/gui;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - Async - Use - PrecompiledHeader.h - Level3 - CompileAsCpp - NoExtensions - - - $(OutDir)$(TargetName)$(TargetExt) - Yes - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/pcsx2.tlb - - - $(ProjectRootDir)/gui;%(AdditionalIncludeDirectories) - NDEBUG;%(PreprocessorDefinitions) - Async - NoExtensions - Use - PrecompiledHeader.h - CompileAsCpp - - - $(TargetDir)$(TargetName).pdb Yes @@ -274,9 +191,7 @@ - Create - Create - Create + Create @@ -382,22 +297,8 @@ - - - - - - - - - - - - - - - - + + @@ -409,34 +310,22 @@ - true - true - true + true - true - true - true + true - true - true - true + true - true - true - true + true - true - true - true + true - true - true - true + true @@ -455,9 +344,7 @@ - true - true - true + true @@ -504,27 +391,13 @@ - true - true - true + true - true - ..\Win32.h - $(IntDir)win32.pch - true - ..\Win32.h - $(IntDir)win32.pch - true + true - true - ..\Win32.h - $(IntDir)win32.pch - true - ..\Win32.h - $(IntDir)win32.pch - true + true @@ -649,39 +522,25 @@ - true - true - true + true - true - true - true + true - true - true - true + true - true - true - true + true - true - true - true + true - true - true - true + true - true - true - true + true @@ -720,9 +579,7 @@ - $(SolutionDir)\3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)\3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories) - $(SolutionDir)\3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)\3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories) - $(SolutionDir)\3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)\3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)3rdparty\wxwidgets3.0\$(PlatformName);$(SolutionDir)3rdparty\wxwidgets3.0\include;%(AdditionalIncludeDirectories) @@ -761,7 +618,5 @@ - - - - \ No newline at end of file + + diff --git a/plugins/FWnull/Windows/FWnull.vcxproj b/plugins/FWnull/Windows/FWnull.vcxproj index 9c22eccd5f..1b0944671f 100644 --- a/plugins/FWnull/Windows/FWnull.vcxproj +++ b/plugins/FWnull/Windows/FWnull.vcxproj @@ -5,71 +5,50 @@ Debug Win32 + + Debug + x64 + Release Win32 + + + Release + x64 - FWnull {3D0EB14D-32F3-4D82-9C6D-B806ADBB859C} - FWnull - Win32Proj - + DynamicLibrary - MultiByte - true $(DefaultPlatformToolset) - - - DynamicLibrary MultiByte - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - + + + - <_ProjectFileVersion>10.0.30319.1 - $(ProjectName) + AllRules.ruleset - - - - - - - $(OutDir)$(TargetName)$(TargetExt) - FireWireNull.def - false - MachineX86 - - - - - - - + FireWireNull.def - false - MachineX86 + MachineX86 + MachineX64 @@ -84,6 +63,5 @@ - - - \ No newline at end of file + + diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj index 147ddcb6e5..65cfe9ef5a 100644 --- a/plugins/GSdx/GSdx.vcxproj +++ b/plugins/GSdx/GSdx.vcxproj @@ -83,476 +83,44 @@ - GSdx {18E42F6F-3A62-41EE-B42F-79366C4F1E95} - GSdx - Win32Proj - + DynamicLibrary - MultiByte - true $(DefaultPlatformToolset) - - - DynamicLibrary MultiByte - true - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - true - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - true - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - true - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - true - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - true - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - true - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - true - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - true - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - false - $(DefaultPlatformToolset) + true + true + false - - - + + - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.30319.1 + AllRules.ruleset - + Use .\GSdx.def - MachineX86 - $(SvnRootDir)\deps\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - - - Use - - - - - - - - - Use - - - .\GSdx.def - MachineX86 - $(SvnRootDir)\deps\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - - - Use - - - - - - - - - Use - - - .\GSdx.def - MachineX86 - $(SvnRootDir)\deps\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - - - Use - - - - - - - - - Use - - - .\GSdx.def - MachineX86 - $(SvnRootDir)\deps\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - - - Use - - - - - - - - - Use - - - .\GSdx.def - MachineX86 - $(SvnRootDir)\deps\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - - - Use - - - .\GSdx.def - MachineX86 - $(SvnRootDir)\deps\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - - - Use - - - .\GSdx.def - MachineX86 - $(SvnRootDir)\deps\$(Platform)\Debug;%(AdditionalLibraryDirectories) - - - - - X64 - - - Use - - - - - - - - - X64 - - - Use - - - - - - - - - X64 - - - Use - - - - - - - - - Use - - - .\GSdx.def - MachineX86 - $(SvnRootDir)\deps\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - - - Use - - - .\GSdx.def - MachineX86 - $(SvnRootDir)\deps\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - - - Use - - - .\GSdx.def - MachineX86 - $(SvnRootDir)\deps\$(Platform)\Release;%(AdditionalLibraryDirectories) - - - - - X64 - - - Use - - - - - - - - - X64 - - - Use - - - - - - - - - X64 - - - Use - - - - + MachineX86 + MachineX64 @@ -579,84 +147,24 @@ - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true + true + true - true - true - true - true - true - true - true - true - true - true - true - true - true - true + true + true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true + true + true - true - true - true - true - true - true - true - true + true + true - true - true - true - true - true - true - true - true - true - true - true - true - true - true + true + true @@ -665,11 +173,7 @@ - - AssemblyAndSourceCode - AssemblyAndSourceCode - AssemblyAndSourceCode - + @@ -684,73 +188,24 @@ - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true + true + true - true - true - true - true - true - true - true - true - true - true - true - true - true - true + true + true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true + true + true + + + true + true - - true - true - true - true - true - true - true - true - true - true - true - true - true - true + true + true @@ -770,10 +225,7 @@ - - AssemblyAndSourceCode - AssemblyAndSourceCode - + @@ -790,29 +242,7 @@ - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create - Create + Create @@ -947,11 +377,5 @@ - - - - - - - + diff --git a/plugins/LilyPad/LilyPad.vcxproj b/plugins/LilyPad/LilyPad.vcxproj index d023a353aa..c115fe3ef2 100644 --- a/plugins/LilyPad/LilyPad.vcxproj +++ b/plugins/LilyPad/LilyPad.vcxproj @@ -19,232 +19,49 @@ - LilyPad {E4081455-398C-4610-A87C-90A8A7D72DC3} - LilyPad - + DynamicLibrary - false - Unicode - true $(DefaultPlatformToolset) - - - DynamicLibrary - false Unicode - $(DefaultPlatformToolset) - - - DynamicLibrary - false - Unicode - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - Unicode - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - - - - - - - - - - - + + + - <_ProjectFileVersion>10.0.30319.1 - false - false - true - false - false - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - + AllRules.ruleset - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - - - + - _DEBUG;%(PreprocessorDefinitions) Use Global.h - 4995; 4996;%(DisableSpecificWarnings) + 4995;4996;%(DisableSpecificWarnings) - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - Setupapi.lib;Winmm.lib;Comdlg32.lib;dinput8.lib;dxguid.lib;comctl32.lib;hid.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) .\LilyPad.def - false - MachineX86 + MachineX86 + MachineX64 - - true - .\Debug/LilyPad.bsc - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - - - - - Use - Global.h - FastCall - 4995; 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Setupapi.lib;Winmm.lib;Comdlg32.lib;dinput8.lib;dxguid.lib;comctl32.lib;hid.lib;%(AdditionalDependencies) - true - .\LilyPad.def - true - true - - - false - - - MachineX86 - - - true - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - - - - - Disabled - _DEBUG;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Use - Global.h - Level3 - true - ProgramDatabase - 4995; 4996;%(DisableSpecificWarnings) - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Setupapi.lib;Winmm.lib;Comdlg32.lib;dinput8.lib;dxguid.lib;comctl32.lib;hid.lib;%(AdditionalDependencies) - true - true - MachineX64 - - - true - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - - - - - true - MultiThreadedDLL - false - Use - Global.h - FastCall - 4995; 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Setupapi.lib;Winmm.lib;Comdlg32.lib;dinput8.lib;dxguid.lib;comctl32.lib;hid.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)64.dll - true - .\LilyPad.def - true - true - false - MachineX64 - - - true - .\Release/LilyPad.bsc - - Create - Create - Create - Create + Create @@ -289,6 +106,5 @@ - - + diff --git a/plugins/USBnull/Windows/USBnull.vcxproj b/plugins/USBnull/Windows/USBnull.vcxproj index 16699c3b4a..7044ad01d1 100644 --- a/plugins/USBnull/Windows/USBnull.vcxproj +++ b/plugins/USBnull/Windows/USBnull.vcxproj @@ -5,71 +5,50 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + - USBnull {BF7B81A5-E348-4F7C-A69F-F74C8EEEAD70} - USBnull - Win32Proj - + DynamicLibrary - MultiByte - true $(DefaultPlatformToolset) - - - DynamicLibrary MultiByte - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - + + + - <_ProjectFileVersion>10.0.30319.1 - $(ProjectName) + AllRules.ruleset - - - - - - - $(OutDir)$(TargetName)$(TargetExt) - USBnull.def - false - MachineX86 - - - - - - - + USBnull.def - false - MachineX86 + MachineX86 + MachineX64 @@ -84,6 +63,5 @@ - - - \ No newline at end of file + + diff --git a/plugins/USBqemu/Win32/USBqemu.vcxproj b/plugins/USBqemu/Win32/USBqemu.vcxproj index 440bfd32e2..12286e98af 100644 --- a/plugins/USBqemu/Win32/USBqemu.vcxproj +++ b/plugins/USBqemu/Win32/USBqemu.vcxproj @@ -5,116 +5,66 @@ Debug Win32 + + Debug + x64 + Devel Win32 + + Devel + x64 + Release Win32 + + Release + x64 + - USBqemu {E613DA9F-41B4-4613-9911-E418EF5533BC} - USBlinuz - Win32Proj - + DynamicLibrary - true - Unicode $(DefaultPlatformToolset) - - - DynamicLibrary - false Unicode - $(DefaultPlatformToolset) - - - DynamicLibrary - Unicode - $(DefaultPlatformToolset) + $(Configuration.Contains(Release)) + true + false - - - + + - - - - - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.40219.1 - $(ProjectName)-dev + AllRules.ruleset - - - - - - + USBqemu.def Windows - - - MachineX86 - - - - - - - - - - USBqemu.def - Windows - - - MachineX86 - - - - - - - - - USBqemu.def - Windows - - - MachineX86 + MachineX86 + MachineX64 - true - true - true + true @@ -122,25 +72,17 @@ - true - true - true + true - true - true - true + true - true - true - true + true - true - true - true + true @@ -161,6 +103,5 @@ - - - \ No newline at end of file + + diff --git a/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj b/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj index 7629668134..3548e3121d 100644 --- a/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj +++ b/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.vcxproj @@ -5,98 +5,50 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + - cdvdGigaherz {5CF88D5F-64DD-4EDC-9F1A-436BD502940A} - cdvdGigaherz - + DynamicLibrary - false - MultiByte $(DefaultPlatformToolset) - - - DynamicLibrary - false MultiByte - true - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - + + + - <_ProjectFileVersion>10.0.30319.1 - AllRules.ruleset - - - AllRules.ruleset - - + AllRules.ruleset - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/cdvdGigaherz.tlb - - - - - %(AdditionalIncludeDirectories) - - - - - NDEBUG;%(PreprocessorDefinitions) - + - %(AdditionalDependencies) - .\plugin.def - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/cdvdGigaherz.tlb - - - - - %(AdditionalIncludeDirectories) - - - _DEBUG;%(PreprocessorDefinitions) - - - $(OutDir)$(TargetName)$(TargetExt) - RequireAdministrator .\plugin.def + MachineX86 + MachineX64 @@ -123,6 +75,5 @@ - - - \ No newline at end of file + + diff --git a/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj b/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj index 26b487daed..724a94515e 100644 --- a/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj +++ b/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj @@ -5,96 +5,56 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + - DEV9ghzdrk {BBE4E5FB-530A-4D18-A633-35AF0577B7F3} - DEV9ghzdrk - Win32Proj - + DynamicLibrary - MultiByte - true $(DefaultPlatformToolset) - - - DynamicLibrary MultiByte - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - + + + - <_ProjectFileVersion>10.0.30319.1 - AllRules.ruleset - - - AllRules.ruleset - - + AllRules.ruleset - + - Disabled - EnableFastChecks - MultiThreadedDebug - - - $(SvnRootDir)\common\include;$(SvnRootDir)\3rdparty\winpcap\include;%(AdditionalIncludeDirectories) + $(SolutionDir)common\include;$(SolutionDir)3rdparty\winpcap\include;%(AdditionalIncludeDirectories) - - NDEBUG;%(PreprocessorDefinitions) - 0x0408 - - $(OutDir)$(TargetName)$(TargetExt) .\DEV9ghzdrk.def - false - - - MachineX86 - ws2_32.lib;iphlpapi.lib;wpcap.lib;packet.lib;%(AdditionalDependencies) - $(SolutionDir)3rdparty\winpcap\lib;%(AdditionalLibraryDirectories) - - - - - - - $(SvnRootDir)\common\include;$(SvnRootDir)\3rdparty\winpcap\include;%(AdditionalIncludeDirectories) - - - NDEBUG;%(PreprocessorDefinitions) - 0x0408 - - - DEV9ghzdrk.def - false - - - MachineX86 - $(SolutionDir)3rdparty\winpcap\lib;%(AdditionalLibraryDirectories) + MachineX86 + MachineX64 ws2_32.lib;iphlpapi.lib;wpcap.lib;packet.lib;%(AdditionalDependencies) + $(SolutionDir)3rdparty\winpcap\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)3rdparty\winpcap\lib\x64;%(AdditionalLibraryDirectories) @@ -107,12 +67,10 @@ - true - true + true - true - true + true @@ -131,6 +89,5 @@ - - - \ No newline at end of file + + diff --git a/plugins/dev9null/Windows/DEV9null.vcxproj b/plugins/dev9null/Windows/DEV9null.vcxproj index b14a370c12..bb75071811 100644 --- a/plugins/dev9null/Windows/DEV9null.vcxproj +++ b/plugins/dev9null/Windows/DEV9null.vcxproj @@ -5,82 +5,50 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + - DEV9null {04439C5F-05FB-4A9C-AAD1-5388C25377DB} - DEV9null - Win32Proj - + DynamicLibrary - MultiByte - true $(DefaultPlatformToolset) - - - DynamicLibrary MultiByte - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - + + + - <_ProjectFileVersion>10.0.30319.1 - AllRules.ruleset - - - AllRules.ruleset - - + AllRules.ruleset - - - Disabled - EnableFastChecks - MultiThreadedDebug - - - - - $(OutDir)$(TargetName)$(TargetExt) - DEV9null.def - false - - - MachineX86 - - - - - - - + DEV9null.def - false - - - MachineX86 + MachineX86 + MachineX64 @@ -95,6 +63,5 @@ - - - \ No newline at end of file + + diff --git a/plugins/spu2-x/src/Lowpass.cpp b/plugins/spu2-x/src/Lowpass.cpp index 9aac4e2236..1a0be8c065 100644 --- a/plugins/spu2-x/src/Lowpass.cpp +++ b/plugins/spu2-x/src/Lowpass.cpp @@ -15,8 +15,8 @@ * along with SPU2-X. If not, see . */ -#include "Lowpass.h" #include "Global.h" +#include "Lowpass.h" #include #include diff --git a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj index 3c3a7430b0..4cad4a40d8 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj +++ b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj @@ -5,257 +5,79 @@ DebugStrict Win32 + + DebugStrict + x64 + Debug Win32 + + Debug + x64 + Devel Win32 + + Devel + x64 + Release Win32 + + Release + x64 + - SPU2-X {5307BBB7-EBB9-4AA4-8CB6-A94EC473C8C4} - spu2x - + DynamicLibrary - false - Static - Unicode $(DefaultPlatformToolset) - - - DynamicLibrary - false - Static Unicode - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - Static - Unicode - $(DefaultPlatformToolset) - - - DynamicLibrary - false - Static - Unicode - true - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.30319.1 - false - true - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - $(ProjectName)-dev - false + AllRules.ruleset - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/spu2-x.tlb - - - + + DEBUG_FAST;%(PreprocessorDefinitions) $(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) - FLOAT_SAMPLES;NDEBUG;_USRDLL;%(PreprocessorDefinitions) Async StreamingSIMDExtensions2 - Fast Use Global.h Default - - NDEBUG;%(PreprocessorDefinitions) - 0x0c0a - rpcrt4.lib;winmm.lib;dsound.lib;comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - $(SolutionDir)3rdparty\portaudio;%(AdditionalLibraryDirectories) .\Spu2-X.def - false - MachineX86 - UseLinkTimeCodeGeneration + MachineX86 + MachineX64 - - true - - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/spu2-x.tlb - - - - - $(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) - FLOAT_SAMPLES;_USRDLL;%(PreprocessorDefinitions) - Async - Use - Global.h - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c0a - - - rpcrt4.lib;winmm.lib;dsound.lib;comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - $(SolutionDir)3rdparty\portaudio;%(AdditionalLibraryDirectories) - .\Spu2-X.def - false - false - MachineX86 - - - true - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - - - - - $(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) - FLOAT_SAMPLES;NDEBUG;_USRDLL;%(PreprocessorDefinitions) - Async - StreamingSIMDExtensions2 - Fast - Use - Global.h - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0c0a - - - rpcrt4.lib;winmm.lib;dsound.lib;comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - $(SolutionDir)3rdparty\portaudio;%(AdditionalLibraryDirectories) - .\Spu2-X.def - $(TargetDir)$(TargetName).pdb - - - false - MachineX86 - - - true - - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/spu2-x.tlb - - - - - $(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) - wxUSE_GUI=0;FLOAT_SAMPLES;DEBUG_FAST;_USRDLL;%(PreprocessorDefinitions) - Async - Use - Global.h - - - _DEBUG;%(PreprocessorDefinitions) - 0x0c0a - %(AdditionalIncludeDirectories) - - - rpcrt4.lib;winmm.lib;dsound.lib;comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - %(AdditionalLibraryDirectories) - .\Spu2-X.def - false - false - .\Debug/spu2-x.lib - MachineX86 - - - true - @@ -280,65 +102,14 @@ - Create - Create - Global.h - Create - Global.h - Create - Global.h - - - - - true - - - true - - - true - Default - - - true - Default + Create + - - Default - Default - - - Default - Default - - - - - - - - - - - - - - - true - - - true - - - true - Default - - - true - Default - + + + + @@ -347,71 +118,27 @@ $(DXSDK_DIR)include;%(AdditionalIncludeDirectories) - true - true - true - true + true - - - - true - - - true - - - AssemblyAndSourceCode - true - Default - - - true - Default - + - - - - AssemblyAndSourceCode - true - - - true - - - true - Default - - - true - Default - + - true - true - true - true + true - true - true - true - true + true - - Default - Default - + @@ -427,9 +154,7 @@ - - %(AdditionalIncludeDirectories) - + @@ -453,6 +178,5 @@ - - - \ No newline at end of file + + diff --git a/plugins/xpad/xpad.vcxproj b/plugins/xpad/xpad.vcxproj index a6d71e77f9..576a4c9e3b 100644 --- a/plugins/xpad/xpad.vcxproj +++ b/plugins/xpad/xpad.vcxproj @@ -19,134 +19,43 @@ - xpad {6F3C4136-5801-4EBC-AC6E-37DF6FAB150A} - xpad - Win32Proj - + DynamicLibrary - false - Unicode - true $(DefaultPlatformToolset) - - - DynamicLibrary - false Unicode - $(DefaultPlatformToolset) - - - DynamicLibrary - false - Unicode - true - $(DefaultPlatformToolset) - - - DynamicLibrary - false - Unicode - $(DefaultPlatformToolset) + true + true + false - - - + + - - - - - - - - - - - - - - - - - - - + + - <_ProjectFileVersion>10.0.30319.1 - $(ProjectName)-dbg + AllRules.ruleset - + Use .\xpad.def - - - - - MachineX86 - $(OutDir)$(TargetName)$(TargetExt) - - - - - X64 - - - Use - - - - - - - MachineX64 - - - - - Use - - - .\xpad.def - - - - - MachineX86 - $(OutDir)$(TargetName)$(TargetExt) - - - - - X64 - - - Use - - - - - - - MachineX64 + MachineX86 + MachineX64 - Create - Create - Create - Create + Create @@ -164,11 +73,5 @@ - - - - - - - + diff --git a/tools/bin2cpp/bin2c.vcxproj b/tools/bin2cpp/bin2c.vcxproj index b6065d6d31..8f422111a9 100644 --- a/tools/bin2cpp/bin2c.vcxproj +++ b/tools/bin2cpp/bin2c.vcxproj @@ -5,94 +5,52 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + bin2cpp {677B7D11-D5E1-40B3-88B1-9A4DF83D2213} - bin2c - Win32Proj - - Application - MultiByte - true - $(DefaultPlatformToolset) - - + Application MultiByte $(DefaultPlatformToolset) - - - - - - + - <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)..\bin\ - $(Configuration)\ - true - $(ProjectDir)..\bin\ - $(Configuration)\ - false - AllRules.ruleset - - - AllRules.ruleset - - + $(ProjectDir)..\bin\ + $(Configuration)\ + AllRules.ruleset - + - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue - true Console - MachineX86 - - - - - MaxSpeed - true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 + MachineX86 + MachineX64 - - - \ No newline at end of file + + diff --git a/unfree/baseclasses/baseclasses.vcxproj b/unfree/baseclasses/baseclasses.vcxproj index aa0f1eaced..14f3aceff1 100644 --- a/unfree/baseclasses/baseclasses.vcxproj +++ b/unfree/baseclasses/baseclasses.vcxproj @@ -20,120 +20,34 @@ {27F17499-A372-4408-8AFA-4F9F4584FBD3} - Win32Proj - baseclasses - + StaticLibrary - true $(DefaultPlatformToolset) MultiByte - - - StaticLibrary - false - $(DefaultPlatformToolset) - true - MultiByte - - - StaticLibrary - true - $(DefaultPlatformToolset) - MultiByte - - - StaticLibrary - false - $(DefaultPlatformToolset) - true - MultiByte + true + true + false - - - - - + + - - - - - - - - - - - - - - - - + + + - - + + AllRules.ruleset + + Use - Level3 - Disabled - _DEBUG;_LIB;%(PreprocessorDefinitions) streams.h - - Windows - - - - - Use - Level3 - Disabled - _DEBUG;_LIB;%(PreprocessorDefinitions) - streams.h - - - Windows - - - - - Level3 - Use - MaxSpeed - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - 4996 - streams.h - - - Windows - true - true - - - - - Level3 - Use - MaxSpeed - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - 4996 - streams.h - - - Windows - true - true - @@ -200,6 +114,5 @@ - - - \ No newline at end of file + +