Bug 1380118 - aom: add x86-win32-gcc config. draft
authorRalph Giles <giles@mozilla.com>
Mon, 10 Jul 2017 22:32:10 -0700
changeset 643635 c2f287c027a7f83662724605dfb22cd5022bdab0
parent 643612 a4a448ba7f187069fce916ee234a06cbb0d06f80
child 643636 7d5db3459b9adb3a1bfcf9308087cbb342422ebd
push id73163
push userbmo:giles@thaumas.net
push dateThu, 10 Aug 2017 00:19:36 +0000
bugs1380118
milestone57.0a1
Bug 1380118 - aom: add x86-win32-gcc config. This resolves some issues with building on mingw. Thanks to Tom Ritter for help developing this patch. MozReview-Commit-ID: BmJ5TbQAq17
media/libaom/generate_sources_mozbuild.sh
--- a/media/libaom/generate_sources_mozbuild.sh
+++ b/media/libaom/generate_sources_mozbuild.sh
@@ -193,16 +193,17 @@ all_platforms="--enable-external-build -
 all_platforms="${all_platforms} --size-limit=8192x4608 --enable-pic"
 x86_platforms="--enable-postproc --as=yasm"
 arm_platforms="--enable-runtime-cpu-detect --enable-realtime-only"
 gen_config_files linux/x64 "--target=x86_64-linux-gcc ${all_platforms} ${x86_platforms}"
 gen_config_files linux/ia32 "--target=x86-linux-gcc ${all_platforms} ${x86_platforms}"
 gen_config_files mac/x64 "--target=x86_64-darwin9-gcc ${all_platforms} ${x86_platforms}"
 gen_config_files win/x64 "--target=x86_64-win64-vs14 ${all_platforms} ${x86_platforms}"
 gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
+gen_config_files win/mingw32 "--target=x86-win32-gcc ${all_platforms} ${x86_platforms}"
 
 gen_config_files linux/arm "--target=armv7-linux-gcc ${all_platforms} ${arm_platforms}"
 
 gen_config_files generic "--target=generic-gnu ${all_platforms}"
 
 echo "Remove temporary directory."
 cd $BASE_DIR
 rm -rf $TEMP_DIR
@@ -213,16 +214,17 @@ rm -rf $TEMP_DIR
 cp -R $LIBAOM_SRC_DIR $TEMP_DIR
 cd $TEMP_DIR
 
 gen_rtcd_header linux/x64 x86_64
 gen_rtcd_header linux/ia32 x86
 gen_rtcd_header mac/x64 x86_64
 gen_rtcd_header win/x64 x86_64
 gen_rtcd_header win/ia32 x86
+gen_rtcd_header win/mingw32 x86
 
 gen_rtcd_header linux/arm armv7
 
 gen_rtcd_header generic generic
 
 echo "Prepare Makefile."
 ./configure --target=generic-gnu > /dev/null
 make_clean