From: Cedric Venet <cedric.venet@laposte.net>
Date: Sun, 24 Aug 2008 12:30:46 +0000 (+0000)
Subject: Use additionnal include directory instead of ../ in #include.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d85f51abd4deacf9e7a5118bffb21bff2f4a0988;p=oota-llvm.git

Use additionnal include directory instead of ../ in #include.
Suggested by aKor.

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

diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
index d154aafc579..7c03f9da36c 100644
--- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
@@ -15,11 +15,11 @@
 
 #define DEBUG_TYPE "asm-printer"
 #include "X86ATTAsmPrinter.h"
-#include "../X86.h"
-#include "../X86COFF.h"
-#include "../X86MachineFunctionInfo.h"
-#include "../X86TargetMachine.h"
-#include "../X86TargetAsmInfo.h"
+#include "X86.h"
+#include "X86COFF.h"
+#include "X86MachineFunctionInfo.h"
+#include "X86TargetMachine.h"
+#include "X86TargetAsmInfo.h"
 #include "llvm/CallingConv.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
diff --git a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
index ad4d12fcc84..d616accbc3f 100644
--- a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
@@ -16,7 +16,7 @@
 
 #include "X86ATTAsmPrinter.h"
 #include "X86IntelAsmPrinter.h"
-#include "../X86Subtarget.h"
+#include "X86Subtarget.h"
 using namespace llvm;
 
 /// createX86CodePrinterPass - Returns a pass that prints the X86 assembly code
diff --git a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
index 75812f34406..1822c1f914a 100644
--- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
@@ -15,9 +15,9 @@
 
 #define DEBUG_TYPE "asm-printer"
 #include "X86IntelAsmPrinter.h"
-#include "../X86InstrInfo.h"
-#include "../X86TargetAsmInfo.h"
-#include "../X86.h"
+#include "X86InstrInfo.h"
+#include "X86TargetAsmInfo.h"
+#include "X86.h"
 #include "llvm/CallingConv.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
diff --git a/win32/x86/x86.vcproj b/win32/x86/x86.vcproj
index 57cd1b79484..3eea978a5ad 100644
--- a/win32/x86/x86.vcproj
+++ b/win32/x86/x86.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\include;.."
+				AdditionalIncludeDirectories=".;..\..\include;..;..\..\lib\Target\X86"
 				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"
 				MinimalRebuild="true"
@@ -114,7 +114,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;..\..\include;.."
+				AdditionalIncludeDirectories=".;..\..\include;..;..\..\lib\Target\X86"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;WIN32;NDEBUG;_LIB;__STDC_LIMIT_MACROS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -565,10 +565,6 @@
 		<Filter
 			Name="Generated Tablegen Files"
 			>
-			<File
-				RelativePath=".\X86GenFastISel.inc"
-				>
-			</File>
 			<File
 				RelativePath=".\X86GenAsmWriter.inc"
 				>
@@ -581,6 +577,10 @@
 				RelativePath=".\X86GenDAGISel.inc"
 				>
 			</File>
+			<File
+				RelativePath=".\X86GenFastISel.inc"
+				>
+			</File>
 			<File
 				RelativePath=".\X86GenInstrInfo.inc"
 				>