VC8 build files cleanup. Also combines yasm32.rules and yasm64.rules into single...

Works for native Win32 builds, Win32->x64 cross builds, and native x64 builds.

Submitted by: Brian Gladman <brg@gladman.plus.com>

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

diff --git a/Mkfiles/vc8/genmacro/genmacro.vcproj b/Mkfiles/vc8/genmacro/genmacro.vcproj
index 97ce5249202fe0ae0239b27b87548b89730430eb..d7c8ba91904d6d9900aa6ff50d794e8df933646f 100644 (file)
--- a/Mkfiles/vc8/genmacro/genmacro.vcproj
+++ b/Mkfiles/vc8/genmacro/genmacro.vcproj
@@ -11,9 +11,6 @@
                <Platform\r
                        Name="Win32"\r
                />\r
-               <Platform\r
-                       Name="x64"\r
-               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
@@ -23,7 +20,6 @@
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -49,9 +45,11 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -64,10 +62,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/genmacro.exe"\r
+                               OutputFile="$(OutDir)\genmacro.exe"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/genmacro.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -102,7 +100,6 @@
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -122,12 +119,15 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -142,7 +142,8 @@
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)/genmacro.exe"\r
                                LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="false"\r
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
@@ -174,164 +175,6 @@
                                CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
                        />\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/genmacro.exe"\r
-                               LinkIncremental="2"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/genmacro.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64"\r
-                               RuntimeLibrary="0"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/genmacro.exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
-                       />\r
-               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r

diff --git a/Mkfiles/vc8/genmodule/genmodule.vcproj b/Mkfiles/vc8/genmodule/genmodule.vcproj
index ee1dd65b253d588bfdc4a190a5d00e7463a60fd1..aa376e419aeb50e4882e48cdf7e5848ebde9e965 100644 (file)
--- a/Mkfiles/vc8/genmodule/genmodule.vcproj
+++ b/Mkfiles/vc8/genmodule/genmodule.vcproj
@@ -10,9 +10,6 @@
                <Platform\r
                        Name="Win32"\r
                />\r
-               <Platform\r
-                       Name="x64"\r
-               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
@@ -22,7 +19,6 @@
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -48,9 +44,12 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -63,10 +62,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/genmodule.exe"\r
+                               OutputFile="$(OutDir)\genmodule.exe"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/genmodule.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -101,7 +100,6 @@
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -121,12 +119,16 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;FILTERMODE"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -139,9 +141,10 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/genmodule.exe"\r
+                               OutputFile="$(OutDir)\genmodule.exe"\r
                                LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="false"\r
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
@@ -173,164 +176,6 @@
                                CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
                        />\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="_DEBUG;_CONSOLE;FILTERMODE;WIN64"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/genmodule.exe"\r
-                               LinkIncremental="2"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/genmodule.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CONSOLE;FILTERMODE;WIN64"\r
-                               RuntimeLibrary="0"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/genmodule.exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
-                       />\r
-               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r

diff --git a/Mkfiles/vc8/libyasm/libyasm.vcproj b/Mkfiles/vc8/libyasm/libyasm.vcproj
index 3b503d1c69ee93ce7ef27e9d891a92c8a6e7425c..d2db99d881a58bdb5d41f8885698c0a551fb20e9 100644 (file)
--- a/Mkfiles/vc8/libyasm/libyasm.vcproj
+++ b/Mkfiles/vc8/libyasm/libyasm.vcproj
@@ -4,7 +4,6 @@
        Version="8.00"\r
        Name="libyasm"\r
        ProjectGUID="{29FE7874-1256-4AD6-B889-68E399DC9608}"\r
-       SignManifests="true"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -22,7 +21,6 @@
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -44,18 +42,17 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="0"\r
                                AdditionalIncludeDirectories="..,../../.."\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_LIB;HAVE_CONFIG_H"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/libyasm.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                CompileAs="0"\r
@@ -73,7 +70,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(PlatformName)\$(ConfigurationName)\libyasm.lib"\r
+                               OutputFile="$(OutDir)\libyasm.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -120,18 +117,18 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="0"\r
                                AdditionalIncludeDirectories="..,../../.."\r
                                PreprocessorDefinitions="NDEBUG;_LIB;HAVE_CONFIG_H;WIN64"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/libyasm.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                CompileAs="0"\r
