X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=win32%2FTableGen%2FTableGen.vcproj;h=7c802acc48fcbaa0d698a95e60ac087f6494d1ac;hb=9247d0b12b092654680a08289ed740cbd2f94366;hp=9c2291896fbd0c52be188beeaa5ce94d239980b7;hpb=ae7b071d7ad10023fbba210f432036523a5619d1;p=oota-llvm.git

diff --git a/win32/TableGen/TableGen.vcproj b/win32/TableGen/TableGen.vcproj
index 9c2291896fb..7c802acc48f 100644
--- a/win32/TableGen/TableGen.vcproj
+++ b/win32/TableGen/TableGen.vcproj
@@ -12,15 +12,16 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
+			OutputDirectory="..\Debug"
 			IntermediateDirectory="Debug"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
+				AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
+        PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
+				StringPooling="TRUE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -31,7 +32,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="4"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -66,14 +67,15 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
+			OutputDirectory="..\Release"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\include;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
+				AdditionalIncludeDirectories="..\..\include;..;..\..\utils\tablegen"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;__STDC_LIMIT_MACROS"
+				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
@@ -81,7 +83,7 @@
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="FALSE"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4146,4800"/>
+				DisableSpecificWarnings="4355,4146,4800"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -132,25 +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"
-						Description="Performing flex"
-						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"
-						Description="Performing flex"
-						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
@@ -159,35 +162,31 @@
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Performing bison"
-						CommandLine="..\tools\bison -pFile -tdo$(InputDir)$(InputName).cpp $(InputPath)
-move $(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"
-						Description="Performing bison"
-						CommandLine="..\tools\bison -pFile -tdo$(InputDir)$(InputName).cpp $(InputPath)
-move $(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>
@@ -215,10 +214,10 @@ move $(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">
@@ -226,6 +225,9 @@ move $(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>
@@ -234,7 +236,7 @@ move $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
 			Name="Generated Files"
 			Filter="">
 			<File
-				RelativePath="..\..\utils\TableGen\FileLexer.cpp">
+				RelativePath="FileLexer.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -249,7 +251,7 @@ move $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\fileparser.cpp">
+				RelativePath="fileparser.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -264,7 +266,7 @@ move $(InputDir)$(InputName).hpp $(InputDir)$(InputName).h
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\utils\TableGen\fileparser.h">
+				RelativePath="fileparser.h">
 			</File>
 		</Filter>
 	</Files>