From 66fdbdd18d88d1f296f1486ad93e14311cbf349c Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 12 Aug 2014 17:35:42 -0700 Subject: [PATCH 1/3] Windows: Give SCMRevGen a configuration for x64 instead of Win32. --- Source/Core/Common/SCMRevGen.vcxproj | 17 +++++++++++------ Source/dolphin-emu.sln | 16 ++++++++-------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Source/Core/Common/SCMRevGen.vcxproj b/Source/Core/Common/SCMRevGen.vcxproj index 165f4a307d..d642b0c565 100644 --- a/Source/Core/Common/SCMRevGen.vcxproj +++ b/Source/Core/Common/SCMRevGen.vcxproj @@ -1,16 +1,20 @@ - + - + + Debug + x64 + + Release - Win32 + x64 {41279555-F94F-4EBC-99DE-AF863C10C5C4} - + Utility false v120 @@ -18,7 +22,7 @@ - + @@ -30,7 +34,7 @@ $(BuildRootDir) - + cscript /nologo /E:JScript "make_scmrev.h.js" @@ -39,6 +43,7 @@ + diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index 45599a87a0..29bfb59fc9 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 +VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcxproj", "{47411FDB-1BF2-48D0-AB4E-C7C41160F898}" EndProject @@ -133,10 +133,10 @@ Global {BDB6578B-0691-4E80-A46C-DF21639FD3B8}.Debug|x64.Build.0 = Debug|x64 {BDB6578B-0691-4E80-A46C-DF21639FD3B8}.Release|x64.ActiveCfg = Release|x64 {BDB6578B-0691-4E80-A46C-DF21639FD3B8}.Release|x64.Build.0 = Release|x64 - {41279555-F94F-4EBC-99DE-AF863C10C5C4}.Debug|x64.ActiveCfg = Release|Win32 - {41279555-F94F-4EBC-99DE-AF863C10C5C4}.Debug|x64.Build.0 = Release|Win32 - {41279555-F94F-4EBC-99DE-AF863C10C5C4}.Release|x64.ActiveCfg = Release|Win32 - {41279555-F94F-4EBC-99DE-AF863C10C5C4}.Release|x64.Build.0 = Release|Win32 + {41279555-F94F-4EBC-99DE-AF863C10C5C4}.Debug|x64.ActiveCfg = Debug|x64 + {41279555-F94F-4EBC-99DE-AF863C10C5C4}.Debug|x64.Build.0 = Debug|x64 + {41279555-F94F-4EBC-99DE-AF863C10C5C4}.Release|x64.ActiveCfg = Release|x64 + {41279555-F94F-4EBC-99DE-AF863C10C5C4}.Release|x64.Build.0 = Release|x64 {93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|x64.ActiveCfg = Debug|x64 {93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|x64.Build.0 = Debug|x64 {93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|x64.ActiveCfg = Release|x64 @@ -170,13 +170,12 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {E54CF649-140E-4255-81A5-30A673C1FB36} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {54AA7840-5BEB-4A0C-9452-74BA4CC7FD44} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {160BDC25-5626-4B0D-BDD8-2953D9777FB5} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {6BBD47CF-91FD-4077-B676-8B76980178A9} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {3DE9EE35-3E91-4F27-A014-2866AD8C3FE3} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {E54CF649-140E-4255-81A5-30A673C1FB36} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} - {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {AB993F38-C31D-4897-B139-A620C42BC565} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {31643FDB-1BB8-4965-9DE7-000FC88D35AE} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} @@ -189,8 +188,9 @@ Global {93D73454-2512-424E-9CDA-4BB357FE13DD} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {349EE8F9-7D25-4909-AAF5-FF3FADE72187} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} + {96020103-4BA5-4FD2-B4AA-5B6D24492D4E} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} {EC1A314C-5588-4506-9C1E-2E58E5817F75} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} {A4C423AA-F57C-46C7-A172-D1A777017D29} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} - {96020103-4BA5-4FD2-B4AA-5B6D24492D4E} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} + {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} EndGlobalSection EndGlobal From f1b82a34b260083a63124c60d06c03d9eff1c0a8 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 14 Aug 2014 23:51:13 -0700 Subject: [PATCH 2/3] Windows: Use a shared precompiled header for dolphin code under Source/ --- .../wxWidgets3/build/msw/wx_base.vcxproj | 1 - Source/CMakeLists.txt | 6 +-- Source/Core/AudioCommon/AudioCommon.vcxproj | 6 +-- .../AudioCommon/AudioCommon.vcxproj.filters | 2 - Source/Core/AudioCommon/stdafx.cpp | 5 -- Source/Core/AudioCommon/stdafx.h | 17 ------- Source/Core/Common/CMakeLists.txt | 2 - Source/Core/Common/Common.vcxproj | 6 +-- Source/Core/Common/Common.vcxproj.filters | 2 - Source/Core/Common/stdafx.cpp | 5 -- Source/Core/Common/stdafx.h | 19 -------- Source/Core/Core/CMakeLists.txt | 4 +- Source/Core/Core/Core.vcxproj | 6 +-- Source/Core/Core/Core.vcxproj.filters | 2 - Source/Core/Core/stdafx.cpp | 5 -- Source/Core/Core/stdafx.h | 13 ------ Source/Core/DiscIO/DiscIO.vcxproj | 6 +-- Source/Core/DiscIO/DiscIO.vcxproj.filters | 2 - Source/Core/DiscIO/stdafx.cpp | 8 ---- Source/Core/DiscIO/stdafx.h | 15 ------ Source/Core/DolphinWX/CMakeLists.txt | 4 +- Source/Core/DolphinWX/DolphinWX.vcxproj | 6 +-- .../Core/DolphinWX/DolphinWX.vcxproj.filters | 2 - Source/Core/DolphinWX/stdafx.cpp | 5 -- Source/Core/DolphinWX/stdafx.h | 26 ----------- Source/Core/InputCommon/InputCommon.vcxproj | 6 +-- .../InputCommon/InputCommon.vcxproj.filters | 2 - Source/Core/InputCommon/stdafx.cpp | 5 -- Source/Core/InputCommon/stdafx.h | 16 ------- Source/Core/VideoBackends/D3D/D3D.vcxproj | 6 +-- .../VideoBackends/D3D/D3D.vcxproj.filters | 2 - Source/Core/VideoBackends/D3D/stdafx.cpp | 5 -- Source/Core/VideoBackends/D3D/stdafx.h | 13 ------ Source/Core/VideoBackends/OGL/OGL.vcxproj | 6 +-- .../VideoBackends/OGL/OGL.vcxproj.filters | 2 - Source/Core/VideoBackends/OGL/stdafx.cpp | 5 -- Source/Core/VideoBackends/OGL/stdafx.h | 13 ------ .../VideoBackends/Software/Software.vcxproj | 6 +-- Source/Core/VideoBackends/Software/stdafx.cpp | 5 -- Source/Core/VideoBackends/Software/stdafx.h | 14 ------ Source/Core/VideoCommon/VideoCommon.vcxproj | 6 +-- .../VideoCommon/VideoCommon.vcxproj.filters | 2 - Source/Core/VideoCommon/stdafx.cpp | 5 -- Source/Core/VideoCommon/stdafx.h | 15 ------ Source/DSPTool/DSPTool.vcxproj | 1 + Source/PCH/pch.cpp | 1 + Source/{ => PCH}/pch.h | 31 ++++++++++++- Source/PCH/pch.vcxproj | 46 +++++++++++++++++++ Source/VSProps/Base.props | 6 +-- Source/VSProps/PCHCommon.props | 20 ++++++++ Source/VSProps/PCHCreate.props | 36 +++++++++++++++ Source/VSProps/PCHUse.props | 21 +++++++++ Source/VSProps/PrecompiledHeader.props | 14 ------ Source/VSProps/WXWOverrides.props | 6 ++- Source/dolphin-emu.sln | 7 +++ 55 files changed, 183 insertions(+), 315 deletions(-) delete mode 100644 Source/Core/AudioCommon/stdafx.cpp delete mode 100644 Source/Core/AudioCommon/stdafx.h delete mode 100644 Source/Core/Common/stdafx.cpp delete mode 100644 Source/Core/Common/stdafx.h delete mode 100644 Source/Core/Core/stdafx.cpp delete mode 100644 Source/Core/Core/stdafx.h delete mode 100644 Source/Core/DiscIO/stdafx.cpp delete mode 100644 Source/Core/DiscIO/stdafx.h delete mode 100644 Source/Core/DolphinWX/stdafx.cpp delete mode 100644 Source/Core/DolphinWX/stdafx.h delete mode 100644 Source/Core/InputCommon/stdafx.cpp delete mode 100644 Source/Core/InputCommon/stdafx.h delete mode 100644 Source/Core/VideoBackends/D3D/stdafx.cpp delete mode 100644 Source/Core/VideoBackends/D3D/stdafx.h delete mode 100644 Source/Core/VideoBackends/OGL/stdafx.cpp delete mode 100644 Source/Core/VideoBackends/OGL/stdafx.h delete mode 100644 Source/Core/VideoBackends/Software/stdafx.cpp delete mode 100644 Source/Core/VideoBackends/Software/stdafx.h delete mode 100644 Source/Core/VideoCommon/stdafx.cpp delete mode 100644 Source/Core/VideoCommon/stdafx.h create mode 100644 Source/PCH/pch.cpp rename Source/{ => PCH}/pch.h (51%) create mode 100644 Source/PCH/pch.vcxproj create mode 100644 Source/VSProps/PCHCommon.props create mode 100644 Source/VSProps/PCHCreate.props create mode 100644 Source/VSProps/PCHUse.props delete mode 100644 Source/VSProps/PrecompiledHeader.props diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj b/Externals/wxWidgets3/build/msw/wx_base.vcxproj index 3b0fc54955..09bb56032c 100644 --- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj +++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj @@ -1286,7 +1286,6 @@ - diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 917c00efef..267ceff2be 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -7,7 +7,7 @@ if(ENABLE_PCH) else() set(pch_lib_filename "${CMAKE_CURRENT_BINARY_DIR}/libpch.a") endif() - set(pch_src_filename "${CMAKE_CURRENT_SOURCE_DIR}/pch.h") + set(pch_src_filename "${CMAKE_CURRENT_SOURCE_DIR}/PCH/pch.h") if(APPLE) set(type objective-c++-header) @@ -16,12 +16,12 @@ if(ENABLE_PCH) endif() set_source_files_properties( - pch.h PROPERTIES + PCH/pch.h PROPERTIES COMPILE_FLAGS "-x ${type}" HEADER_FILE_ONLY 0 LANGUAGE CXX) - add_library(pch STATIC pch.h) + add_library(pch STATIC PCH/pch.h) add_custom_command( TARGET pch diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index c1fe0dd5fc..d9030c1ca6 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -31,7 +31,7 @@ - + @@ -42,9 +42,6 @@ - - Create - @@ -65,7 +62,6 @@ - diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters index ffb57727a5..d79b692828 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters @@ -23,7 +23,6 @@ SoundStreams - SoundStreams @@ -50,7 +49,6 @@ SoundStreams - SoundStreams diff --git a/Source/Core/AudioCommon/stdafx.cpp b/Source/Core/AudioCommon/stdafx.cpp deleted file mode 100644 index 0ec820a662..0000000000 --- a/Source/Core/AudioCommon/stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "AudioCommon/stdafx.h" diff --git a/Source/Core/AudioCommon/stdafx.h b/Source/Core/AudioCommon/stdafx.h deleted file mode 100644 index 7257e555ab..0000000000 --- a/Source/Core/AudioCommon/stdafx.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -// Windows Vista is the lowest version we support -// BUT We need to use the headers for Win8+ XAudio2, so Win8 version is used here. -// The XAudio2 code will gracefully fallback to older versions if the new one -// isn't available at runtime. -#define _WIN32_WINNT 0x0602 - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX // Don't include windows min/max definitions - -#include -#include diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 246b5da0e7..aebfc3e7ea 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -54,6 +54,4 @@ if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND (NOT ANDROID)) set(LIBS ${LIBS} rt) endif() -enable_precompiled_headers(stdafx.h stdafx.cpp SRCS) - add_dolphin_library(common "${SRCS}" "${LIBS}") diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 106d925365..bd0f21bcc9 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -31,7 +31,7 @@ - + @@ -69,7 +69,6 @@ - @@ -108,9 +107,6 @@ - - Create - diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters index 3bb9f14958..3070d1c85b 100644 --- a/Source/Core/Common/Common.vcxproj.filters +++ b/Source/Core/Common/Common.vcxproj.filters @@ -63,7 +63,6 @@ Logging - Crypto @@ -114,7 +113,6 @@ Logging - diff --git a/Source/Core/Common/stdafx.cpp b/Source/Core/Common/stdafx.cpp deleted file mode 100644 index f75affca28..0000000000 --- a/Source/Core/Common/stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "Common/stdafx.h" diff --git a/Source/Core/Common/stdafx.h b/Source/Core/Common/stdafx.h deleted file mode 100644 index 33024b3aea..0000000000 --- a/Source/Core/Common/stdafx.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -#if _MSC_FULL_VER < 180030723 -#error Please update your build environment to VS2013 with Update 3 or later! -#endif - -// Windows Vista is the lowest version we support -#define _WIN32_WINNT 0x0600 - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX // Don't include windows min/max definitions - -#include -#include -#include diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index e4a0d6336c..55669cfb0f 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -14,7 +14,6 @@ set(SRCS ActionReplay.cpp NetPlayServer.cpp PatchEngine.cpp State.cpp - stdafx.cpp VolumeHandler.cpp Boot/Boot_BS2Emu.cpp Boot/Boot.cpp @@ -242,8 +241,7 @@ endif(LIBUSB_FOUND) set(LIBS ${LIBS} ${POLARSSL_LIBRARY}) if(WIN32) - set(SRCS ${SRCS} HW/BBA-TAP/TAP_Win32.cpp stdafx.cpp - HW/WiimoteReal/IOWin.cpp) + set(SRCS ${SRCS} HW/BBA-TAP/TAP_Win32.cpp HW/WiimoteReal/IOWin.cpp) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(SRCS ${SRCS} HW/BBA-TAP/TAP_Apple.cpp HW/WiimoteReal/IOdarwin.mm) set(LIBS ${LIBS} diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 064a9b2af3..e775eb741a 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -31,7 +31,7 @@ - + @@ -231,9 +231,6 @@ - - Create - @@ -412,7 +409,6 @@ - diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 85198fece7..ed0f50b635 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -676,7 +676,6 @@ PowerPC\Jit64 - PowerPC\JitILCommon @@ -1195,7 +1194,6 @@ PowerPC\Jit64 - PowerPC\JitILCommon diff --git a/Source/Core/Core/stdafx.cpp b/Source/Core/Core/stdafx.cpp deleted file mode 100644 index b602b39925..0000000000 --- a/Source/Core/Core/stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "stdafx.h" diff --git a/Source/Core/Core/stdafx.h b/Source/Core/Core/stdafx.h deleted file mode 100644 index 4aba74d79f..0000000000 --- a/Source/Core/Core/stdafx.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -// Windows Vista is the lowest version we support -#define _WIN32_WINNT 0x0600 - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX // Don't include windows min/max definitions - -#include diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj index 2da3d00c27..e28d5b784d 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ b/Source/Core/DiscIO/DiscIO.vcxproj @@ -31,7 +31,7 @@ - + @@ -49,9 +49,6 @@ - - Create - @@ -76,7 +73,6 @@ - diff --git a/Source/Core/DiscIO/DiscIO.vcxproj.filters b/Source/Core/DiscIO/DiscIO.vcxproj.filters index e558de08a5..a0294112df 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj.filters +++ b/Source/Core/DiscIO/DiscIO.vcxproj.filters @@ -87,7 +87,6 @@ Volume - @@ -156,7 +155,6 @@ Volume - diff --git a/Source/Core/DiscIO/stdafx.cpp b/Source/Core/DiscIO/stdafx.cpp deleted file mode 100644 index 8ab4b84b8f..0000000000 --- a/Source/Core/DiscIO/stdafx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "DiscIO/stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/Source/Core/DiscIO/stdafx.h b/Source/Core/DiscIO/stdafx.h deleted file mode 100644 index 89cd55b4d8..0000000000 --- a/Source/Core/DiscIO/stdafx.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -// Windows Vista is the lowest version we support -#define _WIN32_WINNT 0x0600 - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX // Don't include windows min/max definitions - -// TODO: reference additional headers your program requires here - -#include diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 302a27df28..41c42658fc 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -98,9 +98,7 @@ set(SRCS ${SRCS} GLInterface/GLInterface.cpp) set(NOGUI_SRCS MainNoGUI.cpp) -if(WIN32) - set(SRCS ${SRCS} stdafx.cpp) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # Link against OS X system frameworks. list(APPEND LIBS ${APPKIT_LIBRARY} diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj index e62e2f2e43..d3aa431313 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj @@ -32,7 +32,7 @@ - + @@ -92,9 +92,6 @@ - - Create - @@ -141,7 +138,6 @@ - diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj.filters b/Source/Core/DolphinWX/DolphinWX.vcxproj.filters index b9910845a8..908f41c1b4 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj.filters +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj.filters @@ -153,7 +153,6 @@ GUI - GUI\Video @@ -277,7 +276,6 @@ GUI - GUI\Video diff --git a/Source/Core/DolphinWX/stdafx.cpp b/Source/Core/DolphinWX/stdafx.cpp deleted file mode 100644 index accdd5e97c..0000000000 --- a/Source/Core/DolphinWX/stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "DolphinWX/stdafx.h" diff --git a/Source/Core/DolphinWX/stdafx.h b/Source/Core/DolphinWX/stdafx.h deleted file mode 100644 index 4ef9e5a486..0000000000 --- a/Source/Core/DolphinWX/stdafx.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -#ifdef _WIN32 - -// Windows Vista is the lowest version we support -#define _WIN32_WINNT 0x0600 - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX // Don't include windows min/max definitions -#include // wxWidgets - -#if defined _M_X86_64 - -#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"") - -#else - -#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") - -#endif - -#endif diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index 85d5bff6db..b1b490c1d7 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -31,7 +31,7 @@ - + @@ -45,9 +45,6 @@ - - Create - @@ -61,7 +58,6 @@ - diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters index e249ed3f79..0d509ca30c 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj.filters +++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters @@ -38,7 +38,6 @@ ControllerInterface - ControllerInterface\ForceFeedback @@ -68,7 +67,6 @@ ControllerInterface - ControllerInterface\ForceFeedback diff --git a/Source/Core/InputCommon/stdafx.cpp b/Source/Core/InputCommon/stdafx.cpp deleted file mode 100644 index d2ad768558..0000000000 --- a/Source/Core/InputCommon/stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "InputCommon/stdafx.h" diff --git a/Source/Core/InputCommon/stdafx.h b/Source/Core/InputCommon/stdafx.h deleted file mode 100644 index 1ae6b686cd..0000000000 --- a/Source/Core/InputCommon/stdafx.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -// Windows Vista is the lowest version we support -// BUT We need to use the headers for Win8+ XInput, so Win8 version is used here. -// The XInput code will gracefully fallback to older versions if the new one -// isn't available at runtime. -#define _WIN32_WINNT 0x0602 - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX // Don't include windows min/max definitions - -#include diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj index 77081ec00a..807018a67a 100644 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj +++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj @@ -31,7 +31,7 @@ - + @@ -50,9 +50,6 @@ - - Create - @@ -75,7 +72,6 @@ - diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters index 21404df5a8..3682937f5d 100644 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters +++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters @@ -67,7 +67,6 @@ Render - @@ -130,6 +129,5 @@ - \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3D/stdafx.cpp b/Source/Core/VideoBackends/D3D/stdafx.cpp deleted file mode 100644 index 195c34a7fe..0000000000 --- a/Source/Core/VideoBackends/D3D/stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "VideoBackends/D3D/stdafx.h" \ No newline at end of file diff --git a/Source/Core/VideoBackends/D3D/stdafx.h b/Source/Core/VideoBackends/D3D/stdafx.h deleted file mode 100644 index 2d22e3c8dc..0000000000 --- a/Source/Core/VideoBackends/D3D/stdafx.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -// Windows Vista is the lowest version we support -#define _WIN32_WINNT 0x0600 - -#define NOMINMAX // Don't include windows min/max definitions - -#include -#include diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj index 5790a2844b..293213cb47 100644 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj +++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj @@ -31,7 +31,7 @@ - + @@ -46,9 +46,6 @@ - - Create - @@ -91,7 +88,6 @@ - diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters index 7d962fa9e0..ad9ec897d5 100644 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters +++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters @@ -56,7 +56,6 @@ - GLExtensions @@ -98,7 +97,6 @@ - GLExtensions diff --git a/Source/Core/VideoBackends/OGL/stdafx.cpp b/Source/Core/VideoBackends/OGL/stdafx.cpp deleted file mode 100644 index a4735a1513..0000000000 --- a/Source/Core/VideoBackends/OGL/stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "VideoBackends/OGL/stdafx.h" \ No newline at end of file diff --git a/Source/Core/VideoBackends/OGL/stdafx.h b/Source/Core/VideoBackends/OGL/stdafx.h deleted file mode 100644 index 2d22e3c8dc..0000000000 --- a/Source/Core/VideoBackends/OGL/stdafx.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -// Windows Vista is the lowest version we support -#define _WIN32_WINNT 0x0600 - -#define NOMINMAX // Don't include windows min/max definitions - -#include -#include diff --git a/Source/Core/VideoBackends/Software/Software.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj index 39732cd845..eb36055da7 100644 --- a/Source/Core/VideoBackends/Software/Software.vcxproj +++ b/Source/Core/VideoBackends/Software/Software.vcxproj @@ -31,7 +31,7 @@ - + @@ -46,9 +46,6 @@ - - Create - @@ -74,7 +71,6 @@ - diff --git a/Source/Core/VideoBackends/Software/stdafx.cpp b/Source/Core/VideoBackends/Software/stdafx.cpp deleted file mode 100644 index dff656a86a..0000000000 --- a/Source/Core/VideoBackends/Software/stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "VideoBackends/Software/stdafx.h" diff --git a/Source/Core/VideoBackends/Software/stdafx.h b/Source/Core/VideoBackends/Software/stdafx.h deleted file mode 100644 index 3ebfc6a7b1..0000000000 --- a/Source/Core/VideoBackends/Software/stdafx.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -// Windows Vista is the lowest version we support -#define _WIN32_WINNT 0x0600 - -#define NOMINMAX // Don't include windows min/max definitions - -#include -#include - diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index a7e8d7d23b..715c2c2521 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -31,7 +31,7 @@ - + @@ -58,9 +58,6 @@ - - Create - @@ -108,7 +105,6 @@ - diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters index cf8611b719..2f4e10ca10 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters @@ -131,7 +131,6 @@ Vertex Loading - Decoding @@ -261,7 +260,6 @@ Vertex Loading - diff --git a/Source/Core/VideoCommon/stdafx.cpp b/Source/Core/VideoCommon/stdafx.cpp deleted file mode 100644 index 29b70f0fe3..0000000000 --- a/Source/Core/VideoCommon/stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "VideoCommon/stdafx.h" diff --git a/Source/Core/VideoCommon/stdafx.h b/Source/Core/VideoCommon/stdafx.h deleted file mode 100644 index 735aea396a..0000000000 --- a/Source/Core/VideoCommon/stdafx.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -#define _WIN32_WINNT 0x501 -#ifndef _WIN32_IE -#define _WIN32_IE 0x0500 // Default value is 0x0400 -#endif - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX // Don't include windows min/max definitions - -#include diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj index 9228e97694..a8cb4b32ba 100644 --- a/Source/DSPTool/DSPTool.vcxproj +++ b/Source/DSPTool/DSPTool.vcxproj @@ -31,6 +31,7 @@ + diff --git a/Source/PCH/pch.cpp b/Source/PCH/pch.cpp new file mode 100644 index 0000000000..17305716aa --- /dev/null +++ b/Source/PCH/pch.cpp @@ -0,0 +1 @@ +#include "pch.h" \ No newline at end of file diff --git a/Source/pch.h b/Source/PCH/pch.h similarity index 51% rename from Source/pch.h rename to Source/PCH/pch.h index a8d687d9c6..46b464a45e 100644 --- a/Source/pch.h +++ b/Source/PCH/pch.h @@ -15,14 +15,16 @@ #include #include #include -#ifndef ANDROID +#if !defined ANDROID && !defined _WIN32 #include #endif #include #include #include #include +#ifndef _WIN32 #include +#endif #include #include #include @@ -35,7 +37,9 @@ #include #include #include +#ifndef _WIN32 #include +#endif #include #include #include @@ -49,11 +53,36 @@ #include #include #include +#ifndef _WIN32 #include +#endif #include #include #include #include +#ifdef _WIN32 + +#if _MSC_FULL_VER < 180030723 +#error Please update your build environment to VS2013 with Update 3 or later! +#endif + +// This numeral indicates the "minimum system required" to run the resulting +// program. Dolphin targets Vista+, so it should be 0x0600. However in practice, +// _WIN32_WINNT just removes up-level API declarations from headers. This is a +// problem for XAudio2 and XInput, where dolphin expects to compile against the +// Win8+ versions of their headers. So while we really need Vista+ level of +// support, we declare Win8+ here globally. If this becomes a problem, the +// higher declaration can be contained to just the XAudio2/XInput related code. +#define _WIN32_WINNT 0x0602 + +// Exclude rarely-used stuff from Windows headers +#define WIN32_LEAN_AND_MEAN +// Don't include windows min/max definitions. They would conflict with the STL. +#define NOMINMAX +#include + +#endif + #include "Common/Common.h" #include "Common/Thread.h" diff --git a/Source/PCH/pch.vcxproj b/Source/PCH/pch.vcxproj new file mode 100644 index 0000000000..8959e7f180 --- /dev/null +++ b/Source/PCH/pch.vcxproj @@ -0,0 +1,46 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {76563A7F-1011-4EAD-B667-7BB18D09568E} + + + + StaticLibrary + v120 + Unicode + + + true + + + false + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 042cd7d6d0..52592e4533 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -59,7 +59,7 @@ true /Zo /volatile:iso /D PSAPI_VERSION=1 /D _M_X86=1 %(AdditionalOptions) /D _ARCH_64=1 /D _M_X86_64=1 %(AdditionalOptions) - ProgramDatabase + OldStyle - - _LIB;%(PreprocessorDefinitions) - true diff --git a/Source/VSProps/PCHCommon.props b/Source/VSProps/PCHCommon.props new file mode 100644 index 0000000000..c2247264b7 --- /dev/null +++ b/Source/VSProps/PCHCommon.props @@ -0,0 +1,20 @@ + + + + + + + + pch.h + + $(BuildRootDir)$(Platform)\$(Configuration)\pch\pch.pch + + + \ No newline at end of file diff --git a/Source/VSProps/PCHCreate.props b/Source/VSProps/PCHCreate.props new file mode 100644 index 0000000000..451a8f71a5 --- /dev/null +++ b/Source/VSProps/PCHCreate.props @@ -0,0 +1,36 @@ + + + + + + + + + Create + + + + + + + + + + + + $(BuildLibTargets);ClearLibCompiled + + + + false + + + + \ No newline at end of file diff --git a/Source/VSProps/PCHUse.props b/Source/VSProps/PCHUse.props new file mode 100644 index 0000000000..b803a9593f --- /dev/null +++ b/Source/VSProps/PCHUse.props @@ -0,0 +1,21 @@ + + + + + + + + + Use + pch.h + + + + + {76563A7F-1011-4EAD-B667-7BB18D09568E} + false + true + true + + + \ No newline at end of file diff --git a/Source/VSProps/PrecompiledHeader.props b/Source/VSProps/PrecompiledHeader.props deleted file mode 100644 index 857a8ca682..0000000000 --- a/Source/VSProps/PrecompiledHeader.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - Use - stdafx.h - - - - \ No newline at end of file diff --git a/Source/VSProps/WXWOverrides.props b/Source/VSProps/WXWOverrides.props index 02163eee5d..213827577f 100644 --- a/Source/VSProps/WXWOverrides.props +++ b/Source/VSProps/WXWOverrides.props @@ -4,13 +4,17 @@ - + + Use wx/wxprec.h Async 4267;%(DisableSpecificWarnings) __WXMSW__;WXBUILDING;%(PreprocessorDefinitions) ..\..\;..\..\include;..\..\..\zlib;..\..\..\libpng + + "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\" %(AdditionalOptions) + \ No newline at end of file diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index 29bfb59fc9..8eef6fcced 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -59,6 +59,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Software", "Core\VideoBacke EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Video Backends", "Video Backends", "{AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pch", "PCH\pch.vcxproj", "{76563A7F-1011-4EAD-B667-7BB18D09568E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -165,6 +167,10 @@ Global {A4C423AA-F57C-46C7-A172-D1A777017D29}.Debug|x64.Build.0 = Debug|x64 {A4C423AA-F57C-46C7-A172-D1A777017D29}.Release|x64.ActiveCfg = Release|x64 {A4C423AA-F57C-46C7-A172-D1A777017D29}.Release|x64.Build.0 = Release|x64 + {76563A7F-1011-4EAD-B667-7BB18D09568E}.Debug|x64.ActiveCfg = Debug|x64 + {76563A7F-1011-4EAD-B667-7BB18D09568E}.Debug|x64.Build.0 = Debug|x64 + {76563A7F-1011-4EAD-B667-7BB18D09568E}.Release|x64.ActiveCfg = Release|x64 + {76563A7F-1011-4EAD-B667-7BB18D09568E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -192,5 +198,6 @@ Global {EC1A314C-5588-4506-9C1E-2E58E5817F75} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} {A4C423AA-F57C-46C7-A172-D1A777017D29} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} + {76563A7F-1011-4EAD-B667-7BB18D09568E} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} EndGlobalSection EndGlobal From 8801289149c8b7d93641121fb98d1c79b304cd2c Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 15 Aug 2014 01:17:10 -0700 Subject: [PATCH 3/3] Windows: Add /Zc:inline to compiler options. --- Source/VSProps/Base.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 52592e4533..79e6777a72 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -57,7 +57,7 @@ false false true - /Zo /volatile:iso /D PSAPI_VERSION=1 /D _M_X86=1 %(AdditionalOptions) + /Zc:inline /Zo /volatile:iso /D PSAPI_VERSION=1 /D _M_X86=1 %(AdditionalOptions) /D _ARCH_64=1 /D _M_X86_64=1 %(AdditionalOptions) OldStyle