Fix VC8 build path problem.

Contributed by: Masaru Tsuchiyama <tsuchiyama@asahi-net.email.ne.jp>

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

diff --git a/Mkfiles/vc/genmacro/genmacro.vcproj b/Mkfiles/vc/genmacro/genmacro.vcproj
index 95312035c0141d8c6484e9eb5627320efd51643e..0f18b4bd6b2d6963e25b34c96fc037f8f36fa6be 100644 (file)
--- a/Mkfiles/vc/genmacro/genmacro.vcproj
+++ b/Mkfiles/vc/genmacro/genmacro.vcproj
@@ -13,8 +13,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="Debug"\r
-                       IntermediateDirectory="Debug"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="2">\r
                        <Tool\r

diff --git a/Mkfiles/vc8/genmacro/genmacro.vcproj b/Mkfiles/vc8/genmacro/genmacro.vcproj
index 3a55d9948fb36bc7b6bc5c6a711a64e142c539c3..97ce5249202fe0ae0239b27b87548b89730430eb 100644 (file)
--- a/Mkfiles/vc8/genmacro/genmacro.vcproj
+++ b/Mkfiles/vc8/genmacro/genmacro.vcproj
@@ -20,10 +20,10 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="Debug"\r
-                       IntermediateDirectory="Debug"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -99,10 +99,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="Release"\r
-                       IntermediateDirectory="Release"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -176,10 +176,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -256,10 +256,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r

diff --git a/Mkfiles/vc8/genmodule/genmodule.vcproj b/Mkfiles/vc8/genmodule/genmodule.vcproj
index 2c80b4c25cc4d5191fd45d06bde7581881c88672..ee1dd65b253d588bfdc4a190a5d00e7463a60fd1 100644 (file)
--- a/Mkfiles/vc8/genmodule/genmodule.vcproj
+++ b/Mkfiles/vc8/genmodule/genmodule.vcproj
@@ -19,10 +19,10 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="Debug"\r
-                       IntermediateDirectory="Debug"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -98,10 +98,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="Release"\r
-                       IntermediateDirectory="Release"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -175,10 +175,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -255,10 +255,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r

diff --git a/Mkfiles/vc8/libyasm/libyasm.vcproj b/Mkfiles/vc8/libyasm/libyasm.vcproj
index f9765f0f6d69079a8e2e4485a7332b03dd90684b..3b503d1c69ee93ce7ef27e9d891a92c8a6e7425c 100644 (file)
--- a/Mkfiles/vc8/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc8/libyasm/libyasm.vcproj
@@ -19,10 +19,10 @@
        <Configurations>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory=".\Release"\r
-                       IntermediateDirectory=".\Release"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -52,10 +52,10 @@
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Release/libyasm.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/libyasm.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                CompileAs="0"\r
@@ -73,7 +73,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile=".\Release\libyasm.lib"\r
+                               OutputFile="$(PlatformName)\$(ConfigurationName)\libyasm.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -94,10 +94,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -128,10 +128,10 @@
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Release/libyasm.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/libyasm.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                CompileAs="0"\r
@@ -149,7 +149,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile=".\Release\libyasm.lib"\r
+                               OutputFile="$(PlatformName)\$(ConfigurationName)\libyasm.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -170,10 +170,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory=".\Debug"\r
-                       IntermediateDirectory=".\Debug"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -201,10 +201,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Debug/libyasm.pch"\r
-                               AssemblerListingLocation=".\Debug/"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName=".\Debug/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/libyasm.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
@@ -223,7 +223,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile=".\Debug\libyasm.lib"\r
+                               OutputFile="$(PlatformName)\$(ConfigurationName)\libyasm.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -244,10 +244,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="x64\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -276,10 +276,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Debug/libyasm.pch"\r
-                               AssemblerListingLocation=".\Debug/"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName=".\Debug/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/libyasm.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -298,7 +298,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile=".\Debug\libyasm.lib"\r
+                               OutputFile="$(PlatformName)\$(ConfigurationName)\libyasm.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r

diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index 2dbf6d082688cefce120c82fdfb7ddf65d726028..9bbc8999a5dace6a21a0c00b9b9743775f690172 100644 (file)
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -19,10 +19,10 @@
        <Configurations>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory=".\Release"\r
