Removed a deleted file from the VStudio System project. Also added custom build...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49188 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj
index 457340f151377873178ec3993496e30919c11fef..c450e93c2198e3228dbe61c2f68e16e53e20e760 100644 (file)
--- a/win32/System/System.vcproj
+++ b/win32/System/System.vcproj
@@ -90,7 +90,7 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|x64"
                        OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
@@ -111,17 +111,22 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               RuntimeLibrary="2"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -157,7 +162,7 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
                        OutputDirectory="$(SolutionDir)\bin\$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="4"
@@ -178,22 +183,17 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include;.."
-                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;_DEBUG;_LIB;__STDC_LIMIT_MACROS"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
                                StringPooling="true"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
+                               RuntimeLibrary="2"
                                ForceConformanceInForLoopScope="true"
                                RuntimeTypeInfo="true"
                                UsePrecompiledHeader="0"
                                ProgramDataBaseFileName="$(OutDir)\$(ProjectName).pdb"
-                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="false"
                                DebugInformationFormat="3"
@@ -321,10 +321,6 @@
                                RelativePath="..\..\lib\System\IncludeFile.cpp"
                                >
                        </File>
-                       <File
-                               RelativePath="..\..\lib\System\MappedFile.cpp"
-                               >
-                       </File>
                        <File
                                RelativePath="..\..\lib\System\Memory.cpp"
                                >

diff --git a/win32/x86/x86.vcproj b/win32/x86/x86.vcproj
index 1d894f93500e9120c8baf11b15f577052d4de0c6..b47d559433432ae248a8e9edb98ad49a1c540c08 100644 (file)
--- a/win32/x86/x86.vcproj
+++ b/win32/x86/x86.vcproj
@@ -369,6 +369,28 @@
                                RelativePath="..\..\lib\Target\X86\X86COFF.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\lib\Target\X86\X86CompilationCallback_Win64.asm"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|x64"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               CommandLine="ml64.exe /c /nologo /Fo &quot;$(IntDir)X86CompilationCallback_Win64.obj&quot; /Zi $(InputPath)"
+                                               Outputs="&quot;$(IntDir)X86CompilationCallback_Win64.obj&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|x64"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               CommandLine="ml64.exe /c /nologo /Fo &quot;$(IntDir)X86CompilationCallback_Win64.obj&quot; /Zi $(InputPath)"
+                                               Outputs="&quot;$(IntDir)X86CompilationCallback_Win64.obj&quot;"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File
                                RelativePath="..\..\lib\Target\X86\X86ELFWriterInfo.cpp"
                                >