@@ -149,7 +146,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(PlatformName)\$(ConfigurationName)\libyasm.lib"\r
+                               OutputFile="$(OutDir)\libyasm.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -173,7 +170,6 @@
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -201,10 +197,9 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/libyasm.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
@@ -223,7 +218,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(PlatformName)\$(ConfigurationName)\libyasm.lib"\r
+                               OutputFile="$(OutDir)\libyasm.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -245,7 +240,7 @@
                <Configuration\r
                        Name="Debug|x64"\r
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="x64\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
@@ -276,10 +271,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/libyasm.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -298,7 +293,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(PlatformName)\$(ConfigurationName)\libyasm.lib"\r
+                               OutputFile="$(OutDir)\libyasm.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r

diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index f11b7e0b476ec9653393e686abd0c9bf428ef5af..4ba99f0ca491c61de1afc28265306ea71c095698 100644 (file)
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -22,14 +22,13 @@
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cmd &lt;build.bat"\r
+                               CommandLine="cmd &lt; build.bat"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -45,18 +44,18 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="0"\r
                                AdditionalIncludeDirectories="..,../../.."\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_LIB;HAVE_CONFIG_H"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/modules.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                CompileAs="0"\r
@@ -74,7 +73,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(PlatformName)\$(ConfigurationName)\modules.lib"\r
+                               OutputFile="$(OutDir)\modules.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -122,18 +121,18 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="0"\r
                                AdditionalIncludeDirectories="..,../../.."\r
                                PreprocessorDefinitions="NDEBUG;_LIB;HAVE_CONFIG_H;WIN64"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/modules.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                CompileAs="0"\r
@@ -151,7 +150,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(PlatformName)\$(ConfigurationName)\modules.lib"\r
+                               OutputFile="$(OutDir)\modules.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -175,13 +174,13 @@
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
+                               CommandLine="cmd &lt; build.bat"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -203,10 +202,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/modules.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
@@ -225,7 +224,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(PlatformName)\$(ConfigurationName)\modules.lib"\r
+                               OutputFile="$(OutDir)\modules.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -278,10 +277,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/modules.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -300,7 +299,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="$(PlatformName)\$(ConfigurationName)\modules.lib"\r
+                               OutputFile="$(OutDir)\modules.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r

diff --git a/Mkfiles/vc8/re2c/re2c.vcproj b/Mkfiles/vc8/re2c/re2c.vcproj
index 0d4b383013f60cec256354d8b886c4fb45690e59..4e2e9f875f50aeb350a81756c2c572072f29b190 100644 (file)
--- a/Mkfiles/vc8/re2c/re2c.vcproj
+++ b/Mkfiles/vc8/re2c/re2c.vcproj
@@ -11,9 +11,6 @@
                <Platform\r
                        Name="Win32"\r
                />\r
-               <Platform\r
-                       Name="x64"\r
-               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
@@ -23,7 +20,6 @@
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -50,9 +46,11 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -68,7 +66,7 @@
                                OutputFile="$(OutDir)/re2c.exe"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/re2c.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -98,93 +96,11 @@
                                CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
                        />\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..,../../.."\r
-                               PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN64"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/re2c.exe"\r
-                               LinkIncremental="2"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/re2c.pdb"\r
-                               SubSystem="1"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
-                       />\r
-               </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        CharacterSet="2"\r
                        >\r
                        <Tool\r
@@ -204,13 +120,16 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
                                AdditionalIncludeDirectories="..,../../.."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="0"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -225,7 +144,8 @@
                                Name="VCLinkerTool"\r
                                OutputFile="$(OutDir)/re2c.exe"\r
                                LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="false"\r
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
@@ -257,85 +177,6 @@
                                CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
                        />\r
                </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..,../../.."\r
-                               PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN64"\r
-                               RuntimeLibrary="0"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               OutputFile="$(OutDir)/re2c.exe"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                               CommandLine="run.bat &quot;$(TargetPath)&quot;"\r
-                       />\r
-               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r

