summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2009-09-06 18:09:24 +0000
committerMatthias Melcher <fltk@matthiasm.com>2009-09-06 18:09:24 +0000
commit184c1092e9851bdb4d2f2dd1227397f05eb58e17 (patch)
tree8cea2b62ab1854ca4a24e0d51faab1ea97678ee1
parent1b2df88ed0e91a1fdac2d7de9febfa0695d185da (diff)
Temporarily limited builds to 32-bit on OX S to stay compatible to Snow Leopard
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6849 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES2
-rw-r--r--configure.in11
2 files changed, 13 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 6b20c79df..a1931457d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.3.0
+ - Temporarily limited builds to 32-bit on OX S to stay
+ compatible to Snow Leopard
- Fixed Windows compile bug with "#define USE_COLORMAP 0"
(STR #2241)
- Fixed glibc 2.10 compiler problems (Fedora 11 and others)
diff --git a/configure.in b/configure.in
index bbc178df5..12299fc46 100644
--- a/configure.in
+++ b/configure.in
@@ -92,6 +92,17 @@ case $uname in
fi
fi
;;
+
+ Darwin*)
+ # Starting with 10.6 (Snow Leopard), OS X does not support
+ # Carbon calls anymore. We patch this until we are completely Cocoa compliant
+ # by limiting ourselves to 32 bit Intel compiles
+ if test `sw_vers -productVersion` = "10.6"; then
+ CFLAGS="$CFLAGS -arch i386"
+ CXXFLAGS="$CXXFLAGS -arch i386"
+ LDFLAGS="$LDFLAGS -arch i386"
+ fi
+ ;;
esac
dnl Define the libraries and link options we will need.