* Mkfiles: Fix genversion include paths.

Thanks to: Brian Gladman for vcproj fixes.

svn path=/trunk/yasm/; revision=1467

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index ebb5702875920e2c39320afa485ff82938a50f52..17c2890563cdcbdf3fd580b2809eb3ba56225ac5 100644 (file)
--- 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 6b357ef7dcdc0a9c4a23771b30797072a82f8dc1..f7d97cd4af47c84768deec6b4f57b87682d2696c 100644 (file)
--- 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 35d1fb87005864a49c20f9799040c8eac5238a02..62e252d377cd374ecdb84e1f33a9f976a52b1e7d 100644 (file)
--- a/Mkfiles/vc/genversion/genversion.vcproj
+++ b/Mkfiles/vc/genversion/genversion.vcproj
@@ -20,6 +20,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\vc8"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -68,6 +69,7 @@
                        CharacterSet="2">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\vc8"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                RuntimeLibrary="4"\r
                                UsePrecompiledHeader="0"\r
@@ -119,6 +121,13 @@
                                RelativePath="..\..\..\modules\preprocs\nasm\genversion.c">\r
                        </File>\r
                </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl">\r
+                       <File\r
+                               RelativePath="..\config.h">\r
+                       </File>\r
+               </Filter>\r
                <File\r
                        RelativePath=".\run.bat">\r
                </File>\r

diff --git a/Mkfiles/vc8/genversion/genversion.vcproj b/Mkfiles/vc8/genversion/genversion.vcproj
index a14cd5e71b1c29abc70ea13cf18e1ad9b6049f32..5d73495bb8937d97548687b37831d5fc948ab424 100644 (file)
--- a/Mkfiles/vc8/genversion/genversion.vcproj
+++ b/Mkfiles/vc8/genversion/genversion.vcproj
@@ -40,6 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\vc8"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -120,6 +121,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="3"\r
+                               AdditionalIncludeDirectories="..\..\vc8"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r
@@ -189,6 +191,15 @@
                                >\r
                        </File>\r
                </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\config.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
                <File\r
                        RelativePath=".\run.bat"\r
                        >\r