diff options
| author | Anders Carlsson <andersca@imendio.com> | 2005-11-22 10:03:32 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@src.gnome.org> | 2005-11-22 10:03:32 +0000 |
| commit | 1097260aa7ed40e508e181feed4d736727268eb5 (patch) | |
| tree | fc2cf27583bbe96d0e464d90e9fbec2f07d7b76a /configure.in | |
| parent | fbebb232db61324e89406a27bc914ace62c68e79 (diff) | |
| download | gtk+-1097260aa7ed40e508e181feed4d736727268eb5.tar.gz | |
Add quartz backend.
2005-11-21 Anders Carlsson <andersca@imendio.com>
* configure.in:
* gtk/Makefile.am:
* gdk/Makefile.am:
* gdk/quartz/*:
Add quartz backend.
* docs/tools/Makefile.am:
Only build docshooter when the X11 backend is used.
* gtk/gtkplug-stub.c:
Include gtkplug.h here.
* gtk/gtksocket-stub.c:
Include gtksocket.h here.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 7741c37208..3fb3599924 100644 --- a/configure.in +++ b/configure.in @@ -224,13 +224,13 @@ else gdktarget=x11 fi -AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/linux-fb/win32]] select non-default GDK target], +AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/linux-fb/win32/quartz]] select non-default GDK target], gdktarget=$with_gdktarget) AC_SUBST(gdktarget) case $gdktarget in - x11|linux-fb|win32) ;; - *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb or win32.]);; + x11|linux-fb|win32|quartz) ;; + *) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb, quartz or win32.]);; esac gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la @@ -1325,6 +1325,13 @@ else AM_CONDITIONAL(USE_WIN32, false) fi +if test "x$gdktarget" = "xquartz"; then + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa" + AM_CONDITIONAL(USE_QUARTZ, true) +else + AM_CONDITIONAL(USE_QUARTZ, false) +fi + GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" @@ -1569,6 +1576,9 @@ elif test "x$gdktarget" = "xlinux-fb" ; then gdk_windowing=' #define GDK_WINDOWING_FB #define GDK_NATIVE_WINDOW_POINTER' +elif test "x$gdktarget" = "xquartz" ; then + gdk_windowing=' +#define GDK_WINDOWING_QUARTZ' fi if test x$gdk_wchar_h = xyes; then @@ -1625,6 +1635,7 @@ gdk/win32/Makefile gdk/win32/rc/Makefile gdk/win32/rc/gdk.rc gdk/linux-fb/Makefile +gdk/quartz/Makefile gtk/Makefile gtk/makefile.msc gtk/gtkversion.h |