diff --git a/3rdparty/baseclasses/baseclasses.vcxproj b/3rdparty/baseclasses/baseclasses.vcxproj index c3ad517a51..c935b7a01e 100644 --- a/3rdparty/baseclasses/baseclasses.vcxproj +++ b/3rdparty/baseclasses/baseclasses.vcxproj @@ -48,6 +48,8 @@ Use streams.h + false + false diff --git a/3rdparty/fmt/fmt.vcxproj b/3rdparty/fmt/fmt.vcxproj index 723187077f..b3c49dd517 100644 --- a/3rdparty/fmt/fmt.vcxproj +++ b/3rdparty/fmt/fmt.vcxproj @@ -60,6 +60,10 @@ Level3 $(ProjectDir)/fmt/include/;$(ProjectDir)/fmt/src/;%(AdditionalIncludeDirectories) stdcpp17 + false + false + false + false diff --git a/3rdparty/freetype/builds/windows/freetype.vcxproj b/3rdparty/freetype/builds/windows/freetype.vcxproj index 0be7de0831..54a04fb818 100644 --- a/3rdparty/freetype/builds/windows/freetype.vcxproj +++ b/3rdparty/freetype/builds/windows/freetype.vcxproj @@ -51,6 +51,8 @@ _CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) Level4 4001 + false + false MachineX86 @@ -113,4 +115,4 @@ - + \ No newline at end of file diff --git a/3rdparty/libjpeg/libjpeg.vcxproj b/3rdparty/libjpeg/libjpeg.vcxproj index 2eae669f74..4105ee7cf0 100644 --- a/3rdparty/libjpeg/libjpeg.vcxproj +++ b/3rdparty/libjpeg/libjpeg.vcxproj @@ -53,6 +53,26 @@ AllRules.ruleset + + + false + + + + + false + + + + + false + + + + + false + + @@ -119,4 +139,4 @@ - + \ 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 3eb692cd68..cf9d894d6b 100644 --- a/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj +++ b/3rdparty/libpng/projects/vstudio/libpng/libpng.vcxproj @@ -61,6 +61,10 @@ 4996;4127 $(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories) true + false + false + false + false @@ -89,4 +93,4 @@ - + \ No newline at end of file diff --git a/3rdparty/libsamplerate/libsamplerate.vcxproj b/3rdparty/libsamplerate/libsamplerate.vcxproj index 10ab3da667..33f9333856 100644 --- a/3rdparty/libsamplerate/libsamplerate.vcxproj +++ b/3rdparty/libsamplerate/libsamplerate.vcxproj @@ -101,7 +101,7 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSAMPLERATE_EXPORTS;%(PreprocessorDefinitions) - true + false EnableFastChecks MultiThreadedDebug @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSAMPLERATE_EXPORTS;%(PreprocessorDefinitions) - true + false EnableFastChecks MultiThreadedDebug diff --git a/3rdparty/portaudio/build/msvc/portaudio.vcxproj b/3rdparty/portaudio/build/msvc/portaudio.vcxproj index 5cb0d77d5b..e6d854fcb8 100644 --- a/3rdparty/portaudio/build/msvc/portaudio.vcxproj +++ b/3rdparty/portaudio/build/msvc/portaudio.vcxproj @@ -85,6 +85,14 @@ 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) + false + false + false + false + false + false + false + false ksuser.lib @@ -157,4 +165,4 @@ - + \ No newline at end of file diff --git a/3rdparty/pthreads4w/build/pthreads4w.vcxproj b/3rdparty/pthreads4w/build/pthreads4w.vcxproj index b28eb70645..daa4c7521c 100644 --- a/3rdparty/pthreads4w/build/pthreads4w.vcxproj +++ b/3rdparty/pthreads4w/build/pthreads4w.vcxproj @@ -57,6 +57,10 @@ HAVE_PTW32_CONFIG_H;PTW32_BUILD_INLINED;%(PreprocessorDefinitions) + false + false + false + false ..\include;%(AdditionalIncludeDirectories) @@ -86,4 +90,4 @@ - + \ No newline at end of file diff --git a/3rdparty/soundtouch/SoundTouch.vcxproj b/3rdparty/soundtouch/SoundTouch.vcxproj index 2885aeae27..3ada618b65 100644 --- a/3rdparty/soundtouch/SoundTouch.vcxproj +++ b/3rdparty/soundtouch/SoundTouch.vcxproj @@ -55,6 +55,10 @@ $(ProjectDir)soundtouch;%(AdditionalIncludeDirectories) + false + false + false + false @@ -93,4 +97,4 @@ - + \ 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 673ac8333f..b9220e556d 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_adv.vcxproj @@ -52,6 +52,26 @@ AllRules.ruleset + + + false + + + + + false + + + + + false + + + + + false + + @@ -187,4 +207,4 @@ - + \ 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 35588d40b6..74f16b3485 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_base.vcxproj @@ -55,6 +55,10 @@ wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) + false + false + false + false @@ -380,4 +384,4 @@ - + \ 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 f2a2ebb0af..5205dd4813 100644 --- a/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj +++ b/3rdparty/wxwidgets3.0/build/msw/wx30_core.vcxproj @@ -55,6 +55,10 @@ wxUSE_BASE=0;%(PreprocessorDefinitions) + false + false + false + false @@ -1251,4 +1255,4 @@ - + \ No newline at end of file diff --git a/3rdparty/xz/liblzma.vcxproj b/3rdparty/xz/liblzma.vcxproj index e56bd2874b..39e788fe59 100644 --- a/3rdparty/xz/liblzma.vcxproj +++ b/3rdparty/xz/liblzma.vcxproj @@ -34,7 +34,7 @@ - + @@ -50,6 +50,8 @@ HAVE_CONFIG_H;%(PreprocessorDefinitions) Level3 $(ProjectDir);xz/src/liblzma/common;xz/src/common;xz/src/liblzma/api;xz/src/liblzma/check;xz/src/liblzma/delta;xz/src/liblzma/lz;xz/src/liblzma/lzma;xz/src/liblzma/rangecoder;xz/src/liblzma/simple + false + false @@ -198,4 +200,4 @@ - + \ No newline at end of file diff --git a/3rdparty/yaml-cpp/yaml.vcxproj b/3rdparty/yaml-cpp/yaml.vcxproj index ecee74f2be..70eb0cee7f 100644 --- a/3rdparty/yaml-cpp/yaml.vcxproj +++ b/3rdparty/yaml-cpp/yaml.vcxproj @@ -65,6 +65,10 @@ true true Default + false + false + false + false diff --git a/3rdparty/zlib/zlib.vcxproj b/3rdparty/zlib/zlib.vcxproj index c599076962..fb0b17c603 100644 --- a/3rdparty/zlib/zlib.vcxproj +++ b/3rdparty/zlib/zlib.vcxproj @@ -57,6 +57,10 @@ _CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) Level3 + false + false + false + false @@ -90,4 +94,4 @@ - + \ No newline at end of file diff --git a/common/build/Utilities/utilities.vcxproj b/common/build/Utilities/utilities.vcxproj index 1eae85f2a5..b5a58d6f36 100644 --- a/common/build/Utilities/utilities.vcxproj +++ b/common/build/Utilities/utilities.vcxproj @@ -58,6 +58,10 @@ Async Use PrecompiledHeader.h + false + false + false + false @@ -154,4 +158,4 @@ - + \ No newline at end of file diff --git a/common/build/x86emitter/x86emitter.vcxproj b/common/build/x86emitter/x86emitter.vcxproj index fedc793706..9a8f7d2f53 100644 --- a/common/build/x86emitter/x86emitter.vcxproj +++ b/common/build/x86emitter/x86emitter.vcxproj @@ -57,6 +57,10 @@ Use PrecompiledHeader.h + false + false + false + false @@ -114,4 +118,4 @@ - + \ No newline at end of file diff --git a/pcsx2/PAD/Windows/Global.h b/pcsx2/PAD/Windows/Global.h index 449c7ccdcb..bf98d6e2ae 100644 --- a/pcsx2/PAD/Windows/Global.h +++ b/pcsx2/PAD/Windows/Global.h @@ -98,12 +98,6 @@ extern Window GSwin; #define _CRT_SECURE_NO_DEPRECATE #endif -#ifdef _MSC_VER -#define EXPORT_C_(type) extern "C" type CALLBACK -#else -#define EXPORT_C_(type) extern "C" __attribute__((stdcall, externally_visible, visibility("default"))) type CALLBACK -#endif - #ifdef _MSC_VER #define _WIN32_WINNT 0x0600 #define NOMINMAX diff --git a/pcsx2/PAD/Windows/PAD.cpp b/pcsx2/PAD/Windows/PAD.cpp index 5249673ceb..28f92e5709 100644 --- a/pcsx2/PAD/Windows/PAD.cpp +++ b/pcsx2/PAD/Windows/PAD.cpp @@ -52,7 +52,6 @@ Display *GSdsp; Window GSwin; #else -HINSTANCE hInst; HWND hWnd; HWND hWndTop; diff --git a/pcsx2/windows/VCprojects/pcsx2.vcxproj b/pcsx2/windows/VCprojects/pcsx2.vcxproj index 7e53b69fdf..4749928cca 100644 --- a/pcsx2/windows/VCprojects/pcsx2.vcxproj +++ b/pcsx2/windows/VCprojects/pcsx2.vcxproj @@ -69,6 +69,10 @@ PCSX2_DEVEL;PCSX2_DEVBUILD;NDEBUG;_SECURE_SCL_=1;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;BUILD_DX=1;%(PreprocessorDefinitions) NDEBUG;_SECURE_SCL_=0;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;BUILD_DX=1;%(PreprocessorDefinitions) NDEBUG;_SECURE_SCL_=0;WIN32_LEAN_AND_MEAN;SPU2X_PORTAUDIO;BUILD_DX=1;%(PreprocessorDefinitions) + false + false + false + false Yes