avmedia/Module_avmedia.mk | 4 bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx | 30 -- bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 30 -- configure.ac | 235 ++----------------- external/libmariadb/configs/mac_my_config.h | 2 postprocess/Rdb_services.mk | 4 solenv/gbuild/platform/macosx.mk | 13 - sysui/desktop/macosx/Info.plist.in | 2 vcl/osx/salmenu.cxx | 5 vcl/quartz/CTRunData.hxx | 12 vcl/quartz/ctfonts.cxx | 4 11 files changed, 42 insertions(+), 299 deletions(-)
New commits: commit 4fa8282816cb39692678e9da6b6693e821a3039b Author: Norbert Thiebaud <[email protected]> Date: Sat Sep 13 20:20:45 2014 +0200 mac: clean-up obsolete conditional code based on old SDK Change-Id: Ie2d476780a48b5815961598e214343d5def962c1 diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index 6a97e69..f0108e5 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -44,14 +44,10 @@ endif endif ifeq ($(OS),MACOSX) -ifneq (1050,$(MACOSX_SDK_VERSION)) -ifneq (1060,$(MACOSX_SDK_VERSION)) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaMacAVF \ )) endif -endif -endif ifneq ($(ENABLE_DIRECTX),) $(eval $(call gb_Module_add_targets,avmedia,\ diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx index adbddd7..75fdbc7 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx @@ -27,13 +27,6 @@ #include <dlfcn.h> -// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined -// __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but -// MacOSX10.7.sdk/usr/include/cxxabi.h no longer does: -#if MACOSX_SDK_VERSION < 1070 -#include <cxxabi.h> -#endif - #include "boost/static_assert.hpp" #include "boost/unordered_map.hpp" #include "com/sun/star/uno/RuntimeException.hpp" @@ -61,31 +54,16 @@ struct Fake_type_info { struct Fake_class_type_info: Fake_type_info {}; -#if MACOSX_SDK_VERSION < 1070 -BOOST_STATIC_ASSERT( - sizeof (Fake_class_type_info) == sizeof (__cxxabiv1::__class_type_info)); -#endif - struct Fake_si_class_type_info: Fake_class_type_info { void const * base; }; -#if MACOSX_SDK_VERSION < 1070 -BOOST_STATIC_ASSERT( - sizeof (Fake_si_class_type_info) - == sizeof (__cxxabiv1::__si_class_type_info)); -#endif - struct Base {}; struct Derived: Base {}; std::type_info * createFake_class_type_info(char const * name) { char * buf = new char[sizeof (Fake_class_type_info)]; -#if MACOSX_SDK_VERSION < 1070 - assert( - dynamic_cast<__cxxabiv1::__class_type_info const *>(&typeid(Base)) - != 0); -#endif + *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>( &typeid(Base)); // copy __cxxabiv1::__class_type_info vtable into place @@ -99,11 +77,7 @@ std::type_info * createFake_si_class_type_info( char const * name, std::type_info const * base) { char * buf = new char[sizeof (Fake_si_class_type_info)]; -#if MACOSX_SDK_VERSION < 1070 - assert( - dynamic_cast<__cxxabiv1::__si_class_type_info const *>(&typeid(Derived)) - != 0); -#endif + *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>( &typeid(Derived)); // copy __cxxabiv1::__si_class_type_info vtable into place diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx index 83b06c5..f224c22 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx @@ -27,13 +27,6 @@ #include <dlfcn.h> -// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined -// __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but -// MacOSX10.7.sdk/usr/include/cxxabi.h no longer does: -#if MACOSX_SDK_VERSION < 1070 -#include <cxxabi.h> -#endif - #include "boost/static_assert.hpp" #include "boost/unordered_map.hpp" #include "com/sun/star/uno/RuntimeException.hpp" @@ -63,32 +56,17 @@ struct Fake_class_type_info: Fake_type_info { virtual ~Fake_class_type_info() SAL_DELETED_FUNCTION; }; -#if MACOSX_SDK_VERSION < 1070 -BOOST_STATIC_ASSERT( - sizeof (Fake_class_type_info) == sizeof (__cxxabiv1::__class_type_info)); -#endif - struct Fake_si_class_type_info: Fake_class_type_info { virtual ~Fake_si_class_type_info() SAL_DELETED_FUNCTION; void const * base; }; -#if MACOSX_SDK_VERSION < 1070 -BOOST_STATIC_ASSERT( - sizeof (Fake_si_class_type_info) - == sizeof (__cxxabiv1::__si_class_type_info)); -#endif - struct Base {}; struct Derived: Base {}; std::type_info * createFake_class_type_info(char const * name) { char * buf = new char[sizeof (Fake_class_type_info)]; -#if MACOSX_SDK_VERSION < 1070 - assert( - dynamic_cast<__cxxabiv1::__class_type_info const *>(&typeid(Base)) - != 0); -#endif + *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>( &typeid(Base)); // copy __cxxabiv1::__class_type_info vtable into place @@ -102,11 +80,7 @@ std::type_info * createFake_si_class_type_info( char const * name, std::type_info const * base) { char * buf = new char[sizeof (Fake_si_class_type_info)]; -#if MACOSX_SDK_VERSION < 1070 - assert( - dynamic_cast<__cxxabiv1::__si_class_type_info const *>(&typeid(Derived)) - != 0); -#endif + *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>( &typeid(Derived)); // copy __cxxabiv1::__si_class_type_info vtable into place diff --git a/external/libmariadb/configs/mac_my_config.h b/external/libmariadb/configs/mac_my_config.h index 38db37e..766c757 100644 --- a/external/libmariadb/configs/mac_my_config.h +++ b/external/libmariadb/configs/mac_my_config.h @@ -140,9 +140,7 @@ #define HAVE_STPCPY 1 #define HAVE_STRERROR 1 #define HAVE_STRLCPY 1 -#if MACOSX_SDK_VERSION >= 1070 #define HAVE_STRNLEN 1 -#endif #define HAVE_STRPBRK 1 #define HAVE_STRSEP 1 #define HAVE_STRSTR 1 diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index b88e763..1e84bd4 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -124,9 +124,7 @@ $(eval $(call gb_Rdb_add_components,services,\ writerperfect/source/writer/wpftwriter \ writerperfect/source/calc/wpftcalc \ $(if $(filter MACOSX,$(OS)), \ - $(if $(filter 1050 1060,$(MACOSX_SDK_VERSION)),, \ - $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ - ) \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \ $(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \ $(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \ ) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 3d40730..6501b0a 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -61,19 +61,6 @@ gb_CXXFLAGS := \ #-Wshadow \ break in compiler headers already #-fsigned-char \ might be removed? -# Without this I get struct/class clashes for "complex" when compiling -# some source files in vcl, at least with the 10.7 SDK. -ifneq ($(filter 1070,$(MACOSX_SDK_VERSION)),) -gb_COMPILERDEFS += \ - -DBOOST_DETAIL_NO_CONTAINER_FWD \ - -endif - -ifneq ($(filter 1060,$(MACOSX_SDK_VERSION)),) -gb_COMPILERNOOPTFLAGS := -O0 -fstrict-overflow - -endif - ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE) gb_CXXFLAGS += -Wno-long-double endif diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index cc5cc06..47129b9 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -880,12 +880,7 @@ Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame if( ! pNSWin ) return Rectangle(); -#if MACOSX_SDK_VERSION >= 1070 NSRect aRect = [pNSWin convertRectToScreen:[pNSWin frame]]; -#else - NSRect aRect = [pNSWin frame]; - aRect.origin = [pNSWin convertBaseToScreen: NSMakePoint( 0, 0 )]; -#endif // make coordinates relative to reference frame static_cast<AquaSalFrame*>(i_pReferenceFrame)->CocoaToVCL( aRect.origin ); diff --git a/vcl/quartz/CTRunData.hxx b/vcl/quartz/CTRunData.hxx index b6d1a1d..40c2a0a 100644 --- a/vcl/quartz/CTRunData.hxx +++ b/vcl/quartz/CTRunData.hxx @@ -10,20 +10,8 @@ #define CTRunData_Included #include "premac.h" -#if defined(MACOSX) && MACOSX_SDK_VERSION < 1080 -#include <ApplicationServices/ApplicationServices.h> -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -// The following symbols are SPI (System Programming Interface) in 10.5 -extern "C" { - void CTRunGetAdvances(CTRunRef run, CFRange range, CGSize buffer[]); - const CGSize* CTRunGetAdvancesPtr(CTRunRef run); - extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel; -} -#endif -#else #include <CoreGraphics/CoreGraphics.h> #include <CoreText/CoreText.h> -#endif #include "postmac.h" class CTRunData diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 38cf249..8a06d3b 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -249,11 +249,7 @@ int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResu // get the raw table length CTFontDescriptorRef pFontDesc = reinterpret_cast<CTFontDescriptorRef>( GetFontId()); CTFontRef rCTFont = CTFontCreateWithFontDescriptor( pFontDesc, 0.0, NULL); -#if defined(MACOSX) && MACOSX_SDK_VERSION < 1080 - const uint32_t opts( kCTFontTableOptionExcludeSynthetic ); -#else const uint32_t opts( kCTFontTableOptionNoOptions ); -#endif CFDataRef pDataRef = CTFontCopyTable( rCTFont, nTagCode, opts); CFRelease( rCTFont); if( !pDataRef) commit 100805844ab3371553803b0b05d3a41a42da7a3a Author: Norbert Thiebaud <[email protected]> Date: Sat Sep 13 19:45:07 2014 +0200 configure: kill unsupported mac SDK Change-Id: I1185539ecee1b9ede161bffcea9c13af0ade9510 diff --git a/configure.ac b/configure.ac index 7d6c249..1f5a794 100644 --- a/configure.ac +++ b/configure.ac @@ -2277,7 +2277,7 @@ AC_ARG_WITH(macosx-sdk, [ Usage: --with-macosx-sdk=<version> - e. g.: --with-macosx-sdk=10.6 + e. g.: --with-macosx-sdk=10.8 there are 3 options to control the MacOSX build: --with-macosx-sdk (refered as 'sdk' below) @@ -2286,16 +2286,16 @@ AC_ARG_WITH(macosx-sdk, the connection between these value and the default they take is as follow: ( ? means not specified on the command line, s means the SDK version found, - constraint: x <= y <= z) + constraint: 8 <= x <= y <= z) ========================================== command line || config result ========================================== min | max | sdk || min | max | sdk | - ? | ? | ? || 10.6 | 10.s | 10.s | - ? | ? | 10.x || 10.6 | 10.x | 10.x | - ? | 10.x | ? || 10.6 | 10.s | 10.s | - ? | 10.x | 10.y || 10.6 | 10.x | 10.y | + ? | ? | ? || 10.8 | 10.s | 10.s | + ? | ? | 10.x || 10.8 | 10.x | 10.x | + ? | 10.x | ? || 10.8 | 10.s | 10.s | + ? | 10.x | 10.y || 10.8 | 10.x | 10.y | 10.x | ? | ? || 10.x | 10.s | 10.s | 10.x | ? | 10.y || 10.x | 10.y | 10.y | 10.x | 10.y | ? || 10.x | 10.y | 10.y | @@ -2306,13 +2306,6 @@ AC_ARG_WITH(macosx-sdk, for a detailled technical explanation of these variables Note: MACOSX_DEPLOYMENT_TARGET will be set to the value of 'min'. - - Note that even if in theory using a --with-macosx-version-max-allowed - (i.e. the MAC_OS_X_VERSION_MAX_ALLOWED macro) less than the SDK version - should work, in practice Apple doesn't seem to test that, and at least - compiling with -DMAC_OS_X_VERSION_MAX_ALLOWED=1060 against the 10.7 SDK - fails in a couple of places. Just because of oversights in ifdefs in the SDK - headers, but still. ], ,) @@ -2322,7 +2315,7 @@ AC_ARG_WITH(macosx-version-min-required, [ Usage: --with-macosx-version-min-required=<version> - e. g.: --with-macos-version-min-required=10.6 + e. g.: --with-macos-version-min-required=10.8 see --with-macosx-sdk for more info ], ,) @@ -2333,7 +2326,7 @@ AC_ARG_WITH(macosx-version-max-allowed, [ Usage: --with-macosx-version-max-allowed=<version> - e. g.: --with-macos-version-max-allowed=10.6 + e. g.: --with-macos-version-max-allowed=10.8 see --with-macosx-sdk for more info ], ,) @@ -2707,113 +2700,35 @@ dnl =================================================================== if test $_os = Darwin; then - # If no --with-macosx-sdk option is given, look for 10.6, - # 10.7, 10.8 and 10.9 SDKs, in that order. If not found - # in some default locations, try the xcode-select tool. - # 10.5 must be specified explicitely to be considered + # If no --with-macosx-sdk option is given, look for one # The intent is that for "most" Mac-based developers, a suitable # SDK will be found automatically without any configure options. - # For developers still using old Xcode in /Developer, either - # because it is the only Xcode they have, or they have that in - # addition to Xcode 4 in /Applications/Xcode.app, the 10.5 SDK - # or 10.6 SDK should be found. - # For developers with a current Xcode, the lowest-numbered SDK - # should be found. + # higher than the minimum required should be found. AC_MSG_CHECKING([what Mac OS X SDK to use]) - if test -z "$with_macosx_sdk"; then - for MACOSX_SDK_PATH in /Developer/SDKs/MacOSX10.6.sdk /Developer-old/SDKs/MacOSX10.6.sdk /Xcode3/SDKs/MacOSX10.6.sdk; do + for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10; do + MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> /dev/null` + if test -d "$MACOSX_SDK_PATH"; then + with_macosx_sdk="${_macosx_sdk}" + break + else + MACOSX_SDK_PATH="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${_macosx_sdk}.sdk" if test -d "$MACOSX_SDK_PATH"; then - with_macosx_sdk=10.6 + with_macosx_sdk="${_macosx_sdk}" break fi - done - if test -z "$with_macosx_sdk"; then - MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.7.sdk" - if test -d "$MACOSX_SDK_PATH"; then - with_macosx_sdk=10.7 - else - for with_macosx_sdk in 10.6 10.7 10.8 10.9 10.10; do - MACOSX_SDK_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${with_macosx_sdk}.sdk" - if test -d "$MACOSX_SDK_PATH"; then - break - fi - done - if test ! -d "$MACOSX_SDK_PATH"; then - for with_macosx_sdk in 10.6 10.7 10.8 10.9 10.10; do - MACOSX_SDK_PATH=`xcrun --sdk macosx${with_macosx_sdk} --show-sdk-path 2> /dev/null` - if test -d "$MACOSX_SDK_PATH"; then - break - else - MACOSX_SDK_PATH="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${with_macosx_sdk}.sdk" - if test -d "$MACOSX_SDK_PATH"; then - break - fi - fi - done - if test ! -d "$MACOSX_SDK_PATH"; then - AC_MSG_ERROR([Could not figure out the location of a Mac OS X SDK and its version]) - fi - fi - fi - fi - else - # with --with-macosx-sdk=something - case $with_macosx_sdk in - 10.5|10.6) - if test -d /Developer-old/SDKs/MacOSX${with_macosx_sdk}.sdk; then - MACOSX_SDK_PATH=/Developer-old/SDKs/MacOSX${with_macosx_sdk}.sdk - elif test -d /Xcode3/SDKs/MacOSX${with_macosx_sdk}.sdk; then - MACOSX_SDK_PATH=/Xcode3/SDKs/MacOSX${with_macosx_sdk}.sdk - fi - ;; - esac - if test -z "$MACOSX_SDK_PATH"; then - case $with_macosx_sdk in - 10.5|10.6|10.7) - if test -d /Developer/SDKs/MacOSX${with_macosx_sdk}.sdk; then - MACOSX_SDK_PATH=/Developer/SDKs/MacOSX${with_macosx_sdk}.sdk - fi - ;; - esac - if test -z "$MACOSX_SDK_PATH"; then - case $with_macosx_sdk in - 10.6|10.7|10.8|10.9|10.10) - MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${with_macosx_sdk}.sdk - if test ! -d "$MACOSX_SDK_PATH"; then - MACOSX_SDK_PATH=`xcrun --sdk macosx${with_macosx_sdk} --show-sdk-path 2> /dev/null` - if test ! -d "$MACOSX_SDK_PATH"; then - MACOSX_SDK_PATH="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${with_macosx_sdk}.sdk" - if test ! -d "$MACOSX_SDK_PATH"; then - AC_MSG_ERROR([Could not figure out the location of Mac OS X $with_macosx_sdk SDK]) - fi - fi - fi - ;; - *) - AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.5--10]) - ;; - esac - fi fi + done + if test ! -d "$MACOSX_SDK_PATH"; then + AC_MSG_ERROR([Could not figure out the location of a Mac OS X SDK and its version]) fi - AC_MSG_RESULT([SDK $with_macosx_sdk at $MACOSX_SDK_PATH]) case $with_macosx_sdk in - 10.5) - MACOSX_SDK_VERSION=1050 - ;; - 10.6) - MACOSX_SDK_VERSION=1060 - ;; - 10.7) - MACOSX_SDK_VERSION=1070 - ;; 10.8) MACOSX_SDK_VERSION=1080 ;; @@ -2824,22 +2739,15 @@ if test $_os = Darwin; then MACOSX_SDK_VERSION=101000 ;; *) - AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.5--10]) + AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported value, supported values are 10.8--10]) ;; esac - if test "$with_macosx_version_min_required" = ""; then - case $with_macosx_sdk in - 10.5) - with_macosx_version_min_required="10.5";; - 10.6|10.7) - with_macosx_version_min_required="10.6";; - *) - with_macosx_version_min_required="10.8";; - esac + if test "$with_macosx_version_min_required" = "" ; then + with_macosx_version_min_required="10.8"; fi - if test "$with_macosx_version_max_allowed" = ""; then + if test "$with_macosx_version_max_allowed" = "" ; then with_macosx_version_max_allowed="$with_macosx_sdk" fi @@ -2851,15 +2759,6 @@ if test $_os = Darwin; then MACOSX_DEPLOYMENT_TARGET="$with_macosx_version_min_required" case "$with_macosx_version_min_required" in - 10.5) - MAC_OS_X_VERSION_MIN_REQUIRED="1050" - ;; - 10.6) - MAC_OS_X_VERSION_MIN_REQUIRED="1060" - ;; - 10.7) - MAC_OS_X_VERSION_MIN_REQUIRED="1070" - ;; 10.8) MAC_OS_X_VERSION_MIN_REQUIRED="1080" ;; @@ -2870,7 +2769,7 @@ if test $_os = Darwin; then MAC_OS_X_VERSION_MIN_REQUIRED="101000" ;; *) - AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.5--10]) + AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.8--10]) ;; esac @@ -2880,35 +2779,8 @@ if test $_os = Darwin; then if test -z "$save_CC"; then AC_MSG_CHECKING([what compiler to use]) case $with_macosx_sdk in - 10.5) - _gcc_version=`gcc -dumpversion | $AWK -F. '{ print \$1*100+\$2 }'` - _gcc42_version=`gcc-4.2 -dumpversion | $AWK -F. '{ print \$1*100+\$2 }'` - if test "$_gcc_version" -gt "$_gcc42_version"; then - CC="gcc -mmacosx-version-min=$with_macosx_version_min_required" - CXX="g++ -mmacosx-version-min=$with_macosx_version_min_required" - else - CC="gcc-4.2 -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" - CXX="g++-4.2 -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" - fi - INSTALL_NAME_TOOL=`xcrun -find install_name_tool` - ;; - 10.6) - # did someone copy her 10.6 sdk into xcode 4 (needed on Mountain Lion)? - if test "$(echo $MACOSX_SDK_PATH | cut -c1-23)" = "/Applications/Xcode.app"; then - CC="`xcrun -find gcc` -m64 -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" - CXX="`xcrun -find g++` -m64 -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" - else - CC="gcc-4.2 -m64 -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" - CXX="g++-4.2 -m64 -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH" - fi - INSTALL_NAME_TOOL=`xcrun -find install_name_tool` - LIBTOOL=libtool - ;; - 10.7|10.8|10.9|10.10) - if test "$with_macosx_version_min_required" != 10.6; then - # Use libc++ instead of libstdc++ when possible - stdlib=-stdlib=libc++ - fi + 10.8|10.9|10.10) + stdlib=-stdlib=libc++ if test "$ENABLE_LTO" = TRUE; then lto=-flto fi @@ -2926,15 +2798,6 @@ if test $_os = Darwin; then fi case "$with_macosx_version_max_allowed" in - 10.5) - MAC_OS_X_VERSION_MAX_ALLOWED="1050" - ;; - 10.6) - MAC_OS_X_VERSION_MAX_ALLOWED="1060" - ;; - 10.7) - MAC_OS_X_VERSION_MAX_ALLOWED="1070" - ;; 10.8) MAC_OS_X_VERSION_MAX_ALLOWED="1080" ;; @@ -2945,7 +2808,7 @@ if test $_os = Darwin; then MAC_OS_X_VERSION_MAX_ALLOWED="101000" ;; *) - AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.5--10]) + AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.8--10]) ;; esac @@ -3390,20 +3253,7 @@ if test "$GCC" = "yes" -a -z "$COM_GCC_IS_CLANG"; then _gcc_version=`$CC -dumpversion` GCC_VERSION=`echo $_gcc_version | $AWK -F. '{ print \$1*100+\$2 }'` - if test "$_os" = "Darwin"; then - if test "$with_macosx_sdk" = "10.5"; then - # use gcc-4.2 for OS X SDK 10.5 when "plain" gcc is not more recent - if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.2"; then - _gcc42_version=`$GCC_HOME/bin/gcc-4.2 -dumpversion | $AWK -F. '{ print \$1*100+\$2 }'` - if test "$GCC_VERSION" -le "$_gcc42_version"; then - export CC=$GCC_HOME/bin/gcc-4.2 - fi - fi - AC_MSG_RESULT([using CC=$CC]) - fi - else - AC_MSG_RESULT([gcc $_gcc_version]) - fi + AC_MSG_RESULT([gcc $_gcc_version]) if test "$GCC_VERSION" -lt 0401; then AC_MSG_ERROR([GCC $_gcc_version is too old, must be at least GCC 4.1.0]) @@ -8001,9 +7851,7 @@ if test $enable_python = system; then # Make sure we use the 2.6 Python when building against the # 10.6 SDK. case $with_macosx_sdk in - 10.6) - python_version=2.6;; - 10.7|10.8) + 10.8) python_version=2.7;; *) # 10.9 etc. @@ -9340,7 +9188,7 @@ DISABLE_OPENSSL= AC_MSG_CHECKING([whether to disable OpenSSL usage]) if test "$enable_openssl" = "yes"; then AC_MSG_RESULT([no]) - if test "$_os" = Darwin -a "${MAC_OS_X_VERSION_MIN_REQUIRED:-0}" -ge 1070; then + if test "$_os" = Darwin ; then # OpenSSL is deprecated when building for 10.7 or later. # # http://stackoverflow.com/questions/7406946/why-is-apple-deprecating-openssl-in-macos-10-7-lion @@ -10476,13 +10324,9 @@ AC_MSG_CHECKING([whether to build with the OpenCL support.]) ENABLE_OPENCL= if test $_os != iOS -a $_os != Android -a "x$enable_opencl" != "xno"; then - if test $_os = Darwin -a "$with_macosx_sdk" = "10.5"; then - AC_MSG_RESULT([disabled on OS X 10.5]) - else - AC_MSG_RESULT([yes]) - ENABLE_OPENCL=TRUE - AC_DEFINE(HAVE_FEATURE_OPENCL) - fi + AC_MSG_RESULT([yes]) + ENABLE_OPENCL=TRUE + AC_DEFINE(HAVE_FEATURE_OPENCL) else AC_MSG_RESULT([no]) fi commit 5fcd0d9c1e27878e1d31891eee669fe5ae55a8e6 Author: Norbert Thiebaud <[email protected]> Date: Sat Sep 13 18:25:04 2014 +0200 mac: enable-retina is now the default Change-Id: I311d6b359007b1d5799673e3d7733bdf2177df88 diff --git a/configure.ac b/configure.ac index b38ed83..7d6c249 100644 --- a/configure.ac +++ b/configure.ac @@ -1337,7 +1337,7 @@ AC_ARG_ENABLE(silent-msi, AC_ARG_ENABLE(macosx-retina, AS_HELP_STRING([--enable-macosx-retina], - [Declare the application as High Resolution Capable. (retina display) + [deprecated... enabled by default now. Kept for backward compat only. ]), ,) @@ -3040,13 +3040,6 @@ if test $_os = Darwin; then MACOSX_APP_NAME="$with_macosx_app_name" AC_MSG_RESULT([$MACOSX_APP_NAME]) - AC_MSG_CHECKING([build with mac retina support]) - if test "$enable_macosx_retina" = yes ; then - MACOSX_HIGH_RESOLUTION_VALUE=true - else - MACOSX_HIGH_RESOLUTION_VALUE=false - fi - AC_MSG_RESULT([$MACOSX_HIGH_RESOLUTION_VALUE]) fi AC_SUBST(MACOSX_SDK_PATH) AC_SUBST(MACOSX_SDK_VERSION) diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index 3dde394..892d0df 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -1468,7 +1468,7 @@ <key>LSMinimumSystemVersion</key> <string>@[email protected]</string> <key>NSHighResolutionCapable</key> - <@MACOSX_HIGH_RESOLUTION_VALUE@/> + <true/> </dict> </plist> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