diff --git a/Mkfiles/vc8/readme.vc8.txt b/Mkfiles/vc8/readme.vc8.txt
index 15b9ce6002ae4ded57881f911b418fb6988f2e81..05c2a39e1b8ef1031dac8a2bf3cdb929303d0ba8 100644 (file)
--- a/Mkfiles/vc8/readme.vc8.txt
+++ b/Mkfiles/vc8/readme.vc8.txt
@@ -2,23 +2,20 @@
 Building YASM with Microsoft Visual Studio 2005\r
 -----------------------------------------------\r
 \r
-This note describes how to build YASM for AMD64 and \r
-EM64T systems using Microsoft Visual Studio 2005. \r
+This note describes how to build YASM using Microsoft Visual Studio 2005.\r
 \r
 1. The Compiler\r
 ---------------\r
 \r
-If you want to build the 64-bit version of YASM you \r
-will need to install the Visual Studio .NET 64-bit \r
-native or cross compiler tools (these tools are not \r
-installed by default).\r
+If you want to build the 64-bit version of YASM you will need to install\r
+the Visual Studio 2005 64-bit tools, which are not installed by default.\r
 \r
 2. YASM Download\r
 ----------------\r
 \r
-The following files are not built on VC++ and are not \r
-contained in the YASM subversion repository (but they \r
-are included in the nightly YASM snapshots):\r
+The following files are not built on VC++ and are not contained in the\r
+YASM subversion repository (but they are included in the nightly YASM\r
+snapshots):\r
 \r
     gas-bison.c\r
     gas-bison.h\r
@@ -27,88 +24,95 @@ are included in the nightly YASM snapshots):
     re2c-parser.c\r
     re2c-parser.h\r
 \r
-If you wish to build from the latest files in the \r
-subversion repository, you will need to add these files \r
-from the latest snapshot to the repository files.\r
+If you wish to build from the latest files in the subversion repository,\r
+you will need to add these files from the latest snapshot to the repository\r
+files. They should be placed in the YASM root directory.\r
 \r
 3. Building YASM with Microsoft VC8\r
 -----------------------------------\r
 \r
-First YASM needs to be downloaded and the files placed \r
-within a suitable directory, which will be called <yasm> \r
-here but can be named and located as you wish. If the \r
-Visual Studio 2005 project files have been obtained \r
-seperately the subdirectory 'vc8' and its subdirectories \r
-and files need to be placed in the 'Mkfiles' subdirectory \r
-within the YASM root directory.\r
-\r
-If building from the subversion repository, obtain the \r
-additional files discussed above and place them in the \r
-YASM root directory.\r
-   \r
-Now locate and double click on the yasm.sln solution file in \r
-the 'Mkfiles/vc8' subdirectory to open the build project in \r
-the Visual Studio 2005 IDE and then select:\r
+First YASM needs to be downloaded and the files placed within a suitable\r
+directory, which will be called <yasm> here but can be named and located\r
+as you wish. If the Visual Studio 2005 project files have been obtained\r
+seperately the subdirectory 'vc8' and its subdirectories and files need to\r
+be placed in the 'Mkfiles' subdirectory within the YASM root directory.\r
+\r
+If building from the subversion repository, obtain the additional files\r
+discussed above and place them in the YASM root directory.\r
+\r
+Now locate and double click on the yasm.sln solution file in the 'Mkfiles/vc8'\r
+subdirectory to open the build project in the Visual Studio 2005 IDE and then\r
+select:\r
 \r
     win32 or x64 build\r
     release or debug build\r
-    \r
-as appropriate to build the YASM binaries that you need.  \r
 \r
-4. Using YASM with Visual C++ version 8\r
----------------------------------------\r
+as appropriate to build the YASM binaries that you need.\r
+\r
+4. Using YASM with Visual Sudio 2005 and VC++ version 8\r
+-------------------------------------------------------\r
+\r
+1. Firstly you need to locate the directory (or directories) where the VC++\r
+compiler binaries are located and put copies of the appropriate yasm.exe\r
+binary in these directories.\r
 \r
-1. Firstly you need to locate the directory (or directories) \r
-where the VC++ compiler binaries are located and put copies of \r
-the yasm.exe binary in these directories. \r
+On a win32 system you will use the win32 version of YASM. On an x64 system\r
+you can use either the 32 or the 64 bit versions.  The win32 YASM binary\r
+should be placed in the 32-bit VC++ binary directory, which is typically\r
+located at:\r
 \r