-                       IntermediateDirectory=".\Release"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -53,10 +53,10 @@
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Release/modules.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/modules.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                CompileAs="0"\r
@@ -74,7 +74,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile=".\Release\modules.lib"\r
+                               OutputFile="$(PlatformName)\$(ConfigurationName)\modules.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -95,10 +95,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -130,10 +130,10 @@
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Release/modules.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/modules.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                CompileAs="0"\r
@@ -151,7 +151,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile=".\Release\modules.lib"\r
+                               OutputFile="$(PlatformName)\$(ConfigurationName)\modules.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -172,10 +172,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory=".\Debug"\r
-                       IntermediateDirectory=".\Debug"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -203,10 +203,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Debug/modules.pch"\r
-                               AssemblerListingLocation=".\Debug/"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName=".\Debug/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/modules.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
@@ -225,7 +225,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile=".\Debug\modules.lib"\r
+                               OutputFile="$(PlatformName)\$(ConfigurationName)\modules.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -246,10 +246,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -278,10 +278,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Debug/modules.pch"\r
-                               AssemblerListingLocation=".\Debug/"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName=".\Debug/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/modules.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -300,7 +300,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile=".\Debug\modules.lib"\r
+                               OutputFile="$(PlatformName)\$(ConfigurationName)\modules.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r

diff --git a/Mkfiles/vc8/re2c/re2c.vcproj b/Mkfiles/vc8/re2c/re2c.vcproj
index bc0061af58520527702f2f46865a019dc17a6d2a..0d4b383013f60cec256354d8b886c4fb45690e59 100644 (file)
--- a/Mkfiles/vc8/re2c/re2c.vcproj
+++ b/Mkfiles/vc8/re2c/re2c.vcproj
@@ -20,10 +20,10 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="Debug"\r
-                       IntermediateDirectory="Debug"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -100,10 +100,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -181,10 +181,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="Release"\r
-                       IntermediateDirectory="Release"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -259,10 +259,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="..\..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 8\VC\VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r

diff --git a/Mkfiles/vc8/yasm.vcproj b/Mkfiles/vc8/yasm.vcproj
index ffcb61f03d9a26cdca24a971cc7a0fd320167142..3f32b314e51bd2b0beacfe3b2866c250f0aeeaea 100644 (file)
--- a/Mkfiles/vc8/yasm.vcproj
+++ b/Mkfiles/vc8/yasm.vcproj
@@ -19,10 +19,10 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory=".\Debug"\r
-                       IntermediateDirectory=".\Debug"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -41,7 +41,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TypeLibraryName=".\Debug/yasm.tlb"\r
+                               TypeLibraryName="$(PlatformName)\$(ConfigurationName)/yasm.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
@@ -52,10 +52,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Debug/yasm.pch"\r
-                               AssemblerListingLocation=".\Debug/"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName=".\Debug/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/yasm.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
@@ -74,11 +74,11 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile=".\Debug/yasm.exe"\r
+                               OutputFile="$(PlatformName)\$(ConfigurationName)/yasm.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile=".\Debug/yasm.pdb"\r
+                               ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/yasm.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -109,10 +109,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -132,7 +132,7 @@
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetEnvironment="3"\r
-                               TypeLibraryName=".\Debug/yasm.tlb"\r
+                               TypeLibraryName="$(PlatformName)\$(ConfigurationName)/yasm.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
@@ -143,10 +143,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Debug/yasm.pch"\r
-                               AssemblerListingLocation=".\Debug/"\r
-                               ObjectFile=".\Debug/"\r
-                               ProgramDataBaseFileName=".\Debug/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/yasm.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -169,7 +169,7 @@
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile=".\Debug/yasm.pdb"\r
+                               ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/yasm.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="17"\r
                        />\r
@@ -200,10 +200,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory=".\Release"\r
-                       IntermediateDirectory=".\Release"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -222,7 +222,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TypeLibraryName=".\Release/yasm.tlb"\r
+                               TypeLibraryName="$(PlatformName)\$(ConfigurationName)/yasm.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
@@ -235,10 +235,10 @@
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Release/yasm.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/yasm.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                CompileAs="0"\r
@@ -256,10 +256,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile=".\Release/yasm.exe"\r
+                               OutputFile="$(PlatformName)\$(ConfigurationName)/yasm.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               ProgramDatabaseFile=".\Release/yasm.pdb"\r
+                               ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/yasm.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -290,10 +290,10 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="x64\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="UpgradeFromVC71.vsprops"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -313,7 +313,7 @@
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetEnvironment="3"\r
-                               TypeLibraryName=".\Release/yasm.tlb"\r
+                               TypeLibraryName="$(PlatformName)\$(ConfigurationName)/yasm.tlb"\r
                                HeaderFileName=""\r
                        />\r
                        <Tool\r
@@ -326,10 +326,10 @@
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile=".\Release/yasm.pch"\r
-                               AssemblerListingLocation=".\Release/"\r
-                               ObjectFile=".\Release/"\r
-                               ProgramDataBaseFileName=".\Release/"\r
+                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/yasm.pch"\r
+                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
+                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
+                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                CompileAs="0"\r
@@ -350,7 +350,7 @@
                                OutputFile="$(OutDir)\yasm.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               ProgramDatabaseFile=".\Release/yasm.pdb"\r
+                               ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/yasm.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="17"\r
                        />\r