diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-03-28 17:50:32 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-03-28 17:50:32 +0000 |
| commit | da07d04da9b5eba1be8d4d909568932c440b844a (patch) | |
| tree | d0227f98287f71bffce557abbb33853d94cab889 /Source/Core | |
| parent | b20f2c17af166a2619ac801a394533a5448a121d (diff) | |
Add precompiled headers back...I like being able to compile in less than 2 hours, kthx
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2780 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/AudioCommon/AudioCommon.vcproj | 4 | ||||
| -rw-r--r-- | Source/Core/Common/Common.vcproj | 100 | ||||
| -rw-r--r-- | Source/Core/Common/Src/stdafx.cpp | 18 | ||||
| -rw-r--r-- | Source/Core/Common/Src/stdafx.h | 35 | ||||
| -rw-r--r-- | Source/Core/Core/Core.vcproj | 114 | ||||
| -rw-r--r-- | Source/Core/Core/Src/stdafx.cpp | 18 | ||||
| -rw-r--r-- | Source/Core/Core/Src/stdafx.h | 25 |
7 files changed, 267 insertions, 47 deletions
diff --git a/Source/Core/AudioCommon/AudioCommon.vcproj b/Source/Core/AudioCommon/AudioCommon.vcproj index 72fa38fd81..ee39204101 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcproj +++ b/Source/Core/AudioCommon/AudioCommon.vcproj @@ -462,6 +462,10 @@ >
</File>
<File
+ RelativePath=".\Src\SConscript"
+ >
+ </File>
+ <File
RelativePath=".\Src\WaveFile.cpp"
>
</File>
diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj index 4cb9181449..c86cb67f28 100644 --- a/Source/Core/Common/Common.vcproj +++ b/Source/Core/Common/Common.vcproj @@ -51,12 +51,12 @@ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -124,12 +124,12 @@ RuntimeLibrary="1"
BufferSecurityCheck="false"
FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -191,18 +191,18 @@ EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2"
AdditionalIncludeDirectories="../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="0"
RuntimeTypeInfo="false"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -265,18 +265,18 @@ EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="0"
FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -337,16 +337,16 @@ Optimization="3"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;DEBUGFAST;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;DEBUGFAST;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -408,15 +408,15 @@ Optimization="3"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;DEBUGFAST;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;DEBUGFAST;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0"
FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
+ PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -721,6 +721,62 @@ >
</File>
<File
+ RelativePath=".\Src\stdafx.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DebugFast|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DebugFast|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\Src\stdafx.h"
+ >
+ </File>
+ <File
RelativePath=".\Src\StringUtil.cpp"
>
</File>
diff --git a/Source/Core/Common/Src/stdafx.cpp b/Source/Core/Common/Src/stdafx.cpp new file mode 100644 index 0000000000..1dc71df3a9 --- /dev/null +++ b/Source/Core/Common/Src/stdafx.cpp @@ -0,0 +1,18 @@ +// Copyright (C) 2003-2008 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "stdafx.h" diff --git a/Source/Core/Common/Src/stdafx.h b/Source/Core/Common/Src/stdafx.h new file mode 100644 index 0000000000..546a643aae --- /dev/null +++ b/Source/Core/Common/Src/stdafx.h @@ -0,0 +1,35 @@ +// Copyright (C) 2003-2008 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#pragma once + +#ifndef _WIN32_WINNT + #define _WIN32_WINNT 0x501 +#endif +#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 _CRT_SECURE_NO_DEPRECATE 1 +#define _CRT_NONSTDC_NO_DEPRECATE 1 + +#include <windows.h> +#include <tchar.h> +#include <vector> + diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj index 2f8ecd5790..545c87efa9 100644 --- a/Source/Core/Core/Core.vcproj +++ b/Source/Core/Core/Core.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9.00"
+ Version="9,00"
Name="Core"
ProjectGUID="{F0B874CB-4476-4199-9315-8343D05AE684}"
RootNamespace="Core"
@@ -52,12 +52,11 @@ RuntimeLibrary="1"
BufferSecurityCheck="true"
FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="4"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -123,12 +122,11 @@ RuntimeLibrary="1"
BufferSecurityCheck="true"
FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -198,12 +196,11 @@ BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -275,12 +272,11 @@ BufferSecurityCheck="false"
EnableEnhancedInstructionSet="0"
FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -349,12 +345,11 @@ BufferSecurityCheck="true"
EnableEnhancedInstructionSet="2"
FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -423,12 +418,11 @@ RuntimeLibrary="0"
BufferSecurityCheck="false"
FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -498,12 +492,11 @@ BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -575,12 +568,11 @@ BufferSecurityCheck="false"
EnableEnhancedInstructionSet="0"
FloatingPointModel="0"
- UsePrecompiledHeader="0"
- PrecompiledHeaderThrough=""
+ UsePrecompiledHeader="2"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
DebugInformationFormat="3"
- ForcedIncludeFiles=""
+ ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -2301,6 +2293,78 @@ >
</File>
<File
+ RelativePath=".\Src\stdafx.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DebugFast|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="DebugFast|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_JITIL|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_JITIL|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\Src\stdafx.h"
+ >
+ </File>
+ <File
RelativePath=".\Src\Tracer.cpp"
>
</File>
diff --git a/Source/Core/Core/Src/stdafx.cpp b/Source/Core/Core/Src/stdafx.cpp new file mode 100644 index 0000000000..d1a69e47c1 --- /dev/null +++ b/Source/Core/Core/Src/stdafx.cpp @@ -0,0 +1,18 @@ +// Copyright (C) 2003-2008 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "stdafx.h"
\ No newline at end of file diff --git a/Source/Core/Core/Src/stdafx.h b/Source/Core/Core/Src/stdafx.h new file mode 100644 index 0000000000..04922bcb2e --- /dev/null +++ b/Source/Core/Core/Src/stdafx.h @@ -0,0 +1,25 @@ +// Copyright (C) 2003-2008 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#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 |
