Author: manolo
Date: 2010-11-18 05:23:52 -0800 (Thu, 18 Nov 2010)
New Revision: 7870
Log:
Mac OS X: compile with default architecture (i386 on 10.5, x86_64 on 10.6) and
allow
alternative architecture running configure with option --with-archflags="-arch
xxx"
Modified:
branches/branch-1.3/configure.in
Modified: branches/branch-1.3/configure.in
===================================================================
--- branches/branch-1.3/configure.in 2010-11-17 18:31:50 UTC (rev 7869)
+++ branches/branch-1.3/configure.in 2010-11-18 13:23:52 UTC (rev 7870)
@@ -33,6 +33,11 @@
dnl Required file in package...
AC_INIT(src/Fl.cxx)
+dnl So --with-archflags option is used during "checking size of long"
+if test `uname` = Darwin; then
+ CFLAGS="$CFLAGS $with_archflags"
+fi
+
dnl FLTK library versions...
FL_MAJOR_VERSION=1
FL_MINOR_VERSION=3
@@ -102,21 +107,6 @@
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
- d_ver_rev=`sw_vers -productVersion | sed -e 's/\.[[0-9]][[0-9]]*//2'`
- d_ver=`echo $d_ver_rev | sed -e 's/\.[[0-9]][[0-9]]*//'`
- d_rev=`echo $d_ver_rev | sed -e 's/[[0-9]][[0-9]]*\.//'`
- if test $d_ver -gt 10 -o $d_ver -eq 10 -a $d_rev -ge 6; then
- CFLAGS="$CFLAGS -arch i386"
- CXXFLAGS="$CXXFLAGS -arch i386"
- LDFLAGS="$LDFLAGS -arch i386"
- DSOFLAGS="$DSOFLAGS -arch i386"
- fi
- ;;
esac
dnl Define the libraries and link options we will need.
@@ -373,9 +363,7 @@
case $uname in
Darwin*)
# QD is not supported anymore since 1.3
- AC_DEFINE(USE_QUARTZ, 1)
AC_DEFINE(__APPLE_QUARTZ__)
- AC_DEFINE(__APPLE_COCOA__)
;;
esac
@@ -840,7 +828,7 @@
Darwin*)
# MacOS X uses Cocoa for graphics. There are still some Carbon
leftovers.
- LIBS="$LIBS -framework Carbon -framework Cocoa -framework
ApplicationServices -framework AudioToolbox"
+ LIBS="$LIBS -framework Cocoa -framework Carbon -framework AudioToolbox"
if test x$have_pthread = xyes; then
AC_DEFINE(HAVE_PTHREAD)
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