-On a win32 system you will use the win32 version of YASM. On \r
-an x64 system you will need to put the win32 YASM binary in the \r
-32-bit VC++ binary directory, which is typically located at:\r
+ Program Files (x86)\Microsoft Visual Studio 8\VC\bin\r
 \r
-    Program Files (x86)\Microsoft Visual Studio 8\VC\bin\r
+If needed the 64-bit YASM binary should be places in the 64-bit tools\r
+binary directory, which is typically at:\r
 \r
-and the 64-bit YASM binary in in the 64-bit tools binary\r
-directory, which is typically:\r
+ Program Files\Microsoft Visual Studio 8\VC\bin\r
 \r
-    Program Files\Microsoft Visual Studio 8\VC\bin\r
+2. To use the new custom tools facility in Visual Studio 2005, you need to\r
+place a copy of the yasm.rules file in the Visual Studio 2005 VC project\r
+defaults directory, which is typically located at:\r
 \r
-2. To use the new custom tools facility in VC++ .NET 2005 you need \r
-to place copies of the yasm32.rules and yasm32.rules files in the \r
-vc8 directory in the VC++ 'VCProjectDefaults' directory that is \r
-typically:\r
+ Program Files (x86)\Microsoft Visual Studio 8\VC\VCProjectDefaults\r
 \r
-  Program Files (x86)\Microsoft Visual Studio 8\VC\VCProjectDefaults\r
+This allows you to configure YASM as an assembler within the VC++ IDE. To\r
+use YASM in a project, right click on the project in the Solution Explorer\r
+and select 'Custom Build Rules..'. This will give you a dialog box that\r
+allows you to select YASM as an assembler (note that your assembler files\r
+need to have the extension '.asm').\r
 \r
-This allows you to configure YASM as an assembler within the VC++ \r
-IDE. To use YASM in a project, right click on the project in the \r
-Solution Explorer and select 'Custom Build Rules..'. This will give\r
-you a dialog box that allows you to select YASM as a 32 or 64 bit \r
-assembler (your assembler files need to have the extension '.asm').\r
+To assemble a file with YASM, select the Property Page for the file and the\r
+select 'Yasm Assembler' in the Tool dialog entry. Then click 'Apply' and an\r
+additional property page entry will appear and enable YASM settings to be\r
+established.\r
 \r
-To assemble a file with YASM, select the Property Page for the file\r
-and the select 'Yasm Assembler' in the Tool dialog entry and set the\r
-appropriate properties.\r
+As alternative to placing the yasm.rules files as described above is to set\r
+the rules file path in the Visual Studio 2005 settings dialogue.\r
+\r
+It is also important to note that the rules file passes the symbols 'Win32'\r
+or 'x64' to YASM by using the Visual Studio 2005  $(PlatformName) macro in\r
+order to obtain either a 32 or a 64 bit assembler mode. This is a recent\r
+enhancement to YASM so you will need to be sure that your YASM files are at\r
+revision r1331 or higher to use this facility.\r
 \r
 5. A Linker Issue\r
 -----------------\r
 \r
-There appears to be a linker bug in the VC++ v8 linker that prevents \r
-symbols with absolute addresses being linked in DLL builds.  This\r
-means, for example, that LEA instructions of the general form:\r
+There appears to be a linker bug in the VC++ v8 linker that prevents symbols\r
+with absolute addresses being linked in DLL builds.  This means, for example,\r
+that LEA instructions of the general form:\r
 \r
    lea, rax,[rax+symbol]\r
-   \r
-cannot be used for DLL builds.  The following general form has to be\r
-used instead:\r
+\r
+cannot be used for DLL builds.  The following general form has to be used\r
+instead:\r
 \r
    lea rcx,[symbol wrt rip]\r
    lea rax,[rax+rcx]\r
-   \r
-This limitation may also cause problems with other instruction that \r
-use absolute addresses.\r
 \r
-I am most grateful for the fantastic support that Peter Johnson, YASM's \r
+This limitation may also cause problems with other instruction that use\r
+absolute addresses.\r
+\r
+I am most grateful for the fantastic support that Peter Johnson, YASM's\r
 creator, has given me in tracking down this issue.\r
 \r
