Commit 82edabce authored by Christian Duvivier's avatar Christian Duvivier
Browse files

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
parent fcbb884e
...@@ -623,6 +623,12 @@ process_common_toolchain() { ...@@ -623,6 +623,12 @@ process_common_toolchain() {
add_ldflags "-isysroot /Developer/SDKs/MacOSX10.6.sdk" add_ldflags "-isysroot /Developer/SDKs/MacOSX10.6.sdk"
add_ldflags "-mmacosx-version-min=10.6" 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 esac
# Handle Solaris variants. Solaris 10 needs -lposix4 # Handle Solaris variants. Solaris 10 needs -lposix4
......
...@@ -42,7 +42,7 @@ done ...@@ -42,7 +42,7 @@ done
[ -n "$srcfile" ] || show_help [ -n "$srcfile" ] || show_help
sfx=${sfx:-asm} 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;") perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
#" restore editor state #" restore editor state
for inc in ${includes}; do for inc in ${includes}; do
......
...@@ -114,6 +114,7 @@ all_platforms="${all_platforms} x86-win32-vs8" ...@@ -114,6 +114,7 @@ all_platforms="${all_platforms} x86-win32-vs8"
all_platforms="${all_platforms} x86-win32-vs9" all_platforms="${all_platforms} x86-win32-vs9"
all_platforms="${all_platforms} x86_64-darwin9-gcc" all_platforms="${all_platforms} x86_64-darwin9-gcc"
all_platforms="${all_platforms} x86_64-darwin10-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-gcc"
all_platforms="${all_platforms} x86_64-linux-icc" all_platforms="${all_platforms} x86_64-linux-icc"
all_platforms="${all_platforms} x86_64-solaris-gcc" all_platforms="${all_platforms} x86_64-solaris-gcc"
......
...@@ -12,3 +12,8 @@ ...@@ -12,3 +12,8 @@
#include "onyxd_int.h" #include "onyxd_int.h"
void vp8_decode_mode_mvs(VP8D_COMP *); 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);
...@@ -63,7 +63,7 @@ static int merge_index(int v, int n, int modulus) { ...@@ -63,7 +63,7 @@ static int merge_index(int v, int n, int modulus) {
static int inv_remap_prob(int v, int m) { static int inv_remap_prob(int v, int m) {
const int n = 256; const int n = 256;
const int modulus = MODULUS_PARAM; const int modulus = MODULUS_PARAM;
int i, w; int i;
v = merge_index(v, n - 1, modulus); v = merge_index(v, n - 1, modulus);
if ((m << 1) <= n) { if ((m << 1) <= n) {
i = inv_recenter_nonneg(v + 1, m); i = inv_recenter_nonneg(v + 1, m);
......
...@@ -78,7 +78,6 @@ static int split_index(int i, int n, int modulus) { ...@@ -78,7 +78,6 @@ static int split_index(int i, int n, int modulus) {
static int remap_prob(int v, int m) { static int remap_prob(int v, int m) {
const int n = 256; const int n = 256;
const int modulus = MODULUS_PARAM; const int modulus = MODULUS_PARAM;
const int max1 = (n - 2 - modulus / 2 + modulus - 1) / modulus;
int i; int i;
if ((m << 1) <= n) if ((m << 1) <= n)
i = recenter_nonneg(v, m) - 1; i = recenter_nonneg(v, m) - 1;
...@@ -1353,7 +1352,6 @@ static void update_coef_probs2(VP8_COMP *cpi) { ...@@ -1353,7 +1352,6 @@ static void update_coef_probs2(VP8_COMP *cpi) {
vp8_writer *const w = & cpi->bc; vp8_writer *const w = & cpi->bc;
int update[2]; int update[2];
int savings; int savings;
int bestupdndx[2 * ENTROPY_NODES];
vp8_clear_system_state(); // __asm emms; vp8_clear_system_state(); // __asm emms;
// Build the cofficient contexts based on counts collected in encode loop // Build the cofficient contexts based on counts collected in encode loop
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment