diff options
Diffstat (limited to 'build/make')
| -rwxr-xr-x | build/make/ads2gas.pl | 8 | ||||
| -rwxr-xr-x | build/make/ads2gas_apple.pl | 12 | ||||
| -rw-r--r-- | build/make/configure.sh | 1 | ||||
| -rwxr-xr-x | build/make/gen_msvs_vcxproj.sh | 4 |
4 files changed, 3 insertions, 22 deletions
diff --git a/build/make/ads2gas.pl b/build/make/ads2gas.pl index 7272424af..029cc4a56 100755 --- a/build/make/ads2gas.pl +++ b/build/make/ads2gas.pl @@ -138,14 +138,6 @@ while (<STDIN>) s/DCD(.*)/.long $1/; s/DCB(.*)/.byte $1/; - # RN to .req - if (s/RN\s+([Rr]\d+|lr)/.req $1/) - { - print; - print "$comment_sub$comment\n" if defined $comment; - next; - } - # Make function visible to linker, and make additional symbol with # prepended underscore s/EXPORT\s+\|([\$\w]*)\|/.global $1 \n\t.type $1, function/; diff --git a/build/make/ads2gas_apple.pl b/build/make/ads2gas_apple.pl index 1a9e105ba..e1ae7b4f8 100755 --- a/build/make/ads2gas_apple.pl +++ b/build/make/ads2gas_apple.pl @@ -120,18 +120,6 @@ while (<STDIN>) s/DCD(.*)/.long $1/; s/DCB(.*)/.byte $1/; - # Build a hash of all the register - alias pairs. - if (s/(.*)RN(.*)/$1 .req $2/g) - { - $register_aliases{trim($1)} = trim($2); - next; - } - - while (($key, $value) = each(%register_aliases)) - { - s/\b$key\b/$value/g; - } - # Make function visible to linker, and make additional symbol with # prepended underscore s/EXPORT\s+\|([\$\w]*)\|/.globl _$1\n\t.globl $1/; diff --git a/build/make/configure.sh b/build/make/configure.sh index f050fa06a..007e02000 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -936,6 +936,7 @@ EOF # only "AppContainerApplication" which requires an AppxManifest. # Therefore disable the examples, just build the library. disable_feature examples + disable_feature tools fi ;; rvct) diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh index e3395afa2..2cf62c117 100755 --- a/build/make/gen_msvs_vcxproj.sh +++ b/build/make/gen_msvs_vcxproj.sh @@ -82,7 +82,7 @@ generate_filter() { | sed -e "s,$src_path_bare,," \ -e 's/^[\./]\+//g' -e 's,[:/ ],_,g') - if ([ "$pat" == "asm" ] || [ "$pat" == "s" ]) && $asm_use_custom_step; then + if ([ "$pat" == "asm" ] || [ "$pat" == "s" ] || [ "$pat" == "S" ]) && $asm_use_custom_step; then # Avoid object file name collisions, i.e. vpx_config.c and # vpx_config.asm produce the same object file without # this additional suffix. @@ -452,7 +452,7 @@ generate_vcxproj() { done open_tag ItemGroup - generate_filter "Source Files" "c;cc;cpp;def;odl;idl;hpj;bat;asm;asmx;s" + generate_filter "Source Files" "c;cc;cpp;def;odl;idl;hpj;bat;asm;asmx;s;S" close_tag ItemGroup open_tag ItemGroup generate_filter "Header Files" "h;hm;inl;inc;xsd" |