Fix branches on FP compares

[oota-llvm.git] / win32 / TableGen / TableGen.vcproj

diff --git a/win32/TableGen/TableGen.vcproj b/win32/TableGen/TableGen.vcproj
index ad872d192ffab726d12bc36a0e76424a3201f7d2..485061bdbe413e430a3095db72f5c49d7082cf05 100644 (file)
--- a/win32/TableGen/TableGen.vcproj
+++ b/win32/TableGen/TableGen.vcproj
@@ -12,32 +12,34 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="Debug"
+                       OutputDirectory="..\Debug"
                        IntermediateDirectory="Debug"
                        ConfigurationType="1"
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\include;.."
+                               AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
+                               StringPooling="TRUE"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
                                ForceConformanceInForLoopScope="TRUE"
                                RuntimeTypeInfo="TRUE"
                                UsePrecompiledHeader="0"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="FALSE"
                                DebugInformationFormat="4"
-                               DisableSpecificWarnings="4146,4800"/>
+                               DisableSpecificWarnings="4355,4146,4800"/>
                        <Tool
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)\TableGen.exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="C:\Project\llvm\win32\Debug"
+                               AdditionalLibraryDirectories=""
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/TableGen.pdb"
                                SubSystem="1"
@@ -45,8 +47,7 @@
                        <Tool
                                Name="VCMIDLTool"/>
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="copy $(OutDir)\TableGen.exe ..\tools"/>
+                               Name="VCPostBuildEventTool"/>
                        <Tool
                                Name="VCPreBuildEventTool"/>
                        <Tool
@@ -66,29 +67,30 @@
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="Release"
+                       OutputDirectory="..\Release"
                        IntermediateDirectory="Release"
                        ConfigurationType="1"
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\..\include;.."
+                               AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
+                               StringPooling="TRUE"
                                RuntimeLibrary="2"
                                ForceConformanceInForLoopScope="TRUE"
                                RuntimeTypeInfo="TRUE"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
-                               Detect64BitPortabilityProblems="TRUE"
+                               Detect64BitPortabilityProblems="FALSE"
                                DebugInformationFormat="3"
-                               DisableSpecificWarnings="4146,4800"/>
+                               DisableSpecificWarnings="4355,4146,4800"/>
                        <Tool
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)\TableGen.exe"
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="C:\Project\llvm\win32\Release"
+                               AdditionalLibraryDirectories=""
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"
@@ -97,8 +99,7 @@
                        <Tool
                                Name="VCMIDLTool"/>
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="copy $(OutDir)\TableGen.exe ..\tools"/>
+                               Name="VCPostBuildEventTool"/>
                        <Tool
                                Name="VCPreBuildEventTool"/>
                        <Tool
@@ -133,23 +134,26 @@
                        <File
                                RelativePath="..\..\utils\TableGen\CodeGenTarget.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\utils\TableGen\DAGISelEmitter.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\utils\TableGen\FileLexer.l">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               CommandLine="..\tools\flex -t &gt;$(InputDir)$(InputName).cpp $(InputPath)
-"
-                                               Outputs="$(InputDir)$(InputName).cpp"/>
+                                               Description="Flexing $(InputFileName)"
+                                               CommandLine="..\doflex.cmd debug $(InputName) $(InputPath)"
+                                               Outputs="$(InputName).cpp"/>
                                </FileConfiguration>
                                <FileConfiguration
                                        Name="Release|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               CommandLine="..\tools\flex -t &gt;$(InputDir)$(InputName).cpp $(InputPath)
-"
-                                               Outputs="$(InputDir)$(InputName).cpp"/>
+                                               Description="Flexing $(InputFileName)"
+                                               CommandLine="..\doflex.cmd release $(InputName) $(InputPath)"
+                                               Outputs="$(InputName).cpp"/>
                                </FileConfiguration>
                        </File>
                        <File
@@ -158,33 +162,31 @@
                                        Name="Debug|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               CommandLine="..\tools\bison -pFile -tdo$(InputDir)$(InputName).cpp $(InputPath)
-copy $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
-"
-                                               Outputs="$(InputDir)$(InputName).cpp;$(InputDir)$(InputName).h"/>
+                                               Description="Bisoning $(InputFileName)"
+                                               CommandLine="..\dobison.cmd File debug $(InputName) $(InputPath)"
+                                               Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"/>
                                </FileConfiguration>
                                <FileConfiguration
                                        Name="Release|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               CommandLine="..\tools\bison -pFile -tdo$(InputDir)$(InputName).cpp $(InputPath)
-copy $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
-"
-                                               Outputs="$(InputDir)$(InputName).cpp;$(InputDir)$(InputName).h"/>
+                                               Description="Bisoning $(InputFileName)"
+                                               CommandLine="..\dobison.cmd File release $(InputName) $(InputPath)"
+                                               Outputs="$(InputName).cpp;$(InputName).h;$(InputName).output"/>
                                </FileConfiguration>
                        </File>
                        <File
                                RelativePath="..\..\utils\TableGen\InstrInfoEmitter.cpp">
                        </File>
-                       <File
-                               RelativePath="..\..\utils\TableGen\InstrSelectorEmitter.cpp">
-                       </File>
                        <File
                                RelativePath="..\..\utils\TableGen\Record.cpp">
                        </File>
                        <File
                                RelativePath="..\..\utils\TableGen\RegisterInfoEmitter.cpp">
                        </File>
+                       <File
+                               RelativePath="..\..\utils\TableGen\SubtargetEmitter.cpp">
+                       </File>
                        <File
                                RelativePath="..\..\utils\TableGen\TableGen.cpp">
                        </File>
@@ -212,10 +214,10 @@ copy $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
                                RelativePath="..\..\utils\TableGen\CodeGenTarget.h">
                        </File>
                        <File
-                               RelativePath="..\..\utils\TableGen\InstrInfoEmitter.h">
+                               RelativePath="..\..\utils\TableGen\DAGISelEmitter.h">
                        </File>
                        <File
-                               RelativePath="..\..\utils\TableGen\InstrSelectorEmitter.h">
+                               RelativePath="..\..\utils\TableGen\InstrInfoEmitter.h">
                        </File>
                        <File
                                RelativePath="..\..\utils\TableGen\Record.h">
@@ -223,6 +225,9 @@ copy $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
                        <File
                                RelativePath="..\..\utils\TableGen\RegisterInfoEmitter.h">
                        </File>
+                       <File
+                               RelativePath="..\..\utils\TableGen\SubtargetEmitter.h">
+                       </File>
                        <File
                                RelativePath="..\..\utils\TableGen\TableGenBackend.h">
                        </File>
@@ -231,7 +236,7 @@ copy $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
                        Name="Generated Files"
                        Filter="">
                        <File
-                               RelativePath="..\..\utils\TableGen\FileLexer.cpp">
+                               RelativePath="FileLexer.cpp">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
@@ -246,7 +251,7 @@ copy $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\utils\TableGen\fileparser.cpp">
+                               RelativePath="fileparser.cpp">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        <Tool
@@ -261,7 +266,7 @@ copy $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\utils\TableGen\fileparser.h">
+                               RelativePath="fileparser.h">
                        </File>
                </Filter>
        </Files>