commit c4295cfbb6e6b41a1ea4fa117690f81770f0d59c Author: Jörg Bleyel Date: Wed Jul 11 22:39:57 2012 +0200 modified: configure.ac modified: contrib/src/theora/rules.mak diff --git a/configure.ac b/configure.ac index 1861e90..24ab813 100644 --- a/configure.ac +++ b/configure.ac @@ -186,16 +186,18 @@ case "${host_os}" in if test "${with_macosx_version_min}" = "" ; then with_macosx_version_min=10.5 fi - MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min} - CPP="${CPP} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" - CC="${CC} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" - CXX="${CXX} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" - OBJC="${OBJC} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" - LD="${LD} -syslibroot ${with_macosx_sdk} -mmacosx_version_min=${with_macosx_version_min}" - CFLAGS="${CFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}" - CXXFLAGS="${CXXFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}" - OBJCFLAGS="${OBJCFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}" - export MACOSX_DEPLOYMENT_TARGET + if test "${OSX_VERSION}" != ""; then + MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min} + CPP="${CPP} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" + CC="${CC} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" + CXX="${CXX} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" + OBJC="${OBJC} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" + LD="${LD} -syslibroot ${with_macosx_sdk} -mmacosx_version_min=${with_macosx_version_min}" + CFLAGS="${CFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}" + CXXFLAGS="${CXXFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}" + OBJCFLAGS="${OBJCFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}" + export MACOSX_DEPLOYMENT_TARGET + fi ;; *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak index 7c13619..071223c 100644 --- a/contrib/src/theora/rules.mak +++ b/contrib/src/theora/rules.mak @@ -47,6 +47,12 @@ endif DEPS_theora = ogg $(DEPS_ogg) .theora: libtheora +ifdef HAVE_IOS + $(RECONF) +endif +ifdef HAVE_MACOSX64 + $(RECONF) +endif ifdef HAVE_WIN32 $(RECONF) endif