VisualStudio projects: asm tool updates

vs8
 - pull yasm.rules [1] into the source tree to avoid need to install
   file into VC/VCProjectDefaults
 - reference same w/ToolFile & RelativePath
 - update arm branch to match

vs7:
 - quote source file paths passed to yasm

[1]:
http://www.tortall.net/svn/yasm/trunk/yasm/Mkfiles/vc9/yasm.rules@2271

Change-Id: I52b801496340cd7b1d0023d12afbc04624ecefc3

diff --git a/build/.gitattributes b/build/.gitattributes
new file mode 100644 (file)
index 0000000..03db79b
--- /dev/null
+++ b/build/.gitattributes
@@ -0,0 +1,2 @@
+*-vs8/*.rules -crlf
+*-msvs/*.rules -crlf

diff --git a/build/arm-wince-vs8/.gitattributes b/build/arm-wince-vs8/.gitattributes
deleted file mode 100644 (file)
index be1eeb9..0000000
--- a/build/arm-wince-vs8/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.rules -crlf

diff --git a/build/make/gen_msvs_proj.sh b/build/make/gen_msvs_proj.sh
index 6288ee5c1f2a02a4f7d33dae0d287b255b6bd385..d94ae4d801047dff7a776c60734a67678408c355 100755 (executable)
--- a/build/make/gen_msvs_proj.sh
+++ b/build/make/gen_msvs_proj.sh
@@ -12,6 +12,7 @@
 
 self=$0
 self_basename=${self##*/}
+self_dirname=$(dirname "$0")
 EOL=$'\n'
 
 show_help() {
@@ -292,8 +293,8 @@ case "$target" in
     x86*)
         platforms[0]="Win32"
         # these are only used by vs7
-        asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} \$(InputPath)"
-        asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} \$(InputPath)"
+        asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} "\$(InputPath)""
+        asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} "\$(InputPath)""
     ;;
     arm*|iwmmx*)
         case "${name}" in
@@ -343,19 +344,19 @@ generate_vcproj() {
 
     open_tag  ToolFiles
     case "$target" in
-        x86*) $uses_asm && tag DefaultToolFile FileName="yasm.rules"
+        x86*) $uses_asm && tag ToolFile RelativePath="$self_dirname/../x86-msvs/yasm.rules"
         ;;
         arm*|iwmmx*)
             if [ "$name" == "vpx_decoder" ];then
             case "$target" in
                 armv5*)
-                    tag DefaultToolFile FileName="armasmv5.rules"
+                    tag ToolFile RelativePath="$self_dirname/../arm-wince-vs8/armasmv5.rules"
                 ;;
                 armv6*)
-                    tag DefaultToolFile FileName="armasmv6.rules"
+                    tag ToolFile RelativePath="$self_dirname/../arm-wince-vs8/armasmv6.rules"
                 ;;
                 iwmmxt*)
-                    tag DefaultToolFile FileName="armasmxscale.rules"
+                    tag ToolFile RelativePath="$self_dirname/../arm-wince-vs8/armasmxscale.rules"
                 ;;
             esac
             fi

diff --git a/build/x86-msvs/yasm.rules b/build/x86-msvs/yasm.rules
new file mode 100644 (file)
index 0000000..ee1fefb
--- /dev/null
+++ b/build/x86-msvs/yasm.rules
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<VisualStudioToolFile\r
+       Name="Yasm"\r
+       Version="8.00"\r
+       >\r
+  <Rules>\r
+    <CustomBuildRule\r
+                       Name="YASM"\r
+                       DisplayName="Yasm Assembler"\r
+                       CommandLine="yasm -Xvc -f $(PlatformName) [AllOptions] [AdditionalOptions] [Inputs]"\r
+                       Outputs="[$ObjectFileName]"\r
+                       FileExtensions="*.asm"\r
+                       ExecutionDescription="Assembling $(InputFileName)"\r
+                       ShowOnlyRuleProperties="false"\r
+                       >\r
+      <Properties>\r
+        <StringProperty\r
+                                       Name="Defines"\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
+                               />\r
+        <StringProperty\r
+                                       Name="IncludePaths"\r
+                                       DisplayName="Include Paths"\r
+                                       Category="Configuration"\r
+                                       Description="Set the paths for any additional include files"\r
+                                       Switch="-I [value]"\r
+                                       Delimited="true"\r
+                                       Inheritable="true"\r
+                               />\r
+        <StringProperty\r
+                                       Name="UnDefines"\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
+                               />\r
+        <StringProperty\r
+                                       Name="ObjectFileName"\r
+                                       DisplayName="Object File Name"\r
+                                       Category="Output"\r
+                                       Description="Select the output file name"\r
+                                       Switch="-o [value]"\r
+                                       DefaultValue="$(IntDir)\$(InputName).obj"\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 [value]"\r
+                               />\r
+        <StringProperty\r
+                                       Name="PreIncludeFile"\r
+                                       DisplayName="Pre Include File"\r
+                                       Category="Configuration"\r
+                                       Description="Select a pre-included file by setting its name"\r
+                                       Switch="-P [value]"\r
+                               />\r
+        <BooleanProperty\r
+                                       Name="Debug"\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
+</VisualStudioToolFile>\r
+\r

diff --git a/libs.mk b/libs.mk
index fd4543b079f6cdd44ea9b6786cb1091d11b3dfd8..115ceb537b4fe82c0cb4c1caac75090ed091506d 100644 (file)
--- a/libs.mk
+++ b/libs.mk
@@ -132,7 +132,6 @@ ARM_ARCH=v6
 endif
 obj_int_extract.vcproj: $(SRC_PATH_BARE)/build/make/obj_int_extract.c
        @cp $(SRC_PATH_BARE)/build/arm-wince-vs8/obj_int_extract.bat .
-       @cp $(SRC_PATH_BARE)/build/arm-wince-vs8/armasm$(ARM_ARCH).rules .
        @echo "    [CREATE] $@"
        $(SRC_PATH_BARE)/build/make/gen_msvs_proj.sh\
                        --exe\