diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-05-19 10:45:21 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-05-19 10:45:50 -0500 |
| commit | 2d55b2e5ae0d4f1a05e1ce5b20a7b342d6ea8b1d (patch) | |
| tree | 9ff0e03f5970eda88faa9af3259eaccf2490fa56 | |
| parent | 123c226af5b529e5b4fdb9d930eac089706049c5 (diff) | |
enable coretext by default on Mac
use --disable-coretext explicitely to turn it off (and revert to ATSUI)
Change-Id: I86685482a08cd62665a94eb6e241b59a217d0b52
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 05a44fb291ef..337af8b8970f 100644 --- a/configure.ac +++ b/configure.ac @@ -10663,7 +10663,7 @@ dnl =================================================================== ENABLE_CORETEXT=NO if test "$_os" = "Darwin"; then AC_MSG_CHECKING([whether to use CoreText framework]) - if test "$enable_coretext" = yes -o "$BITNESS_OVERRIDE" = 64; then + if test "$enable_coretext" != no -o "$BITNESS_OVERRIDE" = 64; then AC_MSG_RESULT([yes]) ENABLE_CORETEXT=YES else diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index a4a69570e668..dfaecc7c7c47 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -381,10 +381,16 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ ApplicationServices \ )) else +ifeq ($(MACOSX_SDK_VERSION),1060) +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + ApplicationServices \ +)) +else $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ CoreText \ )) endif +endif else # ATSUI |