ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Target Windows 8 via project settings 

It's needed for the next commit, as thanks to wxWidgets
anything using the precompiled header would default to 0x0600 (Vista)
instead of 0x0602 (Win8).

Now-redundant WINNT definitions resulting in macro redefinition
warnings have been removed.
This commit is contained in:
Silent 2021-07-07 21:13:11 +02:00 committed by Kojin
parent 8841df96c0
commit f343614640
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/vsprops/BaseProperties.props
View File

@ -11,7 +11,7 @@
<ClCompile> <ClCompile>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\3rdparty\wxWidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\3rdparty\wxWidgets3.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__WIN32__;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>__WIN32__;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;WINVER=0x0603;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StructMemberAlignment>16Bytes</StructMemberAlignment> <StructMemberAlignment>16Bytes</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>false</RuntimeTypeInfo> <RuntimeTypeInfo>false</RuntimeTypeInfo>

1
pcsx2/CDVD/CDVDdiscReader.h
View File

@ -19,7 +19,6 @@
#include "IopCommon.h" #include "IopCommon.h"
#if defined(_WIN32) #if defined(_WIN32)
#define _WIN32_WINNT 0x0600
#define NOMINMAX #define NOMINMAX
#include <windows.h> #include <windows.h>
#endif #endif

2
pcsx2/CMakeLists.txt
View File

@ -85,6 +85,8 @@ if(WIN32)
) )
target_compile_definitions(PCSX2 PRIVATE target_compile_definitions(PCSX2 PRIVATE
_M_SSE=0x401 # TODO: Multiple ISA _M_SSE=0x401 # TODO: Multiple ISA
WINVER=0x0603
_WIN32_WINNT=0x0603
WIN32_LEAN_AND_MEAN WIN32_LEAN_AND_MEAN
LZMA_API_STATIC LZMA_API_STATIC
BUILD_DX=1 BUILD_DX=1

2
pcsx2/DEV9/DEV9.cpp
View File

@ -14,8 +14,6 @@
*/ */
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#define WINVER 0x0600
#define _WIN32_WINNT 0x0600
#ifdef _WIN32 #ifdef _WIN32
//#include <winsock2.h> //#include <winsock2.h>

2
pcsx2/DEV9/smap.cpp
View File

@ -15,8 +15,6 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#define WINVER 0x0600
#define _WIN32_WINNT 0x0600
#ifdef _WIN32 #ifdef _WIN32
//#include <winsock2.h> //#include <winsock2.h>
#include <Winioctl.h> #include <Winioctl.h>

2
pcsx2/SPU2/Windows/SndOut_XAudio2.cpp
View File

@ -17,8 +17,6 @@
#include "SPU2/Global.h" #include "SPU2/Global.h"
#include "Dialogs.h" #include "Dialogs.h"
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0602
#include <xaudio2.h> #include <xaudio2.h>
#include <cguid.h> #include <cguid.h>
#include <atlcomcli.h> #include <atlcomcli.h>

1
pcsx2/SPU2/Windows/dsp.cpp
View File

@ -16,7 +16,6 @@
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "SPU2/Global.h" #include "SPU2/Global.h"
#define _WIN32_WINNT 0x0600
#include <windows.h> #include <windows.h>
#include <mmsystem.h> #include <mmsystem.h>

7
tests/ctest/GS/CMakeLists.txt
View File

@ -23,4 +23,11 @@ foreach(isa "sse4" "avx" "avx2")
target_compile_options(swizzle_test_${isa} PRIVATE ${compile_options_${isa}}) target_compile_options(swizzle_test_${isa} PRIVATE ${compile_options_${isa}})
target_compile_definitions(swizzle_test_${isa} PRIVATE ${definitions_${isa}}) target_compile_definitions(swizzle_test_${isa} PRIVATE ${definitions_${isa}})
if(WIN32)
target_compile_definitions(swizzle_test_${isa} PRIVATE
WINVER=0x0603
_WIN32_WINNT=0x0603
WIN32_LEAN_AND_MEAN
)
endif()
endforeach() endforeach()