Add x86_64-darwin11-gcc target.

This allows building on MountainLion as the 10.6 SDK has been
removed from the latest Xcode version (4.4 4F250). Also fix
all warnings for that build.

Change-Id: Ib70bca4a25295f13595f0d10ea9f0229631de5a4

diff --git a/build/make/configure.sh b/build/make/configure.sh
index ab087f1720c7df787761bdf565fd393a08eedcc6..552f8c188695e9a5fdc03d3b6c231e554c66dc5e 100755 (executable)
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -623,6 +623,12 @@ process_common_toolchain() {
             add_ldflags "-isysroot /Developer/SDKs/MacOSX10.6.sdk"
             add_ldflags "-mmacosx-version-min=10.6"
             ;;
+        *-darwin11-*)
+            add_cflags  "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
+            add_cflags  "-mmacosx-version-min=10.7"
+            add_ldflags "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
+            add_ldflags "-mmacosx-version-min=10.7"
+            ;;
     esac
 
     # Handle Solaris variants. Solaris 10 needs -lposix4

diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh
index 7c6c5d56588f7e93f63d675c0daff8d0f0ea836a..a75418aa6b775ca71f921890c53467a6b8d90a89 100755 (executable)
--- a/build/make/gen_asm_deps.sh
+++ b/build/make/gen_asm_deps.sh
@@ -42,7 +42,7 @@ done
 
 [ -n "$srcfile" ] || show_help
 sfx=${sfx:-asm}
-includes=$(egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
+includes=$(egrep -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
            perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
 #" restore editor state
 for inc in ${includes}; do

diff --git a/configure b/configure
index 482657aceec3f6756aa03673cf877263098d3315..b135874bdeb5d6450ac6fd9dff4ef7de598b5307 100755 (executable)
--- a/configure
+++ b/configure
@@ -114,6 +114,7 @@ all_platforms="${all_platforms} x86-win32-vs8"
 all_platforms="${all_platforms} x86-win32-vs9"
 all_platforms="${all_platforms} x86_64-darwin9-gcc"
 all_platforms="${all_platforms} x86_64-darwin10-gcc"
+all_platforms="${all_platforms} x86_64-darwin11-gcc"
 all_platforms="${all_platforms} x86_64-linux-gcc"
 all_platforms="${all_platforms} x86_64-linux-icc"
 all_platforms="${all_platforms} x86_64-solaris-gcc"

diff --git a/vp8/decoder/decodemv.h b/vp8/decoder/decodemv.h
index 940342447963e7071b31ecc3696f270391a5fe65..17bbb5b674f997ceae20fda2fdbe6191b55089cf 100644 (file)
--- a/vp8/decoder/decodemv.h
+++ b/vp8/decoder/decodemv.h
@@ -12,3 +12,8 @@
 #include "onyxd_int.h"
 
 void vp8_decode_mode_mvs(VP8D_COMP *);
+void vpx_decode_mb_mode_mv(VP8D_COMP *pbi,
+                           MACROBLOCKD *xd,
+                           int mb_row,
+                           int mb_col);
+void vpx_decode_mode_mvs_init(VP8D_COMP *pbi);

diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index 475584211c7f20111564542832fe10190266768a..057104f497de828b1985c35bce56698164210854 100644 (file)
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -63,7 +63,7 @@ static int merge_index(int v, int n, int modulus) {
 static int inv_remap_prob(int v, int m) {
   const int n = 256;
   const int modulus = MODULUS_PARAM;
-  int i, w;
+  int i;
   v = merge_index(v, n - 1, modulus);
   if ((m << 1) <= n) {
     i = inv_recenter_nonneg(v + 1, m);

diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index 1896145db2b831ff1d3a62702b8a26bec7fc5bbc..574427cf70ffffb66e041991cf72b2259a700020 100644 (file)
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -78,7 +78,6 @@ static int split_index(int i, int n, int modulus) {
 static int remap_prob(int v, int m) {
   const int n = 256;
   const int modulus = MODULUS_PARAM;
-  const int max1 = (n - 2 - modulus / 2 + modulus - 1) / modulus;
   int i;
   if ((m << 1) <= n)
     i = recenter_nonneg(v, m) - 1;
@@ -1353,7 +1352,6 @@ static void update_coef_probs2(VP8_COMP *cpi) {
   vp8_writer *const w = & cpi->bc;
   int update[2];
   int savings;
-  int bestupdndx[2 * ENTROPY_NODES];
 
   vp8_clear_system_state(); // __asm emms;
   // Build the cofficient contexts based on counts collected in encode loop