2006-05-29 04:59:36 -04:00
|
|
|
# clutter package version number, (as distinct from shared library version)
|
2009-08-31 10:49:39 -04: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 08:23:26 -04:00
|
|
|
m4_define([clutter_major_version], [1])
|
2009-08-07 10:27:25 -04:00
|
|
|
m4_define([clutter_minor_version], [1])
|
2009-10-23 08:55:50 -04:00
|
|
|
m4_define([clutter_micro_version], [3])
|
2006-11-20 07:02:24 -05:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
m4_define([clutter_version], [clutter_major_version.clutter_minor_version.clutter_micro_version])
|
2009-07-13 12:27:01 -04:00
|
|
|
|
2009-08-31 10:49:39 -04:00
|
|
|
# change this only when breaking the API
|
2009-07-28 08:23:26 -04:00
|
|
|
m4_define([clutter_api_version], [1.0])
|
2006-11-20 07:02:24 -05:00
|
|
|
|
2009-09-16 07:47:46 -04:00
|
|
|
# increase the interface age by 1 for each release; if the API changes,
|
2009-05-25 09:04:53 -04: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 10:49:39 -04: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 09:04:53 -04:00
|
|
|
# [ API addition, deprecation ]
|
2009-08-31 10:49:39 -04: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 09:04:53 -04:00
|
|
|
# ...
|
2009-09-16 07:47:46 -04:00
|
|
|
#
|
2009-10-23 08:55:50 -04:00
|
|
|
m4_define([clutter_interface_age], [1])
|
2009-05-25 09:04:53 -04:00
|
|
|
m4_define([clutter_binary_age], [m4_eval(100 * clutter_minor_version + clutter_micro_version)])
|
2006-11-20 07:02:24 -05:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_PREREQ([2.59])
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2007-12-19 11:16:10 -05:00
|
|
|
AC_INIT([clutter],
|
2006-11-20 07:02:24 -05:00
|
|
|
[clutter_version],
|
2006-06-22 11:01:22 -04:00
|
|
|
[http://bugzilla.o-hand.com/enter_bug.cgi?product=Clutter])
|
2009-02-17 09:56:35 -05:00
|
|
|
AC_CONFIG_MACRO_DIR([build/autotools])
|
2006-05-29 04:59:36 -04:00
|
|
|
AC_CONFIG_SRCDIR([clutter/clutter.h])
|
2005-04-13 15:49:56 -04:00
|
|
|
AM_CONFIG_HEADER([config.h])
|
|
|
|
|
2008-01-23 06:08:39 -05:00
|
|
|
AM_INIT_AUTOMAKE([1.9])
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2006-11-20 07:02:24 -05: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 11:20:35 -04:00
|
|
|
CLUTTER_API_VERSION=clutter_api_version
|
2009-05-25 09:04:53 -04:00
|
|
|
CLUTTER_MAJORMINOR=clutter_major_version.clutter_minor_version
|
2006-11-20 07:02:24 -05:00
|
|
|
AC_SUBST(CLUTTER_MAJOR_VERSION)
|
|
|
|
AC_SUBST(CLUTTER_MINOR_VERSION)
|
|
|
|
AC_SUBST(CLUTTER_MICRO_VERSION)
|
|
|
|
AC_SUBST(CLUTTER_VERSION)
|
2007-03-23 11:20:35 -04:00
|
|
|
AC_SUBST(CLUTTER_API_VERSION)
|
2006-05-29 04:59:36 -04:00
|
|
|
AC_SUBST(CLUTTER_MAJORMINOR)
|
|
|
|
|
2009-09-16 07:47:46 -04:00
|
|
|
m4_define([lt_current], [m4_eval(100 * clutter_minor_version + clutter_micro_version - clutter_interface_age)])
|
2006-11-20 07:02:24 -05:00
|
|
|
m4_define([lt_revision], [clutter_interface_age])
|
2009-05-25 09:04:53 -04:00
|
|
|
m4_define([lt_age], [m4_eval(clutter_binary_age - clutter_interface_age)])
|
2006-11-20 07:02:24 -05:00
|
|
|
CLUTTER_LT_CURRENT=lt_current
|
|
|
|
CLUTTER_LT_REV=lt_revision
|
|
|
|
CLUTTER_LT_AGE=lt_age
|
2006-05-29 04:59:36 -04: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)
|
|
|
|
|
|
|
|
dnl ========================================================================
|
|
|
|
|
2005-04-13 15:49:56 -04:00
|
|
|
# Checks for programs.
|
2008-11-07 14:32:28 -05:00
|
|
|
AM_PROG_CC_C_O
|
2006-06-23 05:20:04 -04:00
|
|
|
AC_DISABLE_STATIC
|
2005-04-13 15:49:56 -04:00
|
|
|
AC_PROG_LIBTOOL
|
2009-02-17 10:05:03 -05:00
|
|
|
DOLT
|
2005-04-13 15:49:56 -04:00
|
|
|
|
|
|
|
# Checks for header files.
|
|
|
|
AC_HEADER_STDC
|
|
|
|
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
|
|
|
|
|
|
|
|
# Checks for typedefs, structures, and compiler characteristics.
|
|
|
|
AC_C_CONST
|
|
|
|
|
|
|
|
# Checks for library functions.
|
|
|
|
AC_FUNC_MALLOC
|
|
|
|
AC_FUNC_MMAP
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_CHECK_FUNCS([memset memcpy strcasecmp])
|
2005-04-13 15:49:56 -04:00
|
|
|
|
2008-06-09 09:29:17 -04:00
|
|
|
AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
|
|
|
|
AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
|
|
|
|
|
|
|
|
PKG_PROG_PKG_CONFIG
|
|
|
|
|
2008-04-25 09:37:36 -04:00
|
|
|
dnl ========================================================================
|
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
# defaults
|
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-27 21:02:02 -04:00
|
|
|
CLUTTER_WINSYS_BASE=
|
|
|
|
CLUTTER_WINSYS_BASE_LIB=
|
|
|
|
CLUTTER_WINSYS=glx
|
2009-05-25 09:04:53 -04:00
|
|
|
clutter_gl_header=""
|
2008-05-29 05:28:24 -04:00
|
|
|
glesversion=1.1
|
2009-05-25 09:04:53 -04:00
|
|
|
use_gles2_wrapper=no
|
2009-06-09 07:43:57 -04:00
|
|
|
experimental_backend=no
|
|
|
|
experimental_image=no
|
2008-04-15 17:18:13 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_ARG_WITH([flavour],
|
|
|
|
[AC_HELP_STRING([--with-flavour=@<:@glx/eglx/eglnative/sdl/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-27 21:02:02 -04:00
|
|
|
[Select the Clutter window system backend])],
|
|
|
|
[CLUTTER_WINSYS=$with_flavour])
|
2008-04-15 17:18:13 -04:00
|
|
|
|
2009-05-25 09:04:53 -04: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 09:37:36 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
# the fruity backend requires a different handling for GLES
|
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-27 21:02:02 -04:00
|
|
|
AS_IF([test "x$CLUTTER_WINSYS" = "xfruity"], [glesversion=fruity])
|
2008-06-09 09:29:17 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
# backend specific pkg-config files
|
|
|
|
BACKEND_PC_FILES=""
|
2008-04-25 09:37:36 -04:00
|
|
|
|
2009-05-25 09:04:53 -04: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 === COGL GLES 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-27 21:02:02 -04:00
|
|
|
AS_IF([test "x$CLUTTER_WINSYS" = "xeglnative" ||
|
|
|
|
test "x$CLUTTER_WINSYS" = "xeglx" ||
|
|
|
|
test "x$CLUTTER_WINSYS" = "xfruity"],
|
2009-05-25 09:04:53 -04:00
|
|
|
|
|
|
|
[
|
|
|
|
AS_CASE([$glesversion],
|
|
|
|
|
|
|
|
[1*],
|
|
|
|
[
|
|
|
|
clutter_gl_header="GLES/gl.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-27 21:02:02 -04:00
|
|
|
COGL_DRIVER="gles"
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_DEFINE([HAVE_COGL_GLES], 1, [Have GL/ES for rendering])
|
2009-06-15 09:15:27 -04:00
|
|
|
AC_SUBST(COGL_GLES_VERSION, [COGL_HAS_GLES1])
|
2009-05-25 09:04:53 -04:00
|
|
|
|
|
|
|
AC_CHECK_HEADERS([GLES/egl.h],
|
|
|
|
[],
|
|
|
|
[AC_MSG_ERROR([Unable to locate required GLES headers])])
|
|
|
|
|
|
|
|
|
|
|
|
# check for upper/lower case libgles_em
|
|
|
|
# The powervr sdk uses lower case.
|
2009-05-25 11:52:53 -04:00
|
|
|
AC_CHECK_LIB(GLES_CM, [eglInitialize],
|
|
|
|
[HAVE_LIBGLES=yes],
|
|
|
|
[HAVE_LIBGLES=no])
|
|
|
|
|
|
|
|
AS_IF([test "x$HAVE_LIBGLES" = "xyes"],
|
|
|
|
[GLES_LIBS="-lGLES_CM"],
|
|
|
|
[
|
|
|
|
AC_CHECK_LIB(GLESv1_CM, [eglInitialize],
|
|
|
|
[HAVE_LIBGLES=yes],
|
|
|
|
[HAVE_LIBGLES=no])
|
|
|
|
|
|
|
|
AS_IF([test "x$HAVE_LIBGLES" = "xyes"],
|
|
|
|
[GLES_LIBS="-lGLESv1_CM"],
|
|
|
|
[
|
|
|
|
AC_CHECK_LIB(gles_cm, [eglInitialize],
|
|
|
|
[HAVE_LIBGLES=yes],
|
|
|
|
[HAVE_LIBGLES=no])
|
|
|
|
|
|
|
|
AS_IF([test "x$HAVE_LIBGLES" = "xyes"],
|
|
|
|
[GLES_LIBS="-lgles_cm"],
|
|
|
|
[
|
|
|
|
AC_MSG_ERROR([GLES library not found and egl backend requested.])
|
|
|
|
]
|
|
|
|
)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
]
|
|
|
|
)
|
2009-05-25 09:04:53 -04:00
|
|
|
],
|
|
|
|
|
|
|
|
[2*],
|
|
|
|
[
|
|
|
|
clutter_gl_header="GLES2/gl2.h"
|
|
|
|
use_gles2_wrapper=yes
|
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-27 21:02:02 -04:00
|
|
|
COGL_DRIVER="gles"
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_DEFINE([HAVE_COGL_GLES2], 1, [Have GL/ES for rendering])
|
2009-06-15 09:15:27 -04:00
|
|
|
AC_SUBST(COGL_GLES_VERSION, [COGL_HAS_GLES2])
|
2009-05-25 09:04:53 -04:00
|
|
|
|
|
|
|
AC_CHECK_HEADERS([EGL/egl.h],
|
|
|
|
[],
|
|
|
|
[AC_MSG_ERROR([Unable to locate required GLES headers])])
|
|
|
|
|
|
|
|
GLES_LIBS="-lGLESv2 -lEGL"
|
|
|
|
],
|
|
|
|
|
|
|
|
[fruity],
|
|
|
|
[
|
|
|
|
clutter_gl_header="GLES/gl.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-27 21:02:02 -04:00
|
|
|
COGL_DRIVER="gles"
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_DEFINE([HAVE_COGL_GLES], 1, [Have GL/ES for rendering])
|
2009-06-15 09:15:27 -04:00
|
|
|
AC_SUBST(COGL_GLES_VERSION, [COGL_HAS_GLES1])
|
2009-05-25 09:04:53 -04:00
|
|
|
|
|
|
|
AC_CHECK_HEADERS([GLES/egl.h],
|
|
|
|
[],
|
|
|
|
[AC_MSG_ERROR([Unable to locate required GLES headers])])
|
|
|
|
],
|
|
|
|
|
|
|
|
[AC_MSG_ERROR([Unknown argument for --with-gles])]
|
|
|
|
)
|
|
|
|
]
|
|
|
|
)
|
2008-06-23 05:55:42 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
AM_CONDITIONAL(USE_GLES2_WRAPPER, [test "x$use_gles2_wrapper" = "xyes"])
|
|
|
|
|
|
|
|
dnl === Clutter windowing system 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-27 21:02:02 -04:00
|
|
|
AS_CASE([$CLUTTER_WINSYS],
|
2009-05-25 09:04:53 -04:00
|
|
|
|
|
|
|
[sdl],
|
|
|
|
[
|
2009-06-09 07:43:57 -04:00
|
|
|
experimental_backend="yes"
|
2009-05-25 09:04:53 -04:00
|
|
|
clutter_gl_header="GL/gl.h"
|
|
|
|
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_SDL"
|
|
|
|
AC_DEFINE([HAVE_CLUTTER_SDL], [1], [Have the SDL 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-27 21:02:02 -04:00
|
|
|
COGL_DRIVER="gl"
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering])
|
|
|
|
|
|
|
|
AC_PATH_PROG(SDL_CONFIG, [sdl-config])
|
|
|
|
AS_IF([test "x$SDL_CONFIG" = "x"],
|
|
|
|
[AC_MSG_ERROR([No sdl-config binary found in path])],
|
|
|
|
[
|
|
|
|
SDL_CFLAGS=`$SDL_CONFIG --cflags`
|
|
|
|
SDL_LIBS=`$SDL_CONFIG --libs`
|
|
|
|
|
|
|
|
AS_CASE([$host],
|
|
|
|
|
2009-05-25 11:52:53 -04:00
|
|
|
[*mingw32*],
|
2009-05-25 09:04:53 -04:00
|
|
|
[
|
2009-05-25 11:52:53 -04:00
|
|
|
# Use -lopengl32 under Windows instead of -lGL
|
2009-05-25 09:04:53 -04:00
|
|
|
SDL_LIBS="$SDL_LIBS -lopengl32"
|
|
|
|
CLUTTER_LT_LDFLAGS="$CLUTTER_LT_LDFLAGS -no-undefined"
|
|
|
|
],
|
|
|
|
|
|
|
|
[
|
|
|
|
AC_CHECK_LIB(GL, [glEnable], [HAVE_LIBGL=yes], [HAVE_LIBGL=no])
|
|
|
|
AS_IF([test "x$HAVE_LIBGL" = "xno"], [AC_MSG_ERROR([libGL not found])])
|
|
|
|
SDL_LIBS="$SDL_LIBS -lGL"
|
|
|
|
]
|
|
|
|
)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
],
|
|
|
|
|
|
|
|
[glx],
|
|
|
|
[
|
|
|
|
clutter_gl_header="GL/gl.h"
|
|
|
|
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_GLX"
|
|
|
|
AC_DEFINE([HAVE_CLUTTER_GLX], [1], [Have the GLX 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-27 21:02:02 -04:00
|
|
|
COGL_DRIVER="gl"
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering])
|
|
|
|
|
|
|
|
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])])
|
|
|
|
|
|
|
|
GLX_LIBS="$X11_LIBS -lGL"
|
|
|
|
GLX_CFLAGS="$X11_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-27 21:02:02 -04:00
|
|
|
CLUTTER_WINSYS_BASE=x11
|
|
|
|
CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
|
2009-05-25 09:04:53 -04:00
|
|
|
|
|
|
|
# Mesa 7.3 added a GL pkg-config file, finally
|
|
|
|
PKG_CHECK_EXISTS([gl], [BACKEND_PC_FILES="$BACKEND_PC_FILES gl"], [])
|
|
|
|
],
|
|
|
|
|
|
|
|
[eglx],
|
|
|
|
[
|
|
|
|
# the GL header is defined in the COGL checks above
|
|
|
|
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGL"
|
|
|
|
AC_DEFINE([HAVE_CLUTTER_EGL], [1], [Have the EGL backend])
|
|
|
|
|
|
|
|
EGL_LIBS="$GLES_LIBS $X11_LIBS"
|
|
|
|
EGL_CFLAGS="$GLES_CFLAGS $X11_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-27 21:02:02 -04:00
|
|
|
CLUTTER_WINSYS_BASE=x11
|
|
|
|
CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
|
2009-05-25 09:04:53 -04:00
|
|
|
|
|
|
|
# Mesa 7.3 added a GL pkg-config file, finally
|
|
|
|
PKG_CHECK_EXISTS([gl], [BACKEND_PC_FILES="$BACKEND_PC_FILES gl"], [])
|
|
|
|
],
|
|
|
|
|
|
|
|
[eglnative],
|
|
|
|
[
|
|
|
|
# the GL header is defined in the COGL checks above
|
|
|
|
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_EGLNATIVE"
|
|
|
|
AC_DEFINE([HAVE_CLUTTER_EGL], [1], [Have the EGL backend])
|
|
|
|
|
|
|
|
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])]
|
|
|
|
)
|
|
|
|
|
|
|
|
EGL_LIBS="$GLES_LIBS $TSLIB_LIBS"
|
|
|
|
EGL_CFLAGS="$TSLIB_CFLAGS"
|
|
|
|
],
|
|
|
|
|
|
|
|
[fruity],
|
|
|
|
[
|
2009-06-09 07:43:57 -04:00
|
|
|
experimental_backend="yes"
|
2009-05-25 09:04:53 -04: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])
|
|
|
|
|
|
|
|
EGL_LIBS="-ObjC -framework Foundation -framework CoreFoundation -framework CoreGraphics -framework CoreSurface -framework GraphicsServices -framework OpenGLES -framework LayerKit -framework UIKit"
|
|
|
|
EGL_CFLAGS=""
|
|
|
|
],
|
|
|
|
|
|
|
|
[osx],
|
|
|
|
[
|
2009-06-09 07:43:57 -04:00
|
|
|
experimental_backend="yes"
|
2009-05-25 09:04:53 -04:00
|
|
|
clutter_gl_header="OpenGL/gl.h"
|
|
|
|
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_OSX"
|
|
|
|
AC_DEFINE([HAVE_CLUTTER_OSX], [1], [Have the OSX 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-27 21:02:02 -04:00
|
|
|
COGL_DRIVER="gl"
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering])
|
|
|
|
|
|
|
|
OSX_LIBS="-framework Cocoa -framework OpenGL"
|
|
|
|
],
|
|
|
|
|
|
|
|
[win32],
|
|
|
|
[
|
|
|
|
clutter_gl_header="GL/gl.h"
|
|
|
|
CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_WIN32"
|
|
|
|
AC_DEFINE([HAVE_CLUTTER_WIN32], [1], [Have the Win32 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-27 21:02:02 -04:00
|
|
|
COGL_DRIVER="gl"
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_DEFINE([HAVE_COGL_GL], [1], [Have GL for rendering])
|
|
|
|
|
|
|
|
WIN32_CFLAGS="-D_WIN32_WINNT=0x0500"
|
|
|
|
WIN32_LIBS="-lopengl32 -lgdi32 -lwinmm"
|
|
|
|
CLUTTER_LT_LDFLAGS="$CLUTTER_LT_LDFLAGS -no-undefined"
|
|
|
|
],
|
|
|
|
|
|
|
|
[AC_MSG_ERROR([Invalid backend for Clutter: use glx, sdl, osx, win32, eglx, eglnative or fruity])]
|
|
|
|
)
|
2008-11-24 10:44:16 -05:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
# at this point we must have a GL header to check
|
|
|
|
AS_IF([test "x$clutter_gl_header" = "x"], [AC_MSG_ERROR([Internal error: no GL header set])])
|
|
|
|
AC_CHECK_HEADERS([$clutter_gl_header],
|
|
|
|
[],
|
2008-06-11 12:29:20 -04:00
|
|
|
[AC_MSG_ERROR([Unable to locate required GLES headers])])
|
2009-01-28 10:19:24 -05:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
CLUTTER_GL_HEADER=$clutter_gl_header
|
2009-02-26 06:55:53 -05: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-27 21:02:02 -04: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 09:04:53 -04:00
|
|
|
AC_SUBST(CLUTTER_GL_HEADER)
|
|
|
|
AC_SUBST(CLUTTER_STAGE_TYPE)
|
2007-07-06 09:56:01 -04: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-27 21:02:02 -04:00
|
|
|
CLUTTER_WINSYS_LIB=libclutter-$CLUTTER_WINSYS-$CLUTTER_API_VERSION.la
|
|
|
|
AC_SUBST([CLUTTER_WINSYS_LIB])
|
|
|
|
|
|
|
|
dnl === Clutter substitutions kept for backwards compatibility ================
|
|
|
|
CLUTTER_FLAVOUR=$CLUTTER_WINSYS
|
|
|
|
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 12:30:47 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl === Image loading backend =================================================
|
|
|
|
IMAGE_PC_FILES=""
|
2008-04-25 09:37:36 -04: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-27 21:02:02 -04:00
|
|
|
# Peek which winsys the user wants so that we can couple the osx winsys with
|
2009-05-25 09:04:53 -04: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-27 21:02:02 -04:00
|
|
|
AS_IF([test "x$COGL_WINSYS" = "xosx"], [COGL_IMAGE_BACKEND=quartz], [COGL_IMAGE_BACKEND=gdk-pixbuf])
|
2008-04-25 09:37:36 -04: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-27 21:02:02 -04:00
|
|
|
AC_ARG_WITH([COGL_IMAGE_BACKEND],
|
2009-05-25 09:04:53 -04: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-27 21:02:02 -04:00
|
|
|
[COGL_IMAGE_BACKEND=$with_imagebackend])
|
2007-07-06 09:56:01 -04: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-27 21:02:02 -04:00
|
|
|
AS_CASE([$COGL_IMAGE_BACKEND],
|
2007-10-26 18:06:45 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
[quartz],
|
2009-06-09 07:43:57 -04:00
|
|
|
[
|
|
|
|
experimental_image=yes
|
|
|
|
AC_DEFINE([USE_QUARTZ], 1, [Use Core Graphics (Quartz) for loading image data])
|
|
|
|
],
|
2007-10-26 18:06:45 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
[gdk-pixbuf],
|
|
|
|
[
|
|
|
|
AC_DEFINE([USE_GDKPIXBUF], 1, [Use GdkPixbuf for loading image data])
|
|
|
|
IMAGE_PC_FILES="gdk-pixbuf-2.0"
|
|
|
|
],
|
2007-10-26 18:06:45 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
[internal],
|
2009-06-09 07:43:57 -04:00
|
|
|
[
|
|
|
|
experimental_image=yes
|
|
|
|
AC_DEFINE([USE_INTERNAL], 1, [Use internal image decoding for loading image data])
|
|
|
|
],
|
2008-03-25 11:42:50 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
[AC_MSG_ERROR([Unknown argument for --with-imagebackend])]
|
|
|
|
)
|
2008-03-25 11:42:50 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl === X11 checks, only for X11-based backends ===============================
|
|
|
|
X11_PC_FILES=""
|
2009-05-29 09:23:16 -04:00
|
|
|
x11_tests=no
|
2008-03-25 11:42:50 -04: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-27 21:02:02 -04:00
|
|
|
AS_IF([test "x$CLUTTER_WINSYS" = "xglx" || test "x$CLUTTER_WINSYS" = "xeglx"],
|
2009-05-25 09:04:53 -04:00
|
|
|
[
|
|
|
|
# base X11 includes and libraries
|
|
|
|
AC_MSG_CHECKING([for X11])
|
2008-03-25 11:42:50 -04:00
|
|
|
|
2009-05-25 09:04:53 -04: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"
|
|
|
|
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 07:34:00 -04: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 09:04:53 -04: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 11:42:50 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_MSG_RESULT([found])
|
|
|
|
],
|
|
|
|
[AC_MSG_ERROR([Not found])]
|
|
|
|
)
|
2007-03-27 17:09:11 -04:00
|
|
|
|
2009-05-25 09:04:53 -04: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 14:21:59 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
X11_LIBS="$X11_LIBS -lXdamage"
|
|
|
|
X11_PC_FILES="$X11_PC_FILES xdamage"
|
2008-04-28 09:18:16 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_MSG_RESULT([found])
|
|
|
|
],
|
|
|
|
[AC_MSG_ERROR([not found])]
|
|
|
|
)
|
2008-04-28 09:18:16 -04:00
|
|
|
|
2009-05-25 09:04:53 -04: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 09:18:16 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
X11_LIBS="$X11_LIBS -lXcomposite"
|
|
|
|
X11_PC_FILES="$X11_PC_FILES xcomposite"
|
2007-10-29 12:50:34 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_MSG_RESULT([found])
|
|
|
|
],
|
|
|
|
[AC_MSG_RESULT([not found])]
|
|
|
|
)
|
|
|
|
|
2009-07-13 12:27:01 -04:00
|
|
|
# XINPUT (optional)
|
2009-05-25 09:04:53 -04: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 07:26:29 -04:00
|
|
|
[xinput=no])
|
2009-05-25 09:04:53 -04:00
|
|
|
|
|
|
|
AS_CASE([$xinput],
|
|
|
|
|
|
|
|
[yes],
|
|
|
|
[
|
2009-06-04 08:41:32 -04:00
|
|
|
AC_DEFINE(HAVE_XINPUT, 1, Use the XINPUT X extension)
|
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
X11_LIBS="$X11_LIBS -lXi"
|
|
|
|
X11_PC_FILES="$X11_PC_FILES xi"
|
|
|
|
],
|
|
|
|
|
|
|
|
[no],
|
2009-06-17 10:09:16 -04:00
|
|
|
[],
|
2009-05-25 09:04:53 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
# X11-specific tests are enabled conditionally
|
|
|
|
AS_IF([test "x$have_xcomposite" = "xyes"], [x11_tests=yes], [x11_tests=no])
|
2009-06-05 07:46:37 -04:00
|
|
|
|
|
|
|
BACKEND_PC_FILES="$BACKEND_PC_FILES $X11_PC_FILES"
|
2009-05-25 09:04:53 -04:00
|
|
|
]
|
|
|
|
)
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2009-05-29 09:23:16 -04:00
|
|
|
AM_CONDITIONAL(X11_TESTS, [test "x$x11_tests" = "xyes"])
|
2007-01-23 15:29:11 -05:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl === JSON parser check =====================================================
|
2005-04-13 15:49:56 -04:00
|
|
|
|
2009-06-25 13:56:52 -04: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 14:53:43 -04:00
|
|
|
AC_ARG_WITH([json],
|
2009-06-25 13:56:52 -04:00
|
|
|
AC_HELP_STRING([--with-json=@<:@internal/check/system@:>@],
|
|
|
|
[Select the JSON-GLib copy to use @<:@default=default_json@:>@]),
|
2008-04-24 14:53:43 -04:00
|
|
|
[],
|
2009-06-25 13:56:52 -04:00
|
|
|
[with_json=default_json])
|
2008-04-24 14:53:43 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
AS_CASE([$with_json],
|
|
|
|
|
|
|
|
[internal],
|
|
|
|
[
|
|
|
|
JSON_PREFIX=json
|
|
|
|
have_json=no
|
|
|
|
],
|
|
|
|
|
2009-06-25 13:56:52 -04:00
|
|
|
[system],
|
|
|
|
[
|
|
|
|
AC_MSG_CHECKING([for installed JSON-GLib])
|
|
|
|
PKG_CHECK_EXISTS([json-glib-1.0 >= 0.7],
|
|
|
|
[have_json=yes],
|
|
|
|
[have_json=no])
|
|
|
|
AS_IF([test "x$have_json" = "xyes"],
|
|
|
|
[
|
|
|
|
JSON_PREFIX=json-glib
|
|
|
|
JSON_GLIB_PC="json-glib-1.0 >= 0.7"
|
|
|
|
|
|
|
|
AC_DEFINE([HAVE_JSON_GLIB],
|
|
|
|
[1],
|
|
|
|
[Have the JSON-GLib library installed])
|
|
|
|
|
|
|
|
AC_MSG_RESULT([found])
|
|
|
|
],
|
|
|
|
[AC_MSG_ERROR([not found])]
|
|
|
|
)
|
|
|
|
],
|
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
[check],
|
|
|
|
[
|
|
|
|
AC_MSG_CHECKING([for installed JSON-GLib])
|
2009-06-25 13:56:52 -04:00
|
|
|
PKG_CHECK_EXISTS([json-glib-1.0 >= 0.7],
|
|
|
|
[have_json=yes],
|
|
|
|
[have_json=no])
|
2009-05-25 09:04:53 -04:00
|
|
|
AS_IF([test "x$have_json" = "xyes"],
|
|
|
|
[
|
|
|
|
JSON_PREFIX=json-glib
|
2009-06-25 13:56:52 -04:00
|
|
|
JSON_GLIB_PC="json-glib-1.0 >= 0.7"
|
2009-05-25 09:04:53 -04:00
|
|
|
|
2009-06-25 13:56:52 -04:00
|
|
|
AC_DEFINE([HAVE_JSON_GLIB],
|
|
|
|
[1],
|
|
|
|
[Have the JSON-GLib library installed])
|
2009-05-25 09:04:53 -04:00
|
|
|
|
|
|
|
AC_MSG_RESULT([found])
|
|
|
|
],
|
|
|
|
[
|
|
|
|
JSON_PREFIX=json
|
|
|
|
AC_MSG_RESULT([not found, using internal copy])
|
|
|
|
]
|
|
|
|
)
|
|
|
|
],
|
|
|
|
|
|
|
|
[AC_MSG_ERROR([Unknown argument for --with-json])]
|
|
|
|
)
|
2008-04-23 09:58:58 -04:00
|
|
|
|
|
|
|
AC_SUBST(JSON_PREFIX)
|
|
|
|
AM_CONDITIONAL(LOCAL_JSON_GLIB, test "x$have_json" = "xno")
|
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl === Dependencies, compiler flags and linker libraries =====================
|
2009-06-05 07:46:37 -04:00
|
|
|
CLUTTER_REQUIRES="cairo >= 1.4 pangocairo >= 1.20 gobject-2.0 >= 2.16 gthread-2.0 gmodule-no-export-2.0 $IMAGE_PC_FILES $BACKEND_PC_FILES $JSON_GLIB_PC"
|
2008-04-25 09:37:36 -04:00
|
|
|
|
2007-12-31 06:22:11 -05:00
|
|
|
PKG_CHECK_MODULES(CLUTTER_DEPS, [$CLUTTER_REQUIRES])
|
|
|
|
|
|
|
|
AC_SUBST(CLUTTER_REQUIRES)
|
2005-04-13 15:49:56 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
CLUTTER_CFLAGS="$SDL_CFLAGS $EGL_CFLAGS $GLX_CFLAGS $OSX_CFLAGS $WIN32_CFLAGS $CLUTTER_DEPS_CFLAGS"
|
2009-06-05 07:46:37 -04:00
|
|
|
CLUTTER_LIBS="$SDL_LIBS $EGL_LIBS $X11_LIBS $GLX_LIBS $OSX_LIBS $WIN32_LIBS $CLUTTER_DEPS_LIBS"
|
2008-02-08 08:40:50 -05:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_SUBST(CLUTTER_CFLAGS)
|
|
|
|
AC_SUBST(CLUTTER_LIBS)
|
2005-04-13 15:49:56 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl === Enable debug level ====================================================
|
2005-04-13 15:49:56 -04:00
|
|
|
|
2009-05-25 09:04:53 -04: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 12:23:24 -04:00
|
|
|
CLUTTER_DEBUG_CFLAGS="-DCLUTTER_ENABLE_DEBUG"
|
2009-05-25 09:04:53 -04:00
|
|
|
],
|
|
|
|
|
|
|
|
[minimum],
|
2009-05-26 12:23:24 -04:00
|
|
|
[CLUTTER_DEBUG_CFLAGS="-DCLUTTER_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"],
|
2009-05-25 09:04:53 -04: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 07:02:24 -05:00
|
|
|
|
|
|
|
AC_SUBST(CLUTTER_DEBUG_CFLAGS)
|
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
m4_define([cogl_debug_default], [m4_if(m4_eval(clutter_minor_version % 2), [1], [minimum], [no])])
|
2009-05-19 11:00:18 -04:00
|
|
|
AC_ARG_ENABLE([cogl-debug],
|
|
|
|
[AC_HELP_STRING([--enable-cogl-debug=@<:@no/yes@:>@],
|
2009-05-25 09:04:53 -04:00
|
|
|
[Control COGL debugging level @<:@default=cogl_debug_default@:>@])],
|
2009-05-19 11:00:18 -04:00
|
|
|
[],
|
2009-05-25 09:04:53 -04:00
|
|
|
[enable_cogl_debug=cogl_debug_default])
|
2009-05-19 11:00:18 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
AS_CASE([$enable_cogl_debug],
|
2009-05-19 11:00:18 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
[yes],
|
|
|
|
[COGL_DEBUG_CFLAGS="-DCOGL_GL_DEBUG -DCOGL_HANDLE_DEBUG -DCOGL_ENABLE_DEBUG"],
|
2009-05-19 11:00:18 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
[minimum],
|
|
|
|
[COGL_DEBUG_CFLAGS="-DCOGL_ENABLE_DEBUG"],
|
2009-05-19 11:00:18 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
[no],
|
|
|
|
[COGL_DEBUG_CFLAGS=""],
|
2009-05-19 11:00:18 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
[AC_MSG_ERROR([Invalid value for --enable-cogl-debug])]
|
2009-05-19 11:00:18 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
AC_SUBST(COGL_DEBUG_CFLAGS)
|
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl === Enable strict compiler flags ==========================================
|
2007-07-26 06:00:09 -04:00
|
|
|
|
|
|
|
# use strict compiler flags only on development releases
|
2009-06-06 09:38:10 -04:00
|
|
|
m4_define([maintainer_flags_default], [m4_if(m4_eval(clutter_minor_version % 2), [1], [yes], [no])])
|
2007-07-26 06:00:09 -04:00
|
|
|
AC_ARG_ENABLE([maintainer-flags],
|
2009-05-25 09:04:53 -04: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-07 21:22:26 -04:00
|
|
|
AS_COMPILER_FLAGS([MAINTAINER_CFLAGS],
|
|
|
|
["-Wall -Wshadow -Wcast-align -Wno-uninitialized
|
|
|
|
-Wno-strict-aliasing -Wempty-body -Wformat-security
|
|
|
|
-Winit-self"])
|
2009-05-25 09:04:53 -04:00
|
|
|
]
|
|
|
|
)
|
2007-07-26 06:00:09 -04:00
|
|
|
|
2009-01-23 08:09:51 -05:00
|
|
|
AC_SUBST(MAINTAINER_CFLAGS)
|
2007-07-26 06:00:09 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl === GObject-Introspection check ===========================================
|
2009-02-20 09:39:51 -05:00
|
|
|
|
2009-08-17 09:12:21 -04:00
|
|
|
GOBJECT_INTROSPECTION_CHECK([0.6.4])
|
2007-07-26 06:00:09 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl === GTK Doc check =========================================================
|
2006-11-20 07:02:24 -05:00
|
|
|
|
2009-02-20 06:55:54 -05:00
|
|
|
GTK_DOC_CHECK([1.11])
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2009-07-13 12:27:01 -04:00
|
|
|
# we don't want to build the documentation from a Git clone unless we
|
2008-07-17 08:21:01 -04: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 12:27:01 -04:00
|
|
|
# we use autogen.sh as it exists only inside the Git clones, and it
|
2008-07-17 08:21:01 -04:00
|
|
|
# is not packaged into tarballs.
|
2009-05-25 09:04:53 -04:00
|
|
|
AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes" || test ! -f "autogen.sh"])
|
2007-05-30 19:16:58 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
# prefixes for fixing gtk-doc references
|
2009-09-09 11:15:54 -04:00
|
|
|
CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
|
2009-05-25 09:04:53 -04:00
|
|
|
GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
|
|
|
|
PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
|
2009-09-09 11:15:54 -04:00
|
|
|
AC_SUBST(CAIRO_PREFIX)
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_SUBST(GLIB_PREFIX)
|
|
|
|
AC_SUBST(PANGO_PREFIX)
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl === Manual ================================================================
|
|
|
|
|
|
|
|
AC_ARG_ENABLE([manual],
|
|
|
|
[AC_HELP_STRING([--enable-manual=@<:@no/yes@:>@],
|
|
|
|
[Build application developers manual. Requires jw and xmlto.])],
|
|
|
|
[enable_manual=$enableval],
|
|
|
|
[enable_manual=no])
|
|
|
|
|
|
|
|
AS_IF([test "x$enable_manual" = "xyes"],
|
|
|
|
[
|
|
|
|
AC_PATH_PROG(JW, [jw], [no])
|
|
|
|
AS_IF([test "x$JW" = "xno"],
|
|
|
|
[AC_MSG_ERROR(['jw' program needed by the manual not found in path])]
|
|
|
|
)
|
|
|
|
|
|
|
|
AC_PATH_PROG(XMLTO, [xmlto], [no])
|
|
|
|
AS_IF([test "x$XMLTO" = "xno"],
|
|
|
|
[AC_MSG_ERROR(['xmlto' program needed by the manual not found in path])]
|
|
|
|
)
|
|
|
|
]
|
|
|
|
)
|
2005-04-13 15:49:56 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
AM_CONDITIONAL(ENABLE_MANUAL, [test "x$enable_manual" = "xyes"])
|
2005-04-13 15:49:56 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl === I18N ==================================================================
|
2005-04-13 15:49:56 -04:00
|
|
|
|
2008-06-10 12:47:38 -04:00
|
|
|
GETTEXT_PACKAGE="clutter-$CLUTTER_API_VERSION"
|
|
|
|
AC_SUBST(GETTEXT_PACKAGE)
|
2009-05-25 09:04:53 -04:00
|
|
|
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,
|
|
|
|
"$GETTEXT_PACKAGE",
|
2008-06-10 12:47:38 -04:00
|
|
|
[The prefix for our gettext translation domains.])
|
|
|
|
|
2009-06-10 09:23:45 -04:00
|
|
|
ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
|
2008-06-10 12:47:38 -04:00
|
|
|
AM_GLIB_GNU_GETTEXT
|
2009-01-06 07:11:07 -05:00
|
|
|
GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
|
2008-06-10 12:47:38 -04:00
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl ===========================================================================
|
|
|
|
|
2009-08-10 06:45:44 -04:00
|
|
|
m4_ifdef([AM_SILENT_RULES],
|
|
|
|
[
|
|
|
|
AM_SILENT_RULES([yes])
|
|
|
|
use_shave=no
|
|
|
|
],
|
|
|
|
[
|
|
|
|
SHAVE_INIT([build/autotools], [enable])
|
|
|
|
AC_CONFIG_FILES([
|
|
|
|
build/autotools/shave
|
|
|
|
build/autotools/shave-libtool
|
|
|
|
])
|
|
|
|
use_shave=yes
|
|
|
|
])
|
|
|
|
|
|
|
|
AM_CONDITIONAL([USE_SHAVE], [test "x$use_shave" = "xyes"])
|
2009-02-17 09:56:35 -05:00
|
|
|
|
2006-11-20 07:02:24 -05:00
|
|
|
AC_CONFIG_FILES([
|
|
|
|
Makefile
|
2009-02-17 09:56:35 -05:00
|
|
|
build/Makefile
|
|
|
|
build/autotools/Makefile
|
2006-11-20 07:02:24 -05:00
|
|
|
clutter/Makefile
|
|
|
|
clutter/clutter-version.h
|
2008-04-23 09:58:58 -04:00
|
|
|
clutter/clutter-json.h
|
2007-11-15 09:45:27 -05:00
|
|
|
clutter/x11/Makefile
|
2008-01-23 06:08:39 -05:00
|
|
|
clutter/x11/clutter-x11.pc
|
2007-03-22 14:21:59 -04:00
|
|
|
clutter/glx/Makefile
|
2007-07-06 09:56:01 -04:00
|
|
|
clutter/eglx/Makefile
|
|
|
|
clutter/eglnative/Makefile
|
2008-04-25 09:37:36 -04:00
|
|
|
clutter/fruity/Makefile
|
2007-10-26 18:06:45 -04:00
|
|
|
clutter/osx/Makefile
|
2008-03-25 11:42:50 -04:00
|
|
|
clutter/win32/Makefile
|
|
|
|
clutter/win32/clutter-win32.pc
|
2007-05-02 16:05:29 -04:00
|
|
|
clutter/sdl/Makefile
|
2007-03-26 19:18:39 -04: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-27 21:02:02 -04:00
|
|
|
clutter/cogl/cogl/Makefile
|
|
|
|
clutter/cogl/cogl/cogl.h
|
|
|
|
clutter/cogl/cogl/cogl-defines-gl.h:clutter/cogl/cogl/driver/gl/cogl-defines.h.in
|
|
|
|
clutter/cogl/cogl/cogl-defines-gles.h:clutter/cogl/cogl/driver/gles/cogl-defines.h.in
|
|
|
|
clutter/cogl/cogl/cogl.pc
|
|
|
|
clutter/cogl/cogl/driver/Makefile
|
|
|
|
clutter/cogl/cogl/driver/gl/Makefile
|
|
|
|
clutter/cogl/cogl/driver/gles/Makefile
|
2009-07-29 12:21:07 -04:00
|
|
|
clutter/cogl/pango/Makefile
|
2007-10-08 11:03:22 -04:00
|
|
|
clutter/json/Makefile
|
2007-05-04 19:53:49 -04:00
|
|
|
tests/Makefile
|
2008-11-07 14:32:28 -05:00
|
|
|
tests/conform/Makefile
|
|
|
|
tests/data/Makefile
|
|
|
|
tests/interactive/Makefile
|
|
|
|
tests/micro-bench/Makefile
|
|
|
|
tests/tools/Makefile
|
2006-11-20 07:02:24 -05:00
|
|
|
doc/Makefile
|
|
|
|
doc/reference/Makefile
|
2008-04-25 09:37:36 -04:00
|
|
|
doc/reference/clutter/Makefile
|
2009-06-01 12:35:41 -04:00
|
|
|
doc/reference/clutter/clutter-docs.xml
|
2008-04-25 09:37:36 -04:00
|
|
|
doc/reference/cogl/Makefile
|
2009-06-01 12:35:41 -04:00
|
|
|
doc/reference/cogl/cogl-docs.xml
|
2007-05-30 19:16:58 -04:00
|
|
|
doc/manual/clutter-manual.xml
|
|
|
|
doc/manual/Makefile
|
2008-06-10 12:47:38 -04:00
|
|
|
po/Makefile.in
|
2006-11-20 07:02:24 -05:00
|
|
|
clutter.pc
|
2005-04-13 15:49:56 -04:00
|
|
|
])
|
2006-06-06 16:40:40 -04:00
|
|
|
|
2006-11-20 07:02:24 -05:00
|
|
|
AC_OUTPUT
|
|
|
|
|
2009-05-25 09:04:53 -04:00
|
|
|
dnl === Summary ===============================================================
|
2006-06-06 16:40:40 -04:00
|
|
|
|
|
|
|
echo ""
|
2008-07-17 08:21:01 -04:00
|
|
|
echo " Clutter $VERSION"
|
|
|
|
echo " ===================="
|
2006-06-06 16:40:40 -04:00
|
|
|
echo ""
|
2008-07-17 08:21:01 -04:00
|
|
|
echo " prefix: ${prefix}"
|
2006-06-06 16:40:40 -04:00
|
|
|
echo ""
|
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-27 21:02:02 -04:00
|
|
|
echo " Flavour: ${CLUTTER_WINSYS}/${COGL_DRIVER}"
|
|
|
|
if test "x$CLUTTER_WINSYS" = "xeglx" || test "x$CLUTTER_WINSYS" = "xglx"; then
|
2008-07-17 08:21:01 -04:00
|
|
|
echo " XInput: ${xinput}"
|
2008-06-23 05:55:42 -04:00
|
|
|
fi
|
2009-05-26 12:23:24 -04:00
|
|
|
echo " GL headers: ${CLUTTER_GL_HEADER}"
|
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-27 21:02:02 -04:00
|
|
|
echo " Image backend: ${COGL_IMAGE_BACKEND}"
|
|
|
|
echo " Target library: ${CLUTTER_WINSYS_LIB}"
|
2009-05-26 12:23:24 -04:00
|
|
|
echo " Clutter debug level: ${enable_debug}"
|
|
|
|
echo " COGL debug level: ${enable_cogl_debug}"
|
2009-01-23 08:09:51 -05:00
|
|
|
echo " Compiler flags: ${CPPFLAGS} ${MAINTAINER_CFLAGS}"
|
2009-05-26 12:23:24 -04:00
|
|
|
echo " Build API documentation: ${enable_gtk_doc}"
|
|
|
|
echo " Build manual documentation: ${enable_manual}"
|
|
|
|
echo " Build introspection data: ${enable_introspection}"
|
2006-06-08 18:19:32 -04:00
|
|
|
echo ""
|
2008-04-25 09:37:36 -04:00
|
|
|
|
|
|
|
# you can add more configuration options or flags that will bring up the
|
|
|
|
# the experimental/unstable warning summary.
|
|
|
|
|
2009-06-09 07:43:57 -04:00
|
|
|
if test "x$experimental_backend" = "xyes"; then
|
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-27 21:02:02 -04:00
|
|
|
experimental_stuff="$experimental_stuff Clutter backend: ${CLUTTER_WINSYS}\n"
|
2008-04-25 09:37:36 -04:00
|
|
|
fi
|
2009-05-25 09:04:53 -04:00
|
|
|
|
2009-06-09 07:43:57 -04:00
|
|
|
if test "x$experimental_image" = "xyes"; then
|
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-27 21:02:02 -04:00
|
|
|
experimental_stuff="$experimental_stuff Image backend: ${COGL_IMAGE_BACKEND}\n"
|
2008-04-25 09:37:36 -04:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test "x$experimental_stuff" != "x"; then
|
2009-05-25 09:04:53 -04: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 -e "$experimental_stuff"
|
|
|
|
echo "☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠☠"
|
|
|
|
echo ""
|
2008-04-25 09:37:36 -04:00
|
|
|
fi
|