]> granicus.if.org Git - libvpx/commitdiff
changed asm obj output filenames in MSVC build
authorYaowu Xu <yaowu@google.com>
Thu, 15 Nov 2012 17:55:36 +0000 (09:55 -0800)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 15 Nov 2012 18:46:38 +0000 (10:46 -0800)
this commit changed the asm file compiling in MSVC to use individually
customized build command line with object filename specified for each
input file. This allows object filenames prefixed with path name, and
avoid name collision in link time

Change-Id: I996098643dcadc393af57035a04bef3877f45424

build/make/gen_msvs_proj.sh

index 35fb4df7706a69a27717dd6f27c2bdc91c0d4b51..9a7b25ec4c82b8ad4d3b1da6f9cdfec9db9fb139 100755 (executable)
@@ -155,7 +155,7 @@ generate_filter() {
                             tag Tool \
                                 Name="VCCustomBuildTool" \
                                 Description="Assembling \$(InputFileName)" \
-                                CommandLine="$(eval echo \$asm_${cfg}_cmdline)" \
+                                CommandLine="$(eval echo \$asm_${cfg}_cmdline) -o \$(IntDir)$objf" \
                                 Outputs="\$(IntDir)$objf" \
 
                             close_tag FileConfiguration
@@ -262,8 +262,10 @@ case "${vs_ver:-8}" in
        asm_use_custom_step=$uses_asm
     ;;
     8) vs_ver_id="8.00"
+       asm_use_custom_step=$uses_asm
     ;;
     9) vs_ver_id="9.00"
+       asm_use_custom_step=$uses_asm
     ;;
 esac
 
@@ -302,10 +304,11 @@ esac
 case "$target" in
     x86_64*)
         platforms[0]="x64"
+        asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} &quot;\$(InputPath)&quot;"
+        asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} &quot;\$(InputPath)&quot;"
     ;;
     x86*)
         platforms[0]="Win32"
-        # these are only used by vs7
         asm_Debug_cmdline="yasm -Xvc -g cv8 -f \$(PlatformName) ${yasmincs} &quot;\$(InputPath)&quot;"
         asm_Release_cmdline="yasm -Xvc -f \$(PlatformName) ${yasmincs} &quot;\$(InputPath)&quot;"
     ;;