summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2014-03-16 21:18:22 (GMT)
committerKevin Walzer <kw@codebykevin.com>2014-03-16 21:18:22 (GMT)
commit7f35489789c22f3ffecf0bb04fee535339e0a771 (patch)
treec8c1bb2f71d24d918af27b84785cf4435c2108b6
parentf7d16318aae20d960e3c9a993cc28a8174359486 (diff)
downloadtk-7f35489789c22f3ffecf0bb04fee535339e0a771.zip
tk-7f35489789c22f3ffecf0bb04fee535339e0a771.tar.gz
tk-7f35489789c22f3ffecf0bb04fee535339e0a771.tar.bz2
Update configure files on Aqua to remove garbage collection flag, which is no longer supported with Xcode 5.1; also add key to Wish Info.plist to support high-resolution (Retina) displays.
-rw-r--r--macosx/Wish-Info.plist.in2
-rwxr-xr-xunix/configure2
-rw-r--r--unix/configure.in2
3 files changed, 4 insertions, 2 deletions
diff --git a/macosx/Wish-Info.plist.in b/macosx/Wish-Info.plist.in
index 90e00a4..78170f1 100644
--- a/macosx/Wish-Info.plist.in
+++ b/macosx/Wish-Info.plist.in
@@ -72,5 +72,7 @@ Copyright © 2001-2002 Jim Ingham &amp; Ian Reid</string>
<true/>
<key>OSAScriptingDefinition</key>
<string>Wish.sdef</string>
+ <key>NSHighResolutionCapable</key>
+ <string>True</string>
</dict>
</plist>
diff --git a/unix/configure b/unix/configure
index ab4f9f6..ad9b051 100755
--- a/unix/configure
+++ b/unix/configure
@@ -9631,7 +9631,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
- EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c -fobjc-gc'
+ EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c '
TK_WINDOWINGSYSTEM=AQUA
if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
diff --git a/unix/configure.in b/unix/configure.in
index 948eae2..4527612 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -369,7 +369,7 @@ fi
if test $tk_aqua = yes; then
AC_DEFINE(MAC_OSX_TK, 1, [Are we building TkAqua?])
LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
- EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c -fobjc-gc'
+ EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
TK_WINDOWINGSYSTEM=AQUA
if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
AC_DEFINE(TK_MAC_DEBUG, 1, [Are TkAqua debug messages enabled?])