From e896de26275b72e87bc5622eafefd3d0f5990b47 Mon Sep 17 00:00:00 2001
From: Peter Johnson <peter@tortall.net>
Date: Thu, 6 Apr 2006 01:54:07 +0000
Subject: [PATCH] * Mkfiles: Fix genversion include paths.

Thanks to: Brian Gladman for vcproj fixes.

svn path=/trunk/yasm/; revision=1467
---
 Mkfiles/Makefile.dj                      |  2 +-
 Mkfiles/Makefile.flat                    |  2 +-
 Mkfiles/vc/genversion/genversion.vcproj  |  9 +++++++++
 Mkfiles/vc8/genversion/genversion.vcproj | 11 +++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index ebb57028..17c28905 100644
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -151,7 +151,7 @@ nasm-macros.c: modules/preprocs/nasm/standard.mac version.mac genmacro
 modules/preprocs/nasm/nasm-pp.c: nasm-macros.c
 
 genversion: modules/preprocs/nasm/genversion.c
-	$(BUILDCC) -o $@ $<
+	$(BUILDCC) -IMkfiles/dj -o $@ $<
 
 version.mac: genversion
 	./genversion $@
diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index 6b357ef7..f7d97cd4 100644
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -154,7 +154,7 @@ nasm-macros.c: modules/preprocs/nasm/standard.mac version.mac genmacro
 modules/preprocs/nasm/nasm-pp.c: nasm-macros.c
 
 genversion: modules/preprocs/nasm/genversion.c
-	$(BUILDCC) -o $@ $<
+	$(BUILDCC) -IMkfiles -o $@ $<
 
 version.mac: genversion
 	./genversion $@
diff --git a/Mkfiles/vc/genversion/genversion.vcproj b/Mkfiles/vc/genversion/genversion.vcproj
index 35d1fb87..62e252d3 100644
--- a/Mkfiles/vc/genversion/genversion.vcproj
+++ b/Mkfiles/vc/genversion/genversion.vcproj
@@ -20,6 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\..\vc8"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -68,6 +69,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\vc8"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
@@ -119,6 +121,13 @@
 				RelativePath="..\..\..\modules\preprocs\nasm\genversion.c">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\config.h">
+			</File>
+		</Filter>
 		<File
 			RelativePath=".\run.bat">
 		</File>
diff --git a/Mkfiles/vc8/genversion/genversion.vcproj b/Mkfiles/vc8/genversion/genversion.vcproj
index a14cd5e7..5d73495b 100644
--- a/Mkfiles/vc8/genversion/genversion.vcproj
+++ b/Mkfiles/vc8/genversion/genversion.vcproj
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\..\vc8"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -120,6 +121,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="3"
+				AdditionalIncludeDirectories="..\..\vc8"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -189,6 +191,15 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\config.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath=".\run.bat"
 			>