-  Brian Gladman, 22nd December 2005\r
+  Brian Gladman, 16th January 2006\r

diff --git a/Mkfiles/vc8/yasm32.rules b/Mkfiles/vc8/yasm.rules
similarity index 68%
rename from Mkfiles/vc8/yasm32.rules
rename to Mkfiles/vc8/yasm.rules
index 32bb2677c78424ff42a63efc7af9667d7a61dcc7..2e5f901f0c9b128d6597feef07a5e03062e8c364 100644 (file)
--- a/Mkfiles/vc8/yasm32.rules
+++ b/Mkfiles/vc8/yasm.rules
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <VisualStudioToolFile\r
-       Name="Yasm (32-bit)"\r
+       Name="Yasm"\r
        Version="8.00"\r
        >\r
        <Rules>\r
                <CustomBuildRule\r
-                       Name="YASM32"\r
-                       DisplayName="Yasm Assembler (32-bit mode)"\r
-                       CommandLine="yasm -Xvc -f win32 [ListFileName] [Defines] [UnDefines] [IncludePaths] [ObjectFileName] [inputs]"\r
+                       Name="YASM"\r
+                       DisplayName="Yasm Assembler"\r
+                       CommandLine="yasm -Xvc -f $(PlatformName) [ListFileName] [Defines] [UnDefines] [IncludePaths] [ObjectFileName] [inputs]"\r
                        Outputs="[$ObjectFileName]"\r
                        FileExtensions="*.asm"\r
                        ExecutionDescription="Assembling ..."\r
@@ -18,14 +18,14 @@
                                        Name="Defines"\r
                                        DisplayName="Preprocessor Definitions"\r
                                        Description="Preprocessor Definitions"\r
-                                       Switch="-D[value]"\r
+                                       Switch="-D [value]"\r
                                        Delimited="true"\r
                                        Inheritable="true"\r
                                />\r
                                <StringProperty\r
                                        Name="IncludePaths"\r
                                        DisplayName="Include Paths"\r
-                                       Switch="-i&quot;[value]\&quot;"\r
+                                       Switch="-i &quot;[value]&quot;"\r
                                        Delimited="true"\r
                                        Inheritable="true"\r
                                />\r
@@ -33,24 +33,25 @@
                                        Name="UnDefines"\r
                                        DisplayName="Remove Preprocessor Definitions"\r
                                        Description="Undefine"\r
-                                       Switch="-u[value]"\r
+                                       Switch="-u [value]"\r
                                        Delimited="true"\r
                                        Inheritable="true"\r
                                />\r
                                <StringProperty\r
                                        Name="ObjectFileName"\r
                                        DisplayName="Object File Name"\r
-                                       Switch="-o&quot;[value]&quot;"\r
+                                       Switch="-o &quot;[value]&quot;"\r
+                                       DefaultValue="&quot;$(IntDir)\$(InputName).obj&quot;"\r
                                />\r
                                <StringProperty\r
                                        Name="ListFileName"\r
                                        DisplayName="List File Name"\r
-                                       Switch="-l&quot;[value]&quot;"\r
+                                       Switch="-l &quot;[value]&quot;"\r
                                />\r
                                <StringProperty\r
                                        Name="PreIncludeFile"\r
                                        DisplayName="Pre Include File"\r
-                                       Switch="-p&quot;[value]&quot;"\r
+                                       Switch="-p &quot;[value]&quot;"\r
                                />\r
                        </Properties>\r
                </CustomBuildRule>\r

diff --git a/Mkfiles/vc8/yasm.vcproj b/Mkfiles/vc8/yasm.vcproj
index 3f32b314e51bd2b0beacfe3b2866c250f0aeeaea..66233bb217e3c3f86c8f58ccdd8350db20fceb4f 100644 (file)
--- a/Mkfiles/vc8/yasm.vcproj
+++ b/Mkfiles/vc8/yasm.vcproj
@@ -22,7 +22,6 @@
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -52,10 +51,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/yasm.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="4"\r
@@ -74,11 +73,11 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(PlatformName)\$(ConfigurationName)/yasm.exe"\r
+                               OutputFile="$(OutDir)\yasm.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/yasm.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -143,10 +142,10 @@
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/yasm.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                DebugInformationFormat="3"\r
@@ -169,7 +168,7 @@
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/yasm.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
                                SubSystem="1"\r
                                TargetMachine="17"\r
                        />\r
