2006-05-29 08:59:36 +00:00
# clutter package version number, (as distinct from shared library version)
2009-08-31 14:49:39 +00:00
# An odd micro number indicates in-progress development from Git
# An even micro number indicates a released version
#
# Making a point release:
# - increase clutter_micro_version to the next even number
# - increase clutter_interface_age to the next even number
# UNLESS there was an API addition/deprecation, in which case
# - set clutter_interface_age to 0
# After the release:
# - increase clutter_micro_version to the next odd number
# - increase clutter_interface_version to the next odd number
2009-07-28 12:23:26 +00:00
m4_define([clutter_major_version], [1])
2010-03-16 10:44:40 +00:00
m4_define([clutter_minor_version], [3])
2010-07-12 20:43:04 +00:00
m4_define([clutter_micro_version], [9])
2006-11-20 12:02:24 +00:00
2009-11-17 15:32:00 +00:00
m4_define([clutter_release_status],
[m4_if(m4_eval(clutter_micro_version % 2), [1], [git],
[m4_if(m4_eval(clutter_minor_version % 2), [1], [snapshot],
[release])])])
2009-05-25 13:04:53 +00:00
m4_define([clutter_version], [clutter_major_version.clutter_minor_version.clutter_micro_version])
2009-07-13 16:27:01 +00:00
2009-08-31 14:49:39 +00:00
# change this only when breaking the API
2009-07-28 12:23:26 +00:00
m4_define([clutter_api_version], [1.0])
2006-11-20 12:02:24 +00:00
2009-09-16 11:47:46 +00:00
# increase the interface age by 1 for each release; if the API changes,
2009-05-25 13:04:53 +00:00
# set to 0. interface_age and binary_age are used to create the soname
# of the shared object:
#
# (<minor> * 100 + <micro>) - <interface_age>
#
# this allows using the same soname for different micro-releases in case
# no API was added or deprecated. for instance:
#
2009-08-31 14:49:39 +00:00
# clutter 1.2.0 -> 100 * 2 + 0 = 200, interface age = 0 -> 200
# clutter 1.2.2 -> 100 * 2 + 2 = 202, interface age = 2 -> 200
# clutter 1.2.4 -> 100 * 2 + 4 = 204, interface age = 4 -> 200
2009-05-25 13:04:53 +00:00
# [ API addition, deprecation ]
2009-08-31 14:49:39 +00:00
# clutter 1.2.6 -> 100 * 2 + 6 = 206, interface age = 0 -> 206
# clutter 1.2.8 -> 100 * 2 + 8 = 208, interface age = 2 -> 206
# clutter 1.2.10 -> 100 * 2 + 10 = 210, interface age = 4 -> 206
2009-05-25 13:04:53 +00:00
# ...
2009-09-16 11:47:46 +00:00
#
2010-06-07 22:19:02 +00:00
m4_define([clutter_interface_age], [0])
2009-05-25 13:04:53 +00:00
m4_define([clutter_binary_age], [m4_eval(100 * clutter_minor_version + clutter_micro_version)])
2006-11-20 12:02:24 +00:00
2010-05-05 10:52:20 +00:00
AC_PREREQ([2.63])
2006-05-29 08:59:36 +00:00
2007-12-19 16:16:10 +00:00
AC_INIT([clutter],
2006-11-20 12:02:24 +00:00
[clutter_version],
2010-06-23 17:46:38 +00:00
[http://bugzilla.clutter-project.org/enter_bug.cgi?product=clutter],
2010-05-05 10:52:20 +00:00
[clutter],
[http://www.clutter-project.org])
2009-11-18 14:21:08 +00:00
2006-05-29 08:59:36 +00:00
AC_CONFIG_SRCDIR([clutter/clutter.h])
2009-11-18 14:21:08 +00:00
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build])
AC_CONFIG_MACRO_DIR([build/autotools])
2005-04-13 19:49:56 +00:00
2010-05-05 10:52:20 +00:00
AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-define dist-bzip2 check-news])
AM_SILENT_RULES([yes])
2006-05-29 08:59:36 +00:00
2006-11-20 12:02:24 +00:00
CLUTTER_MAJOR_VERSION=clutter_major_version
CLUTTER_MINOR_VERSION=clutter_minor_version
CLUTTER_MICRO_VERSION=clutter_micro_version
CLUTTER_VERSION=clutter_version
2007-03-23 15:20:35 +00:00
CLUTTER_API_VERSION=clutter_api_version
2009-05-25 13:04:53 +00:00
CLUTTER_MAJORMINOR=clutter_major_version.clutter_minor_version
2009-11-17 15:32:00 +00:00
CLUTTER_RELEASE_STATUS=clutter_release_status
2006-11-20 12:02:24 +00:00
AC_SUBST(CLUTTER_MAJOR_VERSION)
AC_SUBST(CLUTTER_MINOR_VERSION)
AC_SUBST(CLUTTER_MICRO_VERSION)
AC_SUBST(CLUTTER_VERSION)
2007-03-23 15:20:35 +00:00
AC_SUBST(CLUTTER_API_VERSION)
2006-05-29 08:59:36 +00:00
AC_SUBST(CLUTTER_MAJORMINOR)
2009-11-17 15:32:00 +00:00
AC_SUBST(CLUTTER_RELEASE_STATUS)
2006-05-29 08:59:36 +00:00
2009-09-16 11:47:46 +00:00
m4_define([lt_current], [m4_eval(100 * clutter_minor_version + clutter_micro_version - clutter_interface_age)])
2006-11-20 12:02:24 +00:00
m4_define([lt_revision], [clutter_interface_age])
2009-05-25 13:04:53 +00:00
m4_define([lt_age], [m4_eval(clutter_binary_age - clutter_interface_age)])
2006-11-20 12:02:24 +00:00
CLUTTER_LT_CURRENT=lt_current
CLUTTER_LT_REV=lt_revision
CLUTTER_LT_AGE=lt_age
2006-05-29 08:59:36 +00:00
CLUTTER_LT_VERSION="$CLUTTER_LT_CURRENT:$CLUTTER_LT_REV:$CLUTTER_LT_AGE"
CLUTTER_LT_LDFLAGS="-version-info $CLUTTER_LT_VERSION"
AC_SUBST(CLUTTER_LT_VERSION)
AC_SUBST(CLUTTER_LT_LDFLAGS)
2010-06-22 11:13:31 +00:00
AC_SUBST(CLUTTER_LINK_FLAGS)
2006-05-29 08:59:36 +00:00
dnl ========================================================================
2005-04-13 19:49:56 +00:00
# Checks for programs.
2008-11-07 19:32:28 +00:00
AM_PROG_CC_C_O
2010-03-02 13:32:46 +00:00
# require libtool >= 2.2
LT_PREREQ([2.2.6])
LT_INIT([disable-static])
2010-03-01 11:12:16 +00:00
2005-04-13 19:49:56 +00:00
# Checks for header files.
AC_HEADER_STDC
# Checks for typedefs, structures, and compiler characteristics.
2010-05-18 12:55:18 +00:00
AM_PATH_GLIB_2_0([2.18.0], [have_glib=yes], [have_glib=no],
[gobject gthread gmodule-no-export])
AS_IF([test "x$have_glib" = "xno"], AC_MSG_ERROR([glib-2.0 is required]))
2008-06-09 13:29:17 +00:00
2010-06-22 11:13:31 +00:00
# Check for -Bsymbolic-functions to avoid intra-library PLT jumps
clutter_LDFLAGS="${LDFLAGS}"
AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
LDFLAGS=-Wl,-Bsymbolic-functions
AC_TRY_LINK([], [int main (void) { return 0; }],
[
CLUTTER_LINK_FLAGS=-Wl[,]-Bsymbolic-functions
AC_MSG_RESULT([yes])
],
[
CLUTTER_LINK_FLAGS=
AC_MSG_RESULT([no])
])
LDFLAGS="${clutter_LDFLAGS}"
2008-04-25 13:37:36 +00:00
dnl ========================================================================
2009-05-25 13:04:53 +00:00
# defaults
2010-06-18 00:13:33 +00:00
CLUTTER_FLAVOUR=glx
configure.ac: don't have so many XYX_{LIBS,CFLAGS} vars
This removes EGL_{LIBS,CFLAGS}, GLX_{LIBS,CFLAGS}, OSX_{LIBS,CFLAGS},
WIN32_{LIBS,CFLAGS}, and GLES_{LIBS,CFLAGS} and instead we just append
to FLAVOUR_{LIBS,CFLAGS}.
This makes more of the file relocatable because there were previously
dependencies on the order that some variables were setup in.
2010-06-18 00:02:38 +00:00
FLAVOUR_LIBS=""
FLAVOUR_CFLAGS=""
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
CLUTTER_WINSYS_BASE=
CLUTTER_WINSYS_BASE_LIB=
2010-06-18 00:13:33 +00:00
CLUTTER_WINSYS=
2009-05-25 13:04:53 +00:00
clutter_gl_header=""
2008-05-29 09:28:24 +00:00
glesversion=1.1
2009-05-25 13:04:53 +00:00
use_gles2_wrapper=no
2009-06-09 11:43:57 +00:00
experimental_backend=no
experimental_image=no
2008-04-15 21:18:13 +00:00
2009-05-25 13:04:53 +00:00
AC_ARG_WITH([flavour],
2010-06-17 22:23:12 +00:00
[AC_HELP_STRING([--with-flavour=@<:@glx/opengl-egl-xlib/eglx/eglnative/osx/win32/fruity@:>@],
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
[Select the Clutter window system backend])],
2010-06-18 00:13:33 +00:00
[CLUTTER_FLAVOUR=$with_flavour])
2008-04-15 21:18:13 +00:00
2009-05-25 13:04:53 +00:00
AC_ARG_WITH([gles],
[AC_HELP_STRING([--with-gles=@<:@1.1/2.0@:>@],
[Select Clutter GLES version (for EGL backends)])],
[glesversion=$with_gles])
2008-04-25 13:37:36 +00:00
2009-05-25 13:04:53 +00:00
# backend specific pkg-config files
BACKEND_PC_FILES=""
2008-04-25 13:37:36 +00:00
2009-05-25 13:04:53 +00:00
# This is only used to decide whether to build tests/tools/disable-npots.la
AC_CHECK_LIB(dl, [dlopen], [HAVE_LIBDL=yes], [HAVE_LIBDL=no])
AM_CONDITIONAL(HAVE_LIBDL, [test "x$HAVE_LIBDL" = "xyes"])
dnl === Clutter windowing system backend ======================================
2010-06-18 00:13:33 +00:00
AS_CASE([$CLUTTER_FLAVOUR],
2009-05-25 13:04:53 +00:00
[glx],
[
clutter_gl_header="GL/gl.h"
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_GLX"
2009-10-13 14:27:06 +00:00
2010-06-18 00:56:23 +00:00
SUPPORT_X11=1
SUPPORT_XLIB=1
SUPPORT_GLX=1
2009-05-25 13:04:53 +00:00
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
COGL_DRIVER="gl"
2009-05-25 13:04:53 +00:00
2010-06-18 00:13:33 +00:00
CLUTTER_WINSYS=glx
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
CLUTTER_WINSYS_BASE=x11
CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
2010-06-18 00:25:46 +00:00
CLUTTER_SONAME_INFIX=glx
2009-05-25 13:04:53 +00:00
# Mesa 7.3 added a GL pkg-config file, finally
2010-06-18 12:59:00 +00:00
PKG_CHECK_EXISTS([gl],
[BACKEND_PC_FILES="$BACKEND_PC_FILES gl"],
# if a pkg-config file isn't found just add -lGL
# and hope for the best.
[FLAVOUR_LIBS="$FLAVOUR_LIBS -lGL"])
2009-05-25 13:04:53 +00:00
],
2010-06-17 22:23:12 +00:00
[opengl-egl-xlib],
[
clutter_gl_header="GL/gl.h"
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGL"
SUPPORT_X11=1
SUPPORT_XLIB=1
SUPPORT_EGL=1
SUPPORT_EGL_PLATFORM_POWERVR_X11=1
COGL_DRIVER="gl"
2010-06-18 03:38:43 +00:00
CLUTTER_WINSYS=egl
2010-06-17 22:23:12 +00:00
CLUTTER_WINSYS_BASE=x11
CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
# I think this winsys can be API and ABI compatible with the
# glx flavour so we can also be cheeky and use the same soname
CLUTTER_SONAME_INFIX=glx
PKG_CHECK_EXISTS([gl], [BACKEND_PC_FILES="$BACKEND_PC_FILES gl"], [])
PKG_CHECK_EXISTS([egl], [BACKEND_PC_FILES="$BACKEND_PC_FILES egl"], [])
],
2009-05-25 13:04:53 +00:00
[eglx],
[
# the GL header is defined in the COGL checks above
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGL"
2010-06-18 00:56:23 +00:00
SUPPORT_X11=1
SUPPORT_XLIB=1
SUPPORT_EGL=1
SUPPORT_EGL_PLATFORM_POWERVR_X11=1
2010-06-18 00:02:38 +00:00
2010-06-18 00:56:23 +00:00
COGL_DRIVER="gles"
2009-05-25 13:04:53 +00:00
2010-06-18 03:38:43 +00:00
CLUTTER_WINSYS=egl
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
CLUTTER_WINSYS_BASE=x11
CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
2010-06-18 00:25:46 +00:00
CLUTTER_SONAME_INFIX=eglx
2009-05-25 13:04:53 +00:00
],
[eglnative],
[
# the GL header is defined in the COGL checks above
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGLNATIVE"
2010-06-18 00:56:23 +00:00
SUPPORT_EGL=1
SUPPORT_EGL_PLATFORM_POWERVR_NULL=1
2009-05-25 13:04:53 +00:00
PKG_CHECK_MODULES(TSLIB, [tslib-1.0], [have_tslib=yes], [have_tslib=no])
AS_IF([test "x$have_tslib" = "xyes"],
[AC_DEFINE([HAVE_TSLIB], [1], [Have tslib for touchscreen handling])]
)
2010-06-18 00:02:38 +00:00
COGL_DRIVER="gles"
configure.ac: don't have so many XYX_{LIBS,CFLAGS} vars
This removes EGL_{LIBS,CFLAGS}, GLX_{LIBS,CFLAGS}, OSX_{LIBS,CFLAGS},
WIN32_{LIBS,CFLAGS}, and GLES_{LIBS,CFLAGS} and instead we just append
to FLAVOUR_{LIBS,CFLAGS}.
This makes more of the file relocatable because there were previously
dependencies on the order that some variables were setup in.
2010-06-18 00:02:38 +00:00
FLAVOUR_LIBS="$FLAVOUR_LIBS $TSLIB_LIBS"
FLAVOUR_CFLAGS="$FLAVOUR_CFLAGS $TSLIB_CFLAGS"
2010-06-18 00:13:33 +00:00
2010-06-18 03:38:43 +00:00
CLUTTER_WINSYS=egl
2010-06-18 00:25:46 +00:00
CLUTTER_SONAME_INFIX=eglnative
2009-05-25 13:04:53 +00:00
],
[fruity],
[
2009-06-09 11:43:57 +00:00
experimental_backend="yes"
2009-05-25 13:04:53 +00:00
# the GL header is defined in the COGL checks above
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_FRUITY"
AC_DEFINE([HAVE_CLUTTER_FRUITY], [1], [Have the Fruity backend])
2009-10-13 14:27:06 +00:00
AC_DEFINE([COGL_HAS_EGL_PLATFORM_FRUITY_SUPPORT], [1],
[Cogl supports OpenGLES using the EGL API with Fruity platform typedefs])
2009-05-25 13:04:53 +00:00
2010-06-18 00:02:38 +00:00
COGL_DRIVER="gles"
2010-06-18 00:07:59 +00:00
# the fruity backend requires a different handling for GLES
glesversion=fruity
2010-06-18 00:02:38 +00:00
configure.ac: don't have so many XYX_{LIBS,CFLAGS} vars
This removes EGL_{LIBS,CFLAGS}, GLX_{LIBS,CFLAGS}, OSX_{LIBS,CFLAGS},
WIN32_{LIBS,CFLAGS}, and GLES_{LIBS,CFLAGS} and instead we just append
to FLAVOUR_{LIBS,CFLAGS}.
This makes more of the file relocatable because there were previously
dependencies on the order that some variables were setup in.
2010-06-18 00:02:38 +00:00
FLAVOUR_LIBS="$FLAVOUR_LIBS -ObjC -framework Foundation -framework CoreFoundation -framework CoreGraphics -framework CoreSurface -framework GraphicsServices -framework OpenGLES -framework LayerKit -framework UIKit"
2010-06-18 00:13:33 +00:00
CLUTTER_WINSYS=fruity
2010-06-18 00:25:46 +00:00
CLUTTER_SONAME_INFIX=fruity
2009-05-25 13:04:53 +00:00
],
[osx],
[
2009-06-09 11:43:57 +00:00
experimental_backend="yes"
2009-05-25 13:04:53 +00:00
clutter_gl_header="OpenGL/gl.h"
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_OSX"
2010-06-18 00:56:23 +00:00
2009-05-25 13:04:53 +00:00
AC_DEFINE([HAVE_CLUTTER_OSX], [1], [Have the OSX backend])
2009-10-13 14:27:06 +00:00
AC_DEFINE([COGL_HAS_OSX_SUPPORT], [1], [Cogl supports the OSX window system])
2009-05-25 13:04:53 +00:00
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
COGL_DRIVER="gl"
2009-05-25 13:04:53 +00:00
AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering])
configure.ac: don't have so many XYX_{LIBS,CFLAGS} vars
This removes EGL_{LIBS,CFLAGS}, GLX_{LIBS,CFLAGS}, OSX_{LIBS,CFLAGS},
WIN32_{LIBS,CFLAGS}, and GLES_{LIBS,CFLAGS} and instead we just append
to FLAVOUR_{LIBS,CFLAGS}.
This makes more of the file relocatable because there were previously
dependencies on the order that some variables were setup in.
2010-06-18 00:02:38 +00:00
FLAVOUR_LIBS="$FLAVOUR_LIBS -framework Cocoa -framework OpenGL"
2010-06-18 00:13:33 +00:00
CLUTTER_WINSYS=osx
2010-06-18 00:25:46 +00:00
CLUTTER_SONAME_INFIX=osx
2009-05-25 13:04:53 +00:00
],
[win32],
[
clutter_gl_header="GL/gl.h"
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_WIN32"
AC_DEFINE([HAVE_CLUTTER_WIN32], [1], [Have the Win32 backend])
2009-10-13 14:27:06 +00:00
AC_DEFINE([COGL_HAS_WIN32_SUPPORT], [1], [Cogl supports the win32 window system])
AC_DEFINE([COGL_HAS_WGL_SUPPORT], [1], [Cogl supports OpenGL using the WGL API])
2009-05-25 13:04:53 +00:00
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
COGL_DRIVER="gl"
2009-05-25 13:04:53 +00:00
AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering])
configure.ac: don't have so many XYX_{LIBS,CFLAGS} vars
This removes EGL_{LIBS,CFLAGS}, GLX_{LIBS,CFLAGS}, OSX_{LIBS,CFLAGS},
WIN32_{LIBS,CFLAGS}, and GLES_{LIBS,CFLAGS} and instead we just append
to FLAVOUR_{LIBS,CFLAGS}.
This makes more of the file relocatable because there were previously
dependencies on the order that some variables were setup in.
2010-06-18 00:02:38 +00:00
FLAVOUR_LIBS="$FLAVOUR_LIBS -lopengl32 -lgdi32 -lwinmm"
FLAVOUR_CFLAGS="$FLAVOUR_CFLAGS -D_WIN32_WINNT=0x0500"
2009-05-25 13:04:53 +00:00
CLUTTER_LT_LDFLAGS="$CLUTTER_LT_LDFLAGS -no-undefined"
2010-01-15 22:56:37 +00:00
AC_CHECK_TOOL(WINDRES, windres, no)
if test "$WINDRES" = no; then
AC_MSG_ERROR([*** windres is required])
fi
2010-06-18 00:13:33 +00:00
CLUTTER_WINSYS=win32
2010-06-18 00:25:46 +00:00
CLUTTER_SONAME_INFIX=win32
2009-05-25 13:04:53 +00:00
],
2009-12-09 00:50:33 +00:00
[AC_MSG_ERROR([Invalid backend for Clutter: use glx, osx, win32, eglx, eglnative or fruity])]
2009-05-25 13:04:53 +00:00
)
2008-11-24 15:44:16 +00:00
2010-06-18 00:56:23 +00:00
AS_IF([test "x$SUPPORT_X11" = "x1"],
[ AC_DEFINE([COGL_HAS_X11_SUPPORT], [1], [Cogl supports the X11 window system])])
AS_IF([test "x$SUPPORT_XLIB" = "x1"],
[ AC_DEFINE([COGL_HAS_XLIB_SUPPORT], [1], [Cogl supports X11 using the Xlib API])])
AS_IF([test "x$SUPPORT_GLX" = "x1"],
[
AC_DEFINE([COGL_HAS_GLX_SUPPORT], [1], [Cogl supports OpenGL using the GLX API])
AC_DEFINE([HAVE_CLUTTER_GLX], [1], [Have the GLX backend])
AC_CHECK_HEADERS([GL/glx.h],
[],
[AC_MSG_ERROR([Unable to locate required GLX headers])])
AC_CHECK_LIB(GL, [glXCreateContext],
[HAVE_LIBGLX=yes],
[AC_MSG_ERROR([Required GLX library not found])])
])
AS_IF([test "x$SUPPORT_EGL" = "x1"],
[
AC_DEFINE([HAVE_CLUTTER_EGL], [1], [Have the EGL backend])
AC_DEFINE([COGL_HAS_EGL_SUPPORT], [1], [Cogl supports GLES using the EGL API])
])
AS_IF([test "x$SUPPORT_EGL_POWERVR_X11" = "x1"],
[
AC_DEFINE([COGL_HAS_EGL_PLATFORM_POWERVR_X11_SUPPORT], [1],
[Cogl supports OpenGLES using the EGL API with PowerVR X11 platform typedefs])
])
AS_IF([test "x$SUPPORT_EGL_POWERVR_NULL" = "x1"],
[
AC_DEFINE([COGL_HAS_EGL_PLATFORM_POWERVR_NULL_SUPPORT], [1],
[Cogl supports OpenGLES using the EGL API with PowerVR NULL platform typedefs])
])
2009-10-08 11:08:21 +00:00
# winsys conditionals for use in automake files...
2010-06-18 00:56:23 +00:00
AM_CONDITIONAL(SUPPORT_GLX, [test "x$SUPPORT_GLX" = "x1"])
AM_CONDITIONAL(SUPPORT_X11, [test "x$SUPPORT_X11" = "x1"])
AM_CONDITIONAL(SUPPORT_XLIB, [test "x$SUPPORT_XLIB" = "x1"])
AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "x1"])
AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_X11, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_X11" = "x1"])
AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_NULL, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_NULL" = "x1"])
2009-10-08 11:08:21 +00:00
AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_FRUITY, [test "x$CLUTTER_WINSYS" = "xfruity"])
AM_CONDITIONAL(SUPPORT_OSX, [test "x$CLUTTER_WINSYS" = "xosx"])
AM_CONDITIONAL(SUPPORT_WIN32, [test "x$CLUTTER_WINSYS" = "xwin32"])
2010-01-15 22:56:37 +00:00
2010-06-18 00:56:23 +00:00
dnl === COGL driver backend =====================================================
AS_IF([test "x$COGL_DRIVER" = "xgl"],
[ AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering]) ])
2010-06-18 00:02:38 +00:00
2010-06-18 00:56:23 +00:00
AS_IF([test "x$COGL_DRIVER" = "xgles"],
2010-06-18 00:02:38 +00:00
[
AS_CASE([$glesversion],
2010-06-18 12:35:09 +00:00
[1*],
[
clutter_gl_header="GLES/gl.h"
AC_DEFINE([HAVE_COGL_GLES], 1, [Have GL/ES for rendering])
AC_SUBST(COGL_GLES_VERSION, [COGL_HAS_GLES1])
PKG_CHECK_EXISTS([glesv1_cm],
2010-07-06 13:23:40 +00:00
[BACKEND_PC_FILES="$BACKEND_PC_FILES glesv1_cm"
NEED_SEPARATE_EGL=yes
],
2010-06-18 12:35:09 +00:00
[
2010-07-06 13:23:40 +00:00
AC_CHECK_HEADERS([$clutter_gl_header],
[],
[AC_MSG_ERROR([Unable to locate required GLES headers])])
# Check for a GLES 1.x Common Profile library with/without EGL.
#
# Note: historically GLES 1 libraries shipped with the
# EGL and GLES symbols all bundled in one library. Now
# the Khronos Implementers Guide defines two naming
# schemes: -lGLES_CM should be used for a library that
# bundles the GLES and EGL API together and -lGLESv1_CM
# would be used for a standalone GLES API.
2010-06-18 12:35:09 +00:00
AC_CHECK_LIB(GLES_CM, [eglInitialize],
2010-07-06 13:23:40 +00:00
[FLAVOUR_LIBS="$FLAVOUR_LIBS -lGLES_CM"],
[
AC_CHECK_LIB(GLESv1_CM, [glFlush],
[FLAVOUR_LIBS="$FLAVOUR_LIBS -lGLESv1_CM"
NEED_SEPARATE_EGL=yes
],
[AC_MSG_ERROR([Unable to locate required GLES 1.x Common Profile library])])
])
2010-06-18 12:35:09 +00:00
])
2010-07-06 13:23:40 +00:00
AS_IF([test "x$NEED_SEPARATE_EGL" = "xyes"],
[
PKG_CHECK_EXISTS([egl],
[BACKEND_PC_FILES="$BACKEND_PC_FILES egl"],
[
AC_CHECK_HEADERS([GLES/egl.h],
[],
[AC_MSG_ERROR([Unable to locate required EGL headers])])
AC_CHECK_LIB(EGL, [eglInitialize],
[FLAVOUR_LIBS="$FLAVOUR_LIBS -lEGL"],
[AC_MSG_ERROR([Unable to locate required EGL library])])
])
])
2010-06-18 12:35:09 +00:00
],
[2*],
[
clutter_gl_header="GLES2/gl2.h"
use_gles2_wrapper=yes
AC_DEFINE([HAVE_COGL_GLES2], 1, [Have GL/ES for rendering])
AC_SUBST(COGL_GLES_VERSION, [COGL_HAS_GLES2])
PKG_CHECK_EXISTS([glesv2],
2010-07-06 13:23:40 +00:00
[BACKEND_PC_FILES="$BACKEND_PC_FILES glesv2"],
[
AC_CHECK_HEADERS([$clutter_gl_header],
[],
[AC_MSG_ERROR([Unable to locate required GLES headers])])
FLAVOUR_LIBS="$FLAVOUR_LIBS -lGLESv2"
])
2010-06-18 12:35:09 +00:00
PKG_CHECK_EXISTS([egl],
[BACKEND_PC_FILES="$BACKEND_PC_FILES egl"],
[
AC_CHECK_HEADERS([EGL/egl.h],
[],
[AC_MSG_ERROR([Unable to locate required EGL headers])])
2010-07-06 13:23:40 +00:00
AC_CHECK_LIB(EGL, [eglInitialize],
[FLAVOUR_LIBS="$FLAVOUR_LIBS -lEGL"],
[AC_MSG_ERROR([Unable to locate required EGL library])])
2010-06-18 12:35:09 +00:00
FLAVOUR_LIBS="$FLAVOUR_LIBS -lEGL"
]
)
],
[fruity],
[
clutter_gl_header="GLES/gl.h"
AC_DEFINE([HAVE_COGL_GLES], 1, [Have GL/ES for rendering])
AC_SUBST(COGL_GLES_VERSION, [COGL_HAS_GLES1])
AC_CHECK_HEADERS([GLES/egl.h],
[],
[AC_MSG_ERROR([Unable to locate required GLES headers])])
],
[AC_MSG_ERROR([Unknown argument for --with-gles])]
2010-06-18 00:02:38 +00:00
)
]
)
2010-06-17 23:29:12 +00:00
AM_CONDITIONAL(USE_TSLIB, [test "x$have_tslib" = "xyes"])
2010-06-18 00:02:38 +00:00
AM_CONDITIONAL(USE_GLES2_WRAPPER, [test "x$use_gles2_wrapper" = "xyes"])
2010-06-18 13:30:23 +00:00
dnl The value of this variable will directly go in the install
dnl cogl-defines.h header
COGL_DEFINES_="";
dnl Space-separated list of symbols that should be defined in
dnl cogl-defines.h
COGL_DEFINES_SYMBOLS="";
if test "x$SUPPORT_X11" = "x1"; then
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_X11"
fi;
if test "x$SUPPORT_XLIB" = "x1"; then
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_XLIB"
fi;
AS_CASE([$COGL_DRIVER],
[gl],
[COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_GL"
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS CLUTTER_COGL_HAS_GL"],
[gles],
[COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_GLES"
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS CLUTTER_COGL_HAS_GLES"],
[AC_MSG_ERROR([Unknown cogl driver $COGL_DRIVER])])
dnl Copy all of the words in COGL_DEFINES_SYMBOLS as separate #define
dnl lines in COGL_DEFINES
for x in $COGL_DEFINES_SYMBOLS; do
COGL_DEFINES="$COGL_DEFINES
#define $x 1"
done;
AC_SUBST(COGL_DEFINES)
2009-05-25 13:04:53 +00:00
AS_IF([test "x$clutter_gl_header" = "x"], [AC_MSG_ERROR([Internal error: no GL header set])])
CLUTTER_GL_HEADER=$clutter_gl_header
2009-02-26 11:55:53 +00:00
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
dnl === Clutter substitutions =================================================
# Eventually the idea of a winsys should be hidden from Clutter and moved
# into Cogl, but for now we have CLUTTER_WINSYS...
AC_SUBST([CLUTTER_WINSYS])
# The same goes for the winsys-base...
AC_SUBST([CLUTTER_WINSYS_BASE])
AC_SUBST([CLUTTER_WINSYS_BASE_LIB])
2009-05-25 13:04:53 +00:00
AC_SUBST(CLUTTER_GL_HEADER)
AC_SUBST(CLUTTER_STAGE_TYPE)
2010-06-18 00:25:46 +00:00
AC_SUBST(CLUTTER_SONAME_INFIX)
2007-07-06 13:56:01 +00:00
2010-06-18 00:25:46 +00:00
CLUTTER_WINSYS_LIB=libclutter-$CLUTTER_SONAME_INFIX-$CLUTTER_API_VERSION.la
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
AC_SUBST([CLUTTER_WINSYS_LIB])
dnl === Clutter substitutions kept for backwards compatibility ================
AC_SUBST([CLUTTER_FLAVOUR])
CLUTTER_COGL=$COGL_DRIVER
AC_SUBST([CLUTTER_COGL])
dnl === Cogl substitutions ====================================================
AC_SUBST([COGL_IMAGE_BACKEND])
COGL_WINSYS=$CLUTTER_WINSYS
AC_SUBST([COGL_WINSYS])
AC_SUBST([COGL_DRIVER])
2008-04-29 16:30:47 +00:00
2009-05-25 13:04:53 +00:00
dnl === Image loading backend =================================================
IMAGE_PC_FILES=""
2008-04-25 13:37:36 +00:00
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
# Peek which winsys the user wants so that we can couple the osx winsys with
2009-05-25 13:04:53 +00:00
# quartz imageloader.
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
AS_IF([test "x$COGL_WINSYS" = "xosx"], [COGL_IMAGE_BACKEND=quartz], [COGL_IMAGE_BACKEND=gdk-pixbuf])
2008-04-25 13:37:36 +00:00
2009-11-09 16:44:34 +00:00
AC_ARG_WITH([imagebackend],
2009-05-25 13:04:53 +00:00
[AC_HELP_STRING([--with-imagebackend=@<:@gdk-pixbuf/quartz/internal@:>@],
[Select COGL image loading backend])],
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
[COGL_IMAGE_BACKEND=$with_imagebackend])
2007-07-06 13:56:01 +00:00
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
AS_CASE([$COGL_IMAGE_BACKEND],
2007-10-26 22:06:45 +00:00
2009-05-25 13:04:53 +00:00
[quartz],
2009-06-09 11:43:57 +00:00
[
experimental_image=yes
AC_DEFINE([USE_QUARTZ], 1, [Use Core Graphics (Quartz) for loading image data])
],
2007-10-26 22:06:45 +00:00
2009-05-25 13:04:53 +00:00
[gdk-pixbuf],
[
AC_DEFINE([USE_GDKPIXBUF], 1, [Use GdkPixbuf for loading image data])
IMAGE_PC_FILES="gdk-pixbuf-2.0"
],
2007-10-26 22:06:45 +00:00
2009-05-25 13:04:53 +00:00
[internal],
2009-06-09 11:43:57 +00:00
[
experimental_image=yes
AC_DEFINE([USE_INTERNAL], 1, [Use internal image decoding for loading image data])
],
2008-03-25 15:42:50 +00:00
2009-05-25 13:04:53 +00:00
[AC_MSG_ERROR([Unknown argument for --with-imagebackend])]
)
2008-03-25 15:42:50 +00:00
2009-05-25 13:04:53 +00:00
dnl === X11 checks, only for X11-based backends ===============================
X11_PC_FILES=""
2009-05-29 13:23:16 +00:00
x11_tests=no
2008-03-25 15:42:50 +00:00
2010-06-18 00:56:23 +00:00
AS_IF([test "x$SUPPORT_XLIB" = "x1"],
2009-05-25 13:04:53 +00:00
[
# base X11 includes and libraries
AC_MSG_CHECKING([for X11])
2008-03-25 15:42:50 +00:00
2009-05-25 13:04:53 +00:00
# start with pkg-config
PKG_CHECK_EXISTS([x11], [have_x11=yes], [have_x11=no])
AS_IF([test "x$have_x11" = "xyes"],
[
X11_PC_FILES="x11"
2010-02-01 14:48:50 +00:00
# we actually need to ask for CFLAGS and LIBS
X11_CFLAGS=`$PKG_CONFIG --cflags $X11_PC_FILES`
X11_LIBS=`$PKG_CONFIG --libs $X11_PC_FILES`
2009-05-25 13:04:53 +00:00
AC_MSG_RESULT([found])
],
[
# no pkg-config, let's go old school
AC_PATH_X
AS_IF([test "x$no_x" = "xyes"],
[AC_MSG_ERROR([No X11 Libraries found])],
[
AS_IF([test "x$x_includes" != "xNONE" && test -n "$x_includes"],
[X11_CFLAGS=-I`echo $x_includes | sed -e "s/:/ -I/g"`])
AS_IF([test "x$x_libraries" != "xNONE" && test -n "$x_libraries"],
[X11_LIBS=-L`echo $x_libraries | sed -e "s/:/ -L/g"`])
AC_MSG_RESULT([found])
]
)
]
)
2009-06-06 11:34:00 +00:00
# XEXT (required)
AC_MSG_CHECKING([for XEXT extension])
PKG_CHECK_EXISTS([xext], [have_xext=yes], [have_xext=no])
AS_IF([test "x$have_xext" = "xyes"],
[
AC_DEFINE(HAVE_XEXT, [1], [Define to 1 if we have the XEXT X extension])
X11_LIBS="$X11_LIBS -lXext"
X11_PC_FILES="$X11_PC_FILES xext"
AC_MSG_RESULT([found])
],
[AC_MSG_ERROR([Not found])]
)
2009-05-25 13:04:53 +00:00
# XFIXES (required)
AC_MSG_CHECKING([for XFIXES extension >= 3])
PKG_CHECK_EXISTS([xfixes >= 3], [have_xfixes=yes], [have_xfixes=no])
AS_IF([test "x$have_xfixes" = "xyes"],
[
AC_DEFINE(HAVE_XFIXES, [1], [Define to 1 if we have the XFIXES X extension])
X11_LIBS="$X11_LIBS -lXfixes"
X11_PC_FILES="$X11_PC_FILES xfixes"
2008-03-25 15:42:50 +00:00
2009-05-25 13:04:53 +00:00
AC_MSG_RESULT([found])
],
[AC_MSG_ERROR([Not found])]
)
2007-03-27 21:09:11 +00:00
2009-05-25 13:04:53 +00:00
# XDAMAGE (required)
AC_MSG_CHECKING([for XDAMAGE extension])
PKG_CHECK_EXISTS([xdamage], [have_xdamage=yes], [have_xdamage=no])
AS_IF([test "x$have_xdamage" = "xyes"],
[
AC_DEFINE(HAVE_XDAMAGE, [1], [Define to 1 if we have the XDAMAGE X extension])
2007-03-22 18:21:59 +00:00
2009-05-25 13:04:53 +00:00
X11_LIBS="$X11_LIBS -lXdamage"
X11_PC_FILES="$X11_PC_FILES xdamage"
2008-04-28 13:18:16 +00:00
2009-05-25 13:04:53 +00:00
AC_MSG_RESULT([found])
],
[AC_MSG_ERROR([not found])]
)
2008-04-28 13:18:16 +00:00
2009-05-25 13:04:53 +00:00
# XCOMPOSITE (optional)
AC_MSG_CHECKING([for XCOMPOSITE extension >= 0.4])
PKG_CHECK_EXISTS([xcomposite >= 0.4], [have_xcomposite=yes], [have_xcomposite=no])
AS_IF([test "x$have_xcomposite" = "xyes"],
[
AC_DEFINE(HAVE_XCOMPOSITE, [1], [Define to 1 if we have the XCOMPOSITE X extension])
2008-04-28 13:18:16 +00:00
2009-05-25 13:04:53 +00:00
X11_LIBS="$X11_LIBS -lXcomposite"
X11_PC_FILES="$X11_PC_FILES xcomposite"
2007-10-29 16:50:34 +00:00
2009-05-25 13:04:53 +00:00
AC_MSG_RESULT([found])
],
2010-03-18 20:27:18 +00:00
[AC_MSG_ERROR([not found])]
2009-05-25 13:04:53 +00:00
)
2009-07-13 16:27:01 +00:00
# XINPUT (optional)
2009-05-25 13:04:53 +00:00
xinput=no
AC_ARG_ENABLE([xinput],
[AS_HELP_STRING([--enable-xinput], [Use the XINPUT X extension])],
[
AS_IF([test "x$enableval" = "xyes"],
[PKG_CHECK_MODULES(XINPUT, [xi], [xinput=yes], [xinput=no])]
)
],
2009-06-05 11:26:29 +00:00
[xinput=no])
2009-05-25 13:04:53 +00:00
AS_CASE([$xinput],
[yes],
[
2010-06-14 16:29:21 +00:00
AC_DEFINE(HAVE_XINPUT, 1, [Use the XINPUT X extension])
2009-06-04 12:41:32 +00:00
2009-05-25 13:04:53 +00:00
X11_LIBS="$X11_LIBS -lXi"
X11_PC_FILES="$X11_PC_FILES xi"
],
[no],
2009-06-17 14:09:16 +00:00
[],
2009-05-25 13:04:53 +00:00
)
2010-06-14 16:29:21 +00:00
# XKB
clutter_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X11_CFLAGS"
clutter_save_LIBS="$LIBS"
LIBS="$LIBS $X11_LIBS"
have_xkb=no
AC_CHECK_FUNC([XkbQueryExtension],
[
AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension])
have_xkb=yes
])
CPPFLAGS="$clutter_save_CPPFLAGS"
LIBS="$clutter_save_LIBS"
2010-03-18 20:27:18 +00:00
x11_tests=yes
2009-06-05 11:46:37 +00:00
BACKEND_PC_FILES="$BACKEND_PC_FILES $X11_PC_FILES"
configure.ac: don't have so many XYX_{LIBS,CFLAGS} vars
This removes EGL_{LIBS,CFLAGS}, GLX_{LIBS,CFLAGS}, OSX_{LIBS,CFLAGS},
WIN32_{LIBS,CFLAGS}, and GLES_{LIBS,CFLAGS} and instead we just append
to FLAVOUR_{LIBS,CFLAGS}.
This makes more of the file relocatable because there were previously
dependencies on the order that some variables were setup in.
2010-06-18 00:02:38 +00:00
FLAVOUR_LIBS="$FLAVOUR_LIBS $X11_LIBS"
FLAVOUR_CFLAGS="$FLAVOUR_CFLAGS $X11_CFLAGS"
2009-05-25 13:04:53 +00:00
]
)
2007-03-22 18:21:59 +00:00
2009-05-29 13:23:16 +00:00
AM_CONDITIONAL(X11_TESTS, [test "x$x11_tests" = "xyes"])
2007-01-23 20:29:11 +00:00
2009-05-25 13:04:53 +00:00
dnl === JSON parser check =====================================================
2005-04-13 19:49:56 +00:00
2009-06-25 17:56:52 +00:00
# we allow building clutter with the internal copy of json-glib
# for platforms without it, but by default we depend on the
# system copy
m4_define([default_json], [check])
2008-04-24 18:53:43 +00:00
AC_ARG_WITH([json],
2009-06-25 17:56:52 +00:00
AC_HELP_STRING([--with-json=@<:@internal/check/system@:>@],
[Select the JSON-GLib copy to use @<:@default=default_json@:>@]),
2008-04-24 18:53:43 +00:00
[],
2009-06-25 17:56:52 +00:00
[with_json=default_json])
2008-04-24 18:53:43 +00:00
2010-03-18 20:36:02 +00:00
experimental_json=no
2009-05-25 13:04:53 +00:00
AS_CASE([$with_json],
[internal],
[
JSON_PREFIX=json
2010-03-18 20:36:02 +00:00
experimental_json=yes
2009-05-25 13:04:53 +00:00
have_json=no
],
2009-06-25 17:56:52 +00:00
[system],
[
AC_MSG_CHECKING([for installed JSON-GLib])
2010-06-22 07:00:40 +00:00
PKG_CHECK_EXISTS([json-glib-1.0 >= 0.10],
2009-06-25 17:56:52 +00:00
[have_json=yes],
[have_json=no])
AS_IF([test "x$have_json" = "xyes"],
[
JSON_PREFIX=json-glib
2010-06-22 07:00:40 +00:00
JSON_GLIB_PC="json-glib-1.0 >= 0.10"
2009-06-25 17:56:52 +00:00
AC_DEFINE([HAVE_JSON_GLIB],
[1],
[Have the JSON-GLib library installed])
AC_MSG_RESULT([found])
],
[AC_MSG_ERROR([not found])]
)
],
2009-05-25 13:04:53 +00:00
[check],
[
AC_MSG_CHECKING([for installed JSON-GLib])
2009-12-01 15:17:16 +00:00
PKG_CHECK_EXISTS([json-glib-1.0 >= 0.8],
2009-06-25 17:56:52 +00:00
[have_json=yes],
[have_json=no])
2009-05-25 13:04:53 +00:00
AS_IF([test "x$have_json" = "xyes"],
[
JSON_PREFIX=json-glib
2009-12-01 15:17:16 +00:00
JSON_GLIB_PC="json-glib-1.0 >= 0.8"
2009-05-25 13:04:53 +00:00
2009-06-25 17:56:52 +00:00
AC_DEFINE([HAVE_JSON_GLIB],
[1],
[Have the JSON-GLib library installed])
2009-05-25 13:04:53 +00:00
AC_MSG_RESULT([found])
],
[
JSON_PREFIX=json
2010-03-18 20:36:02 +00:00
experimental_json=yes
2009-05-25 13:04:53 +00:00
AC_MSG_RESULT([not found, using internal copy])
]
)
],
[AC_MSG_ERROR([Unknown argument for --with-json])]
)
2008-04-23 13:58:58 +00:00
AC_SUBST(JSON_PREFIX)
AM_CONDITIONAL(LOCAL_JSON_GLIB, test "x$have_json" = "xno")
2009-05-25 13:04:53 +00:00
dnl === Enable debug level ====================================================
2005-04-13 19:49:56 +00:00
2009-05-25 13:04:53 +00:00
m4_define([debug_default], [m4_if(m4_eval(clutter_minor_version % 2), [1], [yes], [minimum])])
AC_ARG_ENABLE([debug],
[AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
[Control Clutter debugging level @<:@default=debug_default@:>@])],
[],
[enable_debug=debug_default])
AS_CASE([$enable_debug],
[yes],
[
test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
2009-05-26 16:23:24 +00:00
CLUTTER_DEBUG_CFLAGS="-DCLUTTER_ENABLE_DEBUG"
2009-05-25 13:04:53 +00:00
],
[minimum],
2009-05-26 16:23:24 +00:00
[CLUTTER_DEBUG_CFLAGS="-DCLUTTER_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"],
2009-05-25 13:04:53 +00:00
[no],
[CLUTTER_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"],
[AC_MSG_ERROR([Unknown argument for --enable-debug])]
)
2006-11-20 12:02:24 +00:00
AC_SUBST(CLUTTER_DEBUG_CFLAGS)
2010-02-17 17:40:57 +00:00
m4_define([cogl_debug_default], [minimum])
2009-05-19 15:00:18 +00:00
AC_ARG_ENABLE([cogl-debug],
[AC_HELP_STRING([--enable-cogl-debug=@<:@no/yes@:>@],
2009-05-25 13:04:53 +00:00
[Control COGL debugging level @<:@default=cogl_debug_default@:>@])],
2009-05-19 15:00:18 +00:00
[],
2009-05-25 13:04:53 +00:00
[enable_cogl_debug=cogl_debug_default])
2009-05-19 15:00:18 +00:00
2009-05-25 13:04:53 +00:00
AS_CASE([$enable_cogl_debug],
2009-05-19 15:00:18 +00:00
2009-05-25 13:04:53 +00:00
[yes],
[COGL_DEBUG_CFLAGS="-DCOGL_GL_DEBUG -DCOGL_HANDLE_DEBUG -DCOGL_ENABLE_DEBUG"],
2009-05-19 15:00:18 +00:00
2009-05-25 13:04:53 +00:00
[minimum],
[COGL_DEBUG_CFLAGS="-DCOGL_ENABLE_DEBUG"],
2009-05-19 15:00:18 +00:00
2009-05-25 13:04:53 +00:00
[no],
[COGL_DEBUG_CFLAGS=""],
2009-05-19 15:00:18 +00:00
2009-05-25 13:04:53 +00:00
[AC_MSG_ERROR([Invalid value for --enable-cogl-debug])]
2009-05-19 15:00:18 +00:00
)
AC_SUBST(COGL_DEBUG_CFLAGS)
2010-01-29 09:26:47 +00:00
dnl === Conformance test suite ================================================
AC_ARG_ENABLE([conformance],
[AC_HELP_STRING([--enable-conformance=@<:@no/yes@:>@],
[Build conformance test suite @<:@default=yes@:>@])],
[],
[enable_conformance=yes])
AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_conformance" = "xyes"])
dnl === Profiling =============================================================
2009-03-17 13:07:46 +00:00
m4_define([profile_default], [no])
AC_ARG_ENABLE(profile,
AC_HELP_STRING([--enable-profile=@<:@no/yes@:>@],
[Turn on profiling support. yes; All profiling probe points are compiled in and may be runtime enabled. no; No profiling support will built into clutter. @<:@default=no@:>@]),
2010-01-29 09:29:37 +00:00
[],
2009-03-17 13:07:46 +00:00
[enable_profile=profile_default])
AS_CASE([$enable_profile],
2010-01-29 09:29:37 +00:00
[yes],
[
AS_IF([test "x$GCC" = "xyes"],
[
PKG_CHECK_MODULES([PROFILE_DEP], [uprof-0.2])
CLUTTER_PROFILE_CFLAGS=" -DCLUTTER_ENABLE_PROFILE -DCOGL_ENABLE_PROFILE $PROFILE_DEP_CFLAGS"
CLUTTER_PROFILE_LDFLAGS=" $PROFILE_DEP_LIBS"
AS_IF([test "x$enable_debug" = "xyes"], [CLUTTER_PROFILE_CFLAGS+=" -DUPROF_DEBUG"])
],
[
AC_MSG_ERROR([--enable-profile is currently only supported if using GCC])
])
],
[no],
[
CLUTTER_PROFILE_CFLAGS=""
CLUTTER_PROFILE_LDFLAGS=""
],
[*], [AC_MSG_ERROR([Invalid value for --enable-profile])]
2009-03-17 13:07:46 +00:00
)
AM_CONDITIONAL(PROFILE, test "x$enable_profile" != "xno")
AC_SUBST(CLUTTER_PROFILE_CFLAGS)
AC_SUBST(CLUTTER_PROFILE_LDFLAGS)
2010-01-04 14:53:03 +00:00
dnl === Coverage report =======================================================
AC_PATH_PROG([GCOV], [gcov], [enable_gcov=no])
AC_MSG_CHECKING([whether to build with gcov testing])
AC_ARG_ENABLE([gcov],
[AS_HELP_STRING([--enable-gcov],
2010-02-17 17:40:57 +00:00
[Whether to enable coverage testing (requires gcc
2010-01-04 14:53:03 +00:00
and gcov)])],
[],
[enable_gcov=no])
AS_IF([test "x$enable_gcov" = "xyes" && test "x$GCC" = "xyes"],
[
2010-01-29 09:29:53 +00:00
AS_IF([test "x$enable_conformance" = "xno"],
[AC_MSG_WARN([Conformance test suite is disabled, the coverage report will be incomplete])],
[AC_MSG_RESULT([yes])]
)
2010-01-04 14:53:03 +00:00
GCOV_CFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
GCOV_LDFLAGS="-lgcov"
2010-01-29 09:29:53 +00:00
],
[AC_MSG_RESULT([no])]
2010-01-04 14:53:03 +00:00
)
AM_CONDITIONAL([GCOV_ENABLED], [test "x$enable_gcov" = "xyes"])
AC_SUBST([GCOV_CFLAGS])
AC_SUBST([GCOV_LDFLAGS])
2009-05-25 13:04:53 +00:00
dnl === Enable strict compiler flags ==========================================
2007-07-26 10:00:09 +00:00
# use strict compiler flags only on development releases
2009-06-06 13:38:10 +00:00
m4_define([maintainer_flags_default], [m4_if(m4_eval(clutter_minor_version % 2), [1], [yes], [no])])
2007-07-26 10:00:09 +00:00
AC_ARG_ENABLE([maintainer-flags],
2009-05-25 13:04:53 +00:00
[AC_HELP_STRING([--enable-maintainer-flags=@<:@no/yes@:>@],
[Use strict compiler flags @<:@default=maintainer_flags_default@:>@])],
[],
[enable_maintainer_flags=maintainer_flags_default])
AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"],
[
2009-06-08 01:22:26 +00:00
AS_COMPILER_FLAGS([MAINTAINER_CFLAGS],
2010-02-12 14:46:43 +00:00
["-Wall -Wshadow -Wcast-align -Wuninitialized
2010-02-01 14:53:13 +00:00
-Wno-strict-aliasing -Wempty-body -Wformat
-Wformat-security -Winit-self"])
2009-05-25 13:04:53 +00:00
]
)
2007-07-26 10:00:09 +00:00
2009-01-23 13:09:51 +00:00
AC_SUBST(MAINTAINER_CFLAGS)
2007-07-26 10:00:09 +00:00
2009-03-17 13:07:46 +00:00
dnl === Dependencies, compiler flags and linker libraries =====================
2010-04-12 17:34:06 +00:00
CLUTTER_REQUIRES="cairo >= 1.4 atk >= 1.7 pangocairo >= 1.20 $IMAGE_PC_FILES $BACKEND_PC_FILES $JSON_GLIB_PC"
2009-03-17 13:07:46 +00:00
PKG_CHECK_MODULES(CLUTTER_DEPS, [$CLUTTER_REQUIRES])
AC_SUBST(CLUTTER_REQUIRES)
configure.ac: don't have so many XYX_{LIBS,CFLAGS} vars
This removes EGL_{LIBS,CFLAGS}, GLX_{LIBS,CFLAGS}, OSX_{LIBS,CFLAGS},
WIN32_{LIBS,CFLAGS}, and GLES_{LIBS,CFLAGS} and instead we just append
to FLAVOUR_{LIBS,CFLAGS}.
This makes more of the file relocatable because there were previously
dependencies on the order that some variables were setup in.
2010-06-18 00:02:38 +00:00
CLUTTER_CFLAGS="$FLAVOUR_CFLAGS $CLUTTER_DEPS_CFLAGS $CLUTTER_PROFILE_CFLAGS $GLIB_CFLAGS"
CLUTTER_LIBS="$FLAVOUR_LIBS $CLUTTER_DEPS_LIBS $CLUTTER_PROFILE_LDFLAGS $GLIB_LIBS"
2009-03-17 13:07:46 +00:00
AC_SUBST(CLUTTER_CFLAGS)
AC_SUBST(CLUTTER_LIBS)
2009-05-25 13:04:53 +00:00
dnl === GObject-Introspection check ===========================================
2009-02-20 14:39:51 +00:00
2010-05-05 10:52:20 +00:00
GOBJECT_INTROSPECTION_CHECK([0.6.7])
2007-07-26 10:00:09 +00:00
2009-05-25 13:04:53 +00:00
dnl === GTK Doc check =========================================================
2006-11-20 12:02:24 +00:00
2010-05-19 15:10:05 +00:00
GTK_DOC_CHECK([1.13], [--flavour no-tmpl])
2006-05-29 08:59:36 +00:00
2009-07-13 16:27:01 +00:00
# we don't want to build the documentation from a Git clone unless we
2008-07-17 12:21:01 +00:00
# explicitly tell configure to do so; this allows avoiding to recurse into
# the documentation directory when building Clutter inside Poky for a
# target device that doesn't have gtk-doc installed. for reference
# see: http://bugzilla.openedhand.com/show_bug.cgi?id=1047
#
2009-07-13 16:27:01 +00:00
# we use autogen.sh as it exists only inside the Git clones, and it
2008-07-17 12:21:01 +00:00
# is not packaged into tarballs.
2009-05-25 13:04:53 +00:00
AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes" || test ! -f "autogen.sh"])
2007-05-30 23:16:58 +00:00
2009-05-25 13:04:53 +00:00
# prefixes for fixing gtk-doc references
2009-09-09 15:15:54 +00:00
CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
2009-05-25 13:04:53 +00:00
GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
2009-09-09 15:15:54 +00:00
AC_SUBST(CAIRO_PREFIX)
2009-05-25 13:04:53 +00:00
AC_SUBST(GLIB_PREFIX)
AC_SUBST(PANGO_PREFIX)
2006-05-29 08:59:36 +00:00
2009-05-25 13:04:53 +00:00
dnl === Manual ================================================================
2009-09-03 12:04:59 +00:00
AC_ARG_ENABLE([docs],
[AC_HELP_STRING([--enable-docs=@<:@no/yes@:>@],
[Build optional documentation; requires xsltproc and jw.])],
[enable_docs=$enableval],
[enable_docs=no])
enable_pdfs=no
AS_IF([test "x$enable_docs" = "xyes"],
2009-05-25 13:04:53 +00:00
[
AC_PATH_PROG(JW, [jw], [no])
AS_IF([test "x$JW" = "xno"],
2009-09-03 12:04:59 +00:00
[
AC_MSG_WARN([jw not found; pdf generation has been disabled])
],
[enable_pdfs=yes])
2009-09-02 17:11:06 +00:00
AC_PATH_PROG(XSLTPROC, [xsltproc], [no])
AS_IF([test "x$XSLTPROC" = "xno"],
2009-09-03 12:04:59 +00:00
[
AC_MSG_ERROR([xsltproc not found])
])
2009-05-25 13:04:53 +00:00
]
)
2005-04-13 19:49:56 +00:00
2009-09-03 12:04:59 +00:00
AM_CONDITIONAL(ENABLE_DOCS, [test "x$enable_docs" = "xyes"])
AM_CONDITIONAL(ENABLE_PDFS, [test "x$enable_pdfs" = "xyes"])
2005-04-13 19:49:56 +00:00
2009-05-25 13:04:53 +00:00
dnl === I18N ==================================================================
2005-04-13 19:49:56 +00:00
2008-06-10 16:47:38 +00:00
GETTEXT_PACKAGE="clutter-$CLUTTER_API_VERSION"
AC_SUBST(GETTEXT_PACKAGE)
2009-05-25 13:04:53 +00:00
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,
"$GETTEXT_PACKAGE",
2008-06-10 16:47:38 +00:00
[The prefix for our gettext translation domains.])
2009-06-10 13:23:45 +00:00
ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
2008-06-10 16:47:38 +00:00
AM_GLIB_GNU_GETTEXT
2009-01-06 12:11:07 +00:00
GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
2008-06-10 16:47:38 +00:00
2009-05-25 13:04:53 +00:00
dnl ===========================================================================
2006-11-20 12:02:24 +00:00
AC_CONFIG_FILES([
Makefile
2009-02-17 14:56:35 +00:00
build/Makefile
build/autotools/Makefile
2010-01-18 13:56:56 +00:00
build/mingw/Makefile
2006-11-20 12:02:24 +00:00
clutter/Makefile
clutter/clutter-version.h
2008-04-23 13:58:58 +00:00
clutter/clutter-json.h
2007-11-15 14:45:27 +00:00
clutter/x11/Makefile
2008-01-23 11:08:39 +00:00
clutter/x11/clutter-x11.pc
2007-03-22 18:21:59 +00:00
clutter/glx/Makefile
2010-06-18 03:38:43 +00:00
clutter/egl/Makefile
2008-04-25 13:37:36 +00:00
clutter/fruity/Makefile
2007-10-26 22:06:45 +00:00
clutter/osx/Makefile
2008-03-25 15:42:50 +00:00
clutter/win32/Makefile
clutter/win32/clutter-win32.pc
2010-06-14 11:38:25 +00:00
clutter/cally/Makefile
clutter/cally/cally.pc
2007-03-26 23:18:39 +00:00
clutter/cogl/Makefile
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
clutter/cogl/cogl/Makefile
2010-06-18 13:30:23 +00:00
clutter/cogl/cogl/cogl-defines.h
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-28 01:02:02 +00:00
clutter/cogl/cogl/cogl.pc
clutter/cogl/cogl/driver/Makefile
clutter/cogl/cogl/driver/gl/Makefile
clutter/cogl/cogl/driver/gles/Makefile
2010-04-15 23:28:15 +00:00
clutter/cogl/cogl/tesselator/Makefile
2009-07-29 16:21:07 +00:00
clutter/cogl/pango/Makefile
2007-10-08 15:03:22 +00:00
clutter/json/Makefile
2007-05-04 23:53:49 +00:00
tests/Makefile
2010-04-26 18:07:22 +00:00
tests/accessibility/Makefile
2008-11-07 19:32:28 +00:00
tests/conform/Makefile
2010-06-06 21:47:02 +00:00
tests/conform/test-launcher.sh
2008-11-07 19:32:28 +00:00
tests/data/Makefile
tests/interactive/Makefile
2010-06-06 21:47:02 +00:00
tests/interactive/wrapper.sh
2008-11-07 19:32:28 +00:00
tests/micro-bench/Makefile
tests/tools/Makefile
2006-11-20 12:02:24 +00:00
doc/Makefile
doc/reference/Makefile
2008-04-25 13:37:36 +00:00
doc/reference/clutter/Makefile
2009-06-01 16:35:41 +00:00
doc/reference/clutter/clutter-docs.xml
2008-04-25 13:37:36 +00:00
doc/reference/cogl/Makefile
2009-06-01 16:35:41 +00:00
doc/reference/cogl/cogl-docs.xml
2010-07-05 12:59:36 +00:00
doc/reference/cally/Makefile
doc/reference/cally/cally-docs.xml
2009-09-03 12:04:59 +00:00
doc/common/Makefile
2007-05-30 23:16:58 +00:00
doc/manual/Makefile
2009-09-03 12:04:59 +00:00
doc/manual/clutter-manual.xml
2008-12-11 16:57:46 +00:00
doc/cookbook/Makefile
2009-09-03 12:04:59 +00:00
doc/cookbook/clutter-cookbook.xml
2008-06-10 16:47:38 +00:00
po/Makefile.in
2006-11-20 12:02:24 +00:00
clutter.pc
2005-04-13 19:49:56 +00:00
])
2006-06-06 20:40:40 +00:00
2006-11-20 12:02:24 +00:00
AC_OUTPUT
2009-05-25 13:04:53 +00:00
dnl === Summary ===============================================================
2006-06-06 20:40:40 +00:00
echo ""
2009-11-17 15:32:00 +00:00
echo "Clutter - $VERSION (${CLUTTER_RELEASE_STATUS})"
2009-12-01 15:17:49 +00:00
# Global flags
2006-06-06 20:40:40 +00:00
echo ""
2009-11-17 15:32:00 +00:00
echo " • Global:"
echo " Prefix: ${prefix}"
echo " Flavour: ${CLUTTER_WINSYS}/${COGL_DRIVER}"
echo " Target library: ${CLUTTER_WINSYS_LIB}"
2009-12-01 15:17:49 +00:00
# Compiler/Debug related flags
2006-06-06 20:40:40 +00:00
echo ""
2009-11-17 15:32:00 +00:00
echo " • Compiler options:"
echo " Clutter debug level: ${enable_debug}"
echo " COGL debug level: ${enable_cogl_debug}"
echo " Compiler flags: ${MAINTAINER_CFLAGS}"
2009-03-17 13:07:46 +00:00
echo " Profiling enabled: ${enable_profile}"
2010-01-04 14:53:03 +00:00
echo " Enable coverage tests: ${enable_gcov}"
2009-11-17 15:32:00 +00:00
2009-12-01 15:17:49 +00:00
# Documentation
2009-11-17 15:32:00 +00:00
echo ""
echo " • Documentation:"
echo " Build API Reference: ${enable_gtk_doc}"
2009-12-01 15:17:49 +00:00
echo " Build Additional Documentation: ${enable_docs} (Generate PDF: ${enable_pdfs})"
2009-11-17 15:32:00 +00:00
2009-12-01 15:17:49 +00:00
# Miscellaneous
2009-11-17 15:32:00 +00:00
echo ""
echo " • Extra:"
echo " Build introspection data: ${enable_introspection}"
2010-01-29 09:26:47 +00:00
echo " Build conformance test suite: ${enable_conformance}"
2009-11-17 15:32:00 +00:00
2009-12-01 15:17:49 +00:00
if test "x$have_json" = "xyes"; then
echo " JSON-GLib: system"
else
2010-03-18 20:36:02 +00:00
echo " JSON-GLib: internal (WARNING: Experimental)"
2009-12-01 15:17:49 +00:00
fi
# COGL flags
2006-06-08 22:19:32 +00:00
echo ""
2009-11-17 15:32:00 +00:00
echo " • COGL Backend:"
echo " Driver: ${COGL_DRIVER}"
echo " GL header: ${CLUTTER_GL_HEADER}"
2009-12-01 15:17:49 +00:00
if test "x$COGL_DRIVER" = "xgles"; then
if test "x$use_gles2_wrapper" = "xyes"; then
echo " GLES version: 2.0"
else
echo " GLES version: 1.1"
fi
fi
2009-11-17 15:32:00 +00:00
if test "x$experimental_image" = "xno"; then
echo " Image backend: ${COGL_IMAGE_BACKEND}"
else
echo " Image backend: ${COGL_IMAGE_BACKEND} (WARNING: Experimental)"
fi
2008-04-25 13:37:36 +00:00
2009-12-01 15:17:49 +00:00
# Clutter backend related flags
2009-11-17 15:32:00 +00:00
echo ""
echo " • Clutter Backend:"
if test "x$experimental_backend" = "xno"; then
echo " Windowing system: ${CLUTTER_WINSYS}"
else
echo " Windowing system: ${CLUTTER_WINSYS} (WARNING: Experimental)"
2008-04-25 13:37:36 +00:00
fi
2009-05-25 13:04:53 +00:00
2010-06-18 00:56:23 +00:00
if test "x$SUPPORT_XLIB" = "x1"; then
2009-11-17 15:32:00 +00:00
echo " Enable XInput 1.0: ${xinput}"
2010-06-14 16:29:21 +00:00
echo " Enable XKB: ${have_xkb}"
2009-11-17 15:32:00 +00:00
echo " Enable X11 tests: ${x11_tests}"
2008-04-25 13:37:36 +00:00
fi
2009-11-17 15:32:00 +00:00
echo ""
2009-12-01 15:17:49 +00:00
# General warning about experimental features
2009-11-17 15:32:00 +00:00
if test "x$experimental_backend" = "xyes" ||
2010-03-18 20:36:02 +00:00
test "x$experimental_image" = "xyes" ||
test "x$experimental_json" = "xyes"; then
2009-11-17 15:32:00 +00:00
echo ""
echo "☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠"
echo " *WARNING*"
echo ""
echo " The stability of your build might be affected by one or more"
echo " experimental backends or experimental and unsupported features"
echo "☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠"
echo ""
2008-04-25 13:37:36 +00:00
fi