* yasm.rules: Clean up.

* modules.vcproj: Remove PreBuildEvent pointing to build.bat that no longer
exists.

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

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

diff --git a/Mkfiles/vc/modules/modules.vcproj b/Mkfiles/vc/modules/modules.vcproj
index 3c81c3b7d596d7760b0419e3487130ddbdfd9931..e88295be579800f9e28dff12a5a91e987ae45a5c 100644 (file)
--- a/Mkfiles/vc/modules/modules.vcproj
+++ b/Mkfiles/vc/modules/modules.vcproj
@@ -48,7 +48,6 @@
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cmd &lt;build.bat"/>\r
                        <Tool\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r

diff --git a/Mkfiles/vc8/modules/modules.vcproj b/Mkfiles/vc8/modules/modules.vcproj
index 485b1c78acc3ec3a1cafbaa68f8a1a94793e819a..51ece1351e07e7663194f200eed532cd9ca022f3 100644 (file)
--- a/Mkfiles/vc8/modules/modules.vcproj
+++ b/Mkfiles/vc8/modules/modules.vcproj
@@ -28,7 +28,6 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cmd &lt; build.bat"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -180,7 +179,6 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cmd &lt; build.bat"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r

diff --git a/Mkfiles/vc8/yasm.rules b/Mkfiles/vc8/yasm.rules
index 9aeb082f532a88ffb64edab86be990465c9960ff..3001425e3805602e7b41e74d50aef875b12c88e6 100644 (file)
--- a/Mkfiles/vc8/yasm.rules
+++ b/Mkfiles/vc8/yasm.rules
@@ -7,17 +7,18 @@
                <CustomBuildRule\r
                        Name="YASM"\r
                        DisplayName="Yasm Assembler"\r
-                       CommandLine="yasm -Xvc -f $(PlatformName) [Debug] [ListFileName] [Defines] [UnDefines] [IncludePaths] [ObjectFileName] [inputs]"\r
+                       CommandLine="yasm -Xvc -f $(PlatformName) [PreProc] [Parser] [Debug] [ListFileName] [Defines] [UnDefines] [IncludePaths] [ObjectFileName] [inputs]"\r
                        Outputs="[$ObjectFileName]"\r
                        FileExtensions="*.asm"\r
-                       ExecutionDescription="Assembling ..."\r
+                       ExecutionDescription="Assembling $(InputFileName)"\r
                        ShowOnlyRuleProperties="false"\r
                        >\r
                        <Properties>\r
                                <StringProperty\r
                                        Name="Defines"\r
-                                       DisplayName="Preprocessor Definitions"\r
-                                       Description="Preprocessor Definitions"\r
+                                       DisplayName="Definitions"\r
+                                       Category="Pre-Defined Symbols"\r
+                                       Description="Specify pre-defined symbols (&apos;symbol&apos; or &apos;symbol = value&apos;) "\r
                                        Switch="-D [value]"\r
                                        Delimited="true"\r
                                        Inheritable="true"\r
@@ -25,14 +26,17 @@
                                <StringProperty\r
                                        Name="IncludePaths"\r
                                        DisplayName="Include Paths"\r
+                                       Category="Configuration"\r
+                                       Description="Set the paths for any additional include files"\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
+                                       DisplayName="Remove Definitions"\r
+                                       Category="Pre-Defined Symbols"\r
+                                       Description="Remove pre-defined symbols "\r
                                        Switch="-u [value]"\r
                                        Delimited="true"\r
                                        Inheritable="true"\r
@@ -40,24 +44,70 @@
                                <StringProperty\r
                                        Name="ObjectFileName"\r
                                        DisplayName="Object File Name"\r
+                                       Category="Output"\r
+                                       Description="Select the output file name"\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
+                                       Category="Output"\r
+                                       Description="Select an output listing by setting its 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
+                                       Category="Configuration"\r
+                                       Description="Select a pre-included file by setting its name"\r
+                                       Switch="-P &quot;[value]&quot;"\r
                                />\r
                                <BooleanProperty\r
                                        Name="Debug"\r
-                                       DisplayName="Generate Debug Information"\r
+                                       DisplayName="Debug Information"\r
+                                       Category="Output"\r
+                                       Description="Generate debugging information"\r
                                        Switch="-g cv8"\r
                                />\r
+                               <EnumProperty\r
+                                       Name="PreProc"\r
+                                       DisplayName="Pre-Processor"\r
+                                       Category="Configuration"\r
+                                       Description="Select the pre-processor (&apos;nasm&apos; or &apos;raw&apos;)"\r
+                                       >\r
+                                       <Values>\r
+                                               <EnumValue\r
+                                                       Value="0"\r
+                                                       Switch="-rnasm"\r
+                                                       DisplayName="Nasm "\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="1"\r
+                                                       Switch="-rraw"\r
+                                                       DisplayName="Raw"\r
+                                               />\r
+                                       </Values>\r
+                               </EnumProperty>\r
+                               <EnumProperty\r
+                                       Name="Parser"\r
+                                       DisplayName="Parser"\r
+                                       Category="Configuration"\r
+                                       Description="Select the parser for Intel (&apos;nasm&apos;) or AT&amp;T ( &apos;gas&apos;) syntax"\r
+                                       >\r
+                                       <Values>\r
+                                               <EnumValue\r
+                                                       Value="0"\r
+                                                       Switch="-pnasm"\r
+                                                       DisplayName="Nasm"\r
+                                               />\r
+                                               <EnumValue\r
+                                                       Value="1"\r
+                                                       Switch="-pgas"\r
+                                                       DisplayName="Gas"\r
+                                               />\r
+                                       </Values>\r
+                               </EnumProperty>\r
                        </Properties>\r
                </CustomBuildRule>\r
        </Rules>\r