@@ -203,7 +202,6 @@
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="2"\r
@@ -227,18 +225,19 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="0"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories=".,../.."\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;VC"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/yasm.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                CompileAs="0"\r
@@ -256,10 +255,11 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               OutputFile="$(PlatformName)\$(ConfigurationName)/yasm.exe"\r
+                               OutputFile="$(OutDir)\yasm.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)/yasm.pdb"\r
+                               GenerateDebugInformation="false"\r
+                               ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -318,7 +318,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
+                               Optimization="3"\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories=".,../.."\r
                                PreprocessorDefinitions="NDEBUG;_LIB;HAVE_CONFIG_H;VC;WIN64"\r
@@ -326,10 +326,10 @@
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
-                               PrecompiledHeaderFile="$(PlatformName)\$(ConfigurationName)/yasm.pch"\r
-                               AssemblerListingLocation="$(PlatformName)\$(ConfigurationName)/"\r
-                               ObjectFile="$(PlatformName)\$(ConfigurationName)/"\r
-                               ProgramDataBaseFileName="$(PlatformName)\$(ConfigurationName)/"\r
+                               PrecompiledHeaderFile=""\r
+                               AssemblerListingLocation="$(IntDir)\"\r
+                               ObjectFile="$(IntDir)\"\r
+                               ProgramDataBaseFileName="$(IntDir)\"\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="$(PlatformName)\$(ConfigurationName)/yasm.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"\r
                                SubSystem="1"\r
                                TargetMachine="17"\r
                        />\r

diff --git a/Mkfiles/vc8/yasm64.rules b/Mkfiles/vc8/yasm64.rules
deleted file mode 100644 (file)
index 394ecb8..0000000
--- a/Mkfiles/vc8/yasm64.rules
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<VisualStudioToolFile\r
-       Name="Yasm (64-bit)"\r
-       Version="8.00"\r
-       >\r
-       <Rules>\r
-               <CustomBuildRule\r
-                       Name="YASM64"\r
-                       DisplayName="Yasm Assembler (64-bit mode)"\r
-                       CommandLine="yasm -Xvc -f win64 [ListFileName] [Defines] [UnDefines] [IncludePaths] [ObjectFileName] [inputs]"\r
-                       Outputs="[$ObjectFileName]"\r
-                       FileExtensions="*.asm"\r
-                       ExecutionDescription="Assembling ..."\r
-                       ShowOnlyRuleProperties="false"\r
-                       >\r
-                       <Properties>\r
-                               <StringProperty\r
-                                       Name="Defines"\r
-                                       DisplayName="Preprocessor Definitions"\r
-                                       Description="Preprocessor Definitions"\r
-                                       Switch="-D[value]"\r
-                                       Delimited="true"\r
-                                       Inheritable="true"\r
-                               />\r
-                               <StringProperty\r
-                                       Name="IncludePaths"\r
-                                       DisplayName="Include Paths"\r
-                                       Switch="-i&quot;[value]\&quot;"\r
-                                       Delimited="true"\r
-                                       Inheritable="true"\r
-                               />\r
-                               <StringProperty\r
-                                       Name="UnDefines"\r
-                                       DisplayName="Remove Preprocessor Definitions"\r
-                                       Description="Undefine"\r
-                                       Switch="-u[value]"\r
-                                       Delimited="true"\r
-                                       Inheritable="true"\r
-                               />\r
-                               <StringProperty\r
-                                       Name="ObjectFileName"\r
-                                       DisplayName="Object File Name"\r
-                                       Switch="-o&quot;[value]&quot;"\r
-                               />\r
-                               <StringProperty\r
-                                       Name="ListFileName"\r
-                                       DisplayName="List File Name"\r
-                                       Switch="-l&quot;[value]&quot;"\r
-                               />\r
-                               <StringProperty\r
-                                       Name="PreIncludeFile"\r
-                                       DisplayName="Pre Include File"\r
-                                       Switch="-p&quot;[value]&quot;"\r
-                               />\r
-                       </Properties>\r
-               </CustomBuildRule>\r
-       </Rules>\r
-</VisualStudioToolFile>\r