summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrav90 <travawine@palemoon.org>2018-10-17 22:58:23 -0500
committertrav90 <travawine@palemoon.org>2018-10-17 22:58:23 -0500
commitecdaf7930e12348d66d3270548d98c61b6bcc76f (patch)
tree1abe81e4ba586ae41f503d90aa41a6f22e4cf99c
parent857b86f25ceb0b693f43d3664492eea895b001af (diff)
downloadUXP-ecdaf7930e12348d66d3270548d98c61b6bcc76f.tar
UXP-ecdaf7930e12348d66d3270548d98c61b6bcc76f.tar.gz
UXP-ecdaf7930e12348d66d3270548d98c61b6bcc76f.tar.lz
UXP-ecdaf7930e12348d66d3270548d98c61b6bcc76f.tar.xz
UXP-ecdaf7930e12348d66d3270548d98c61b6bcc76f.zip
Make aom_config.asm match upstream
-rwxr-xr-xmedia/libaom/generate_sources_mozbuild.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libaom/generate_sources_mozbuild.sh b/media/libaom/generate_sources_mozbuild.sh
index a3effce83..fa3b5cc3a 100755
--- a/media/libaom/generate_sources_mozbuild.sh
+++ b/media/libaom/generate_sources_mozbuild.sh
@@ -167,8 +167,8 @@ function gen_config_files {
local ASM_CONV=ads2gas.pl
# Generate aom_config.asm.
- if [[ "$1" == *x64* ]] || [[ "$1" == *ia32* ]]; then
- egrep "#define [A-Z0-9_]+ [01]" aom_config.h | awk '{print "%define " $2 " " $3}' > aom_config.asm
+ if [[ "$1" == *x64* ]] || [[ "$1" == *ia32* ]] || [[ "$1" == *mingw* ]]; then
+ egrep "#define [A-Z0-9_]+ [01]" aom_config.h | awk '{print $2 " equ " $3}' > aom_config.asm
else
egrep "#define [A-Z0-9_]+ [01]" aom_config.h | awk '{print $2 " EQU " $3}' | perl $BASE_DIR/$LIBAOM_SRC_DIR/build/make/$ASM_CONV > aom_config.asm
fi