izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #797 from shuffle2/msvc-pch

Browse Source 
Windows: Use a shared precompiled header for dolphin code under Source/
This commit is contained in:
shuffle2
2014-08-16 14:58:28 -07:00
parent bc1d9056cc 8801289149
commit 2270c3e90a
56 changed files with 203 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Externals/wxWidgets3/build/msw/wx_base.vcxproj
Vendored
-1
View File
@@ -1286,7 +1286,6 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\..\Source\VSProps\Base.props" />
<Import Project="..\..\..\..\Source\VSProps\PrecompiledHeader.props" />
<Import Project="..\..\..\..\Source\VSProps\WXWOverrides.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
Source/CMakeLists.txt
+3 -3
View File
@@ -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
Source/Core/AudioCommon/AudioCommon.vcxproj
+1 -5
View File
@@ -31,7 +31,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\VSProps\Base.props" />
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
<Import Project="..\..\VSProps\PCHUse.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemGroup>
@@ -42,9 +42,6 @@
<ClCompile Include="Mixer.cpp" />
<ClCompile Include="NullSoundStream.cpp" />
<ClCompile Include="OpenALStream.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="WaveFile.cpp" />
<ClCompile Include="XAudio2Stream.cpp" />
<ClCompile Include="XAudio2_7Stream.cpp">
@@ -65,7 +62,6 @@
<ClInclude Include="OpenSLESStream.h" />
<ClInclude Include="PulseAudioStream.h" />
<ClInclude Include="SoundStream.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="WaveFile.h" />
<ClInclude Include="XAudio2Stream.h" />
<ClInclude Include="XAudio2_7Stream.h" />
Source/Core/AudioCommon/AudioCommon.vcxproj.filters
-2
View File
@@ -23,7 +23,6 @@
<ClCompile Include="XAudio2Stream.cpp">
<Filter>SoundStreams</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp" />
<ClCompile Include="XAudio2_7Stream.cpp">
<Filter>SoundStreams</Filter>
</ClCompile>
@@ -50,7 +49,6 @@
<ClInclude Include="XAudio2Stream.h">
<Filter>SoundStreams</Filter>
</ClInclude>
<ClInclude Include="stdafx.h" />
<ClInclude Include="XAudio2_7Stream.h">
<Filter>SoundStreams</Filter>
</ClInclude>
Source/Core/AudioCommon/stdafx.cpp
-5
View File
@@ -1,5 +0,0 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "AudioCommon/stdafx.h"
Source/Core/AudioCommon/stdafx.h
-17
View File
@@ -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 <algorithm>
#include <functional>
Source/Core/Common/CMakeLists.txt
-2
View File
@@ -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}")
Source/Core/Common/Common.vcxproj
+1 -5
View File
@@ -31,7 +31,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\VSProps\Base.props" />
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
<Import Project="..\..\VSProps\PCHUse.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemGroup>
@@ -69,7 +69,6 @@
<ClInclude Include="PcapFile.h" />
<ClInclude Include="SDCardUtil.h" />
<ClInclude Include="SettingsHandler.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="StdConditionVariable.h" />
<ClInclude Include="StdMakeUnique.h" />
<ClInclude Include="StdMutex.h" />
@@ -108,9 +107,6 @@
<ClCompile Include="PcapFile.cpp" />
<ClCompile Include="SDCardUtil.cpp" />
<ClCompile Include="SettingsHandler.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="StringUtil.cpp" />
<ClCompile Include="SymbolDB.cpp" />
<ClCompile Include="SysConf.cpp" />
Source/Core/Common/Common.vcxproj.filters
-2
View File
@@ -63,7 +63,6 @@
<ClInclude Include="Logging\LogManager.h">
<Filter>Logging</Filter>
</ClInclude>
<ClInclude Include="stdafx.h" />
<ClInclude Include="Crypto\ec.h">
<Filter>Crypto</Filter>
</ClInclude>
@@ -114,7 +113,6 @@
<ClCompile Include="Logging\LogManager.cpp">
<Filter>Logging</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp" />
<ClCompile Include="XSaveWorkaround.cpp" />
<ClCompile Include="GekkoDisassembler.cpp" />
</ItemGroup>
Source/Core/Common/SCMRevGen.vcxproj
+11 -6
View File
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{41279555-F94F-4EBC-99DE-AF863C10C5C4}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<PropertyGroup Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
@@ -18,7 +22,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\VSProps\Base.props" />
</ImportGroup>
@@ -30,7 +34,7 @@
<PropertyGroup>
<OutDir>$(BuildRootDir)</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ItemDefinitionGroup>
<PreBuildEvent>
<Command>cscript /nologo /E:JScript "make_scmrev.h.js"</Command>
</PreBuildEvent>
@@ -39,6 +43,7 @@
<None Include="make_scmrev.h.js" />
</ItemGroup>
<ItemGroup>
<!-- force_rebuild.h is a non-existent file used to "trick" msbuild into always re-running this project. -->
<ClInclude Include="force_rebuild.h" />
<ClInclude Include="scmrev.h" />
</ItemGroup>
Source/Core/Common/stdafx.cpp
-5
View File
@@ -1,5 +0,0 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/stdafx.h"
Source/Core/Common/stdafx.h
-19
View File
@@ -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 <tchar.h>
#include <vector>
#include <Windows.h>
Source/Core/Core/CMakeLists.txt
+1 -3
View File
@@ -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}
Source/Core/Core/Core.vcxproj
+1 -5
View File
@@ -31,7 +31,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\VSProps\Base.props" />
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
<Import Project="..\..\VSProps\PCHUse.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemGroup>
@@ -231,9 +231,6 @@
<ClCompile Include="PowerPC\Profiler.cpp" />
<ClCompile Include="PowerPC\SignatureDB.cpp" />
<ClCompile Include="State.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="VolumeHandler.cpp" />
<ClCompile Include="x64MemTools.cpp" />
</ItemGroup>
@@ -412,7 +409,6 @@
<ClInclude Include="PowerPC\Profiler.h" />
<ClInclude Include="PowerPC\SignatureDB.h" />
<ClInclude Include="State.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="VolumeHandler.h" />
</ItemGroup>
<ItemGroup>
Source/Core/Core/Core.vcxproj.filters
-2
View File
@@ -676,7 +676,6 @@
<ClCompile Include="PowerPC\Jit64\JitRegCache.cpp">
<Filter>PowerPC\Jit64</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp" />
<ClCompile Include="PowerPC\JitILCommon\JitILBase_Branch.cpp">
<Filter>PowerPC\JitILCommon</Filter>
</ClCompile>
@@ -1195,7 +1194,6 @@
<ClInclude Include="PowerPC\Jit64\JitAsm.h">
<Filter>PowerPC\Jit64</Filter>
</ClInclude>
<ClInclude Include="stdafx.h" />
<ClInclude Include="PowerPC\JitILCommon\JitILBase.h">
<Filter>PowerPC\JitILCommon</Filter>
</ClInclude>
Source/Core/Core/stdafx.cpp
-5
View File
@@ -1,5 +0,0 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "stdafx.h"
Source/Core/Core/stdafx.h
-13
View File
@@ -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 <algorithm>
Source/Core/DiscIO/DiscIO.vcxproj
+1 -5
View File
@@ -31,7 +31,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\VSProps\Base.props" />
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
<Import Project="..\..\VSProps\PCHUse.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemGroup>
@@ -49,9 +49,6 @@
<ClCompile Include="Filesystem.cpp" />
<ClCompile Include="FileSystemGCWii.cpp" />
<ClCompile Include="NANDContentLoader.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="VolumeCommon.cpp" />
<ClCompile Include="VolumeCreator.cpp" />
<ClCompile Include="VolumeDirectory.cpp" />
@@ -76,7 +73,6 @@
<ClInclude Include="Filesystem.h" />
<ClInclude Include="FileSystemGCWii.h" />
<ClInclude Include="NANDContentLoader.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="Volume.h" />
<ClInclude Include="VolumeCreator.h" />
<ClInclude Include="VolumeDirectory.h" />
Source/Core/DiscIO/DiscIO.vcxproj.filters
-2
View File
@@ -87,7 +87,6 @@
<ClCompile Include="VolumeWiiCrypted.cpp">
<Filter>Volume</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="DiscScrubber.h">
@@ -156,7 +155,6 @@
<ClInclude Include="VolumeWiiCrypted.h">
<Filter>Volume</Filter>
</ClInclude>
<ClInclude Include="stdafx.h" />
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
Source/Core/DiscIO/stdafx.cpp
-8
View File
@@ -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

Some files were not shown because too many files have changed in this diff Show More