2009-09-16 12:43:58 -04:00
|
|
|
include $(top_srcdir)/build/autotools/Makefile.am.silent
|
2009-08-10 06:45:44 -04:00
|
|
|
|
2009-09-16 12:43:58 -04:00
|
|
|
NULL =
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2009-07-29 12:21:07 -04:00
|
|
|
SUBDIRS = cogl $(CLUTTER_WINSYS_BASE) $(CLUTTER_WINSYS)
|
2008-04-23 09:58:58 -04:00
|
|
|
|
|
|
|
|
if LOCAL_JSON_GLIB
|
|
|
|
|
SUBDIRS += json
|
|
|
|
|
clutter_json_include = -I$(top_srcdir)/clutter/json
|
|
|
|
|
clutter_json_dep = json/libclutter-json.la
|
|
|
|
|
clutter_json_libadd = $(top_builddir)/clutter/json/libclutter-json.la
|
2009-08-12 10:32:18 -04:00
|
|
|
clutter_json_gir = ClutterJson-@CLUTTER_API_VERSION@.gir
|
2008-04-23 09:58:58 -04:00
|
|
|
endif
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2009-07-29 12:21:07 -04:00
|
|
|
DIST_SUBDIRS = glx eglx eglnative cogl sdl json osx x11 win32 fruity
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2009-10-13 12:27:19 -04:00
|
|
|
# common definitions
|
|
|
|
|
CLEANFILES =
|
|
|
|
|
DISTCLEANFILES =
|
|
|
|
|
EXTRA_DIST =
|
|
|
|
|
BUILT_SOURCES =
|
2009-10-13 14:27:03 -04:00
|
|
|
|
2007-03-22 14:21:59 -04:00
|
|
|
INCLUDES = \
|
2009-07-29 12:21:07 -04:00
|
|
|
-I$(top_srcdir) \
|
|
|
|
|
-I$(top_srcdir)/clutter/cogl \
|
|
|
|
|
-I$(top_srcdir)/clutter/cogl/pango \
|
|
|
|
|
-I$(top_srcdir)/clutter \
|
|
|
|
|
$(clutter_json_include) \
|
|
|
|
|
-I$(top_builddir)/clutter/cogl \
|
|
|
|
|
-I$(top_builddir)/clutter \
|
2009-10-13 14:27:03 -04:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
AM_CPPFLAGS = \
|
|
|
|
|
-DCLUTTER_PREFIX=\""$(prefix)"\" \
|
|
|
|
|
-DCLUTTER_LIBDIR=\""$(libdir)"\" \
|
|
|
|
|
-DCLUTTER_DATADIR=\""$(datadir)"\" \
|
|
|
|
|
-DCLUTTER_COMPILATION=1 \
|
|
|
|
|
-DG_DISABLE_DEPRECATED \
|
|
|
|
|
-DG_DISABLE_SINGLE_INCLUDES \
|
|
|
|
|
-DG_LOG_DOMAIN=\"Clutter\" \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(NULL)
|
|
|
|
|
|
2009-10-13 14:27:03 -04:00
|
|
|
AM_CFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
|
2009-02-20 09:39:51 -05:00
|
|
|
|
2007-03-22 14:21:59 -04:00
|
|
|
LDADD = \
|
2007-12-31 09:52:17 -05:00
|
|
|
$(CLUTTER_LT_LDFLAGS) \
|
2007-03-22 14:21:59 -04:00
|
|
|
-export-dynamic \
|
2008-04-09 10:18:42 -04:00
|
|
|
-export-symbols-regex "^(clutter|cogl|json|pango).*" \
|
2007-03-22 14:21:59 -04:00
|
|
|
-rpath $(libdir) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2007-06-09 09:20:22 -04:00
|
|
|
# please, keep this sorted alphabetically
|
2006-11-15 18:37:53 -05:00
|
|
|
source_h = \
|
|
|
|
|
$(srcdir)/clutter-actor.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(srcdir)/clutter-alpha.h \
|
2009-01-08 07:56:46 -05:00
|
|
|
$(srcdir)/clutter-animatable.h \
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 04:50:03 -05:00
|
|
|
$(srcdir)/clutter-animation.h \
|
2007-07-04 05:34:24 -04:00
|
|
|
$(srcdir)/clutter-backend.h \
|
2006-11-15 18:37:53 -05:00
|
|
|
$(srcdir)/clutter-behaviour.h \
|
2007-07-09 17:38:43 -04:00
|
|
|
$(srcdir)/clutter-behaviour-depth.h \
|
2007-04-30 04:39:20 -04:00
|
|
|
$(srcdir)/clutter-behaviour-ellipse.h \
|
2006-11-15 18:37:53 -05:00
|
|
|
$(srcdir)/clutter-behaviour-opacity.h \
|
|
|
|
|
$(srcdir)/clutter-behaviour-path.h \
|
2007-04-16 06:25:30 -04:00
|
|
|
$(srcdir)/clutter-behaviour-rotate.h \
|
2006-11-15 18:37:53 -05:00
|
|
|
$(srcdir)/clutter-behaviour-scale.h \
|
2008-12-08 08:57:10 -05:00
|
|
|
$(srcdir)/clutter-binding-pool.h \
|
2009-09-11 08:51:23 -04:00
|
|
|
$(srcdir)/clutter-bin-layout.h \
|
2009-09-01 12:42:50 -04:00
|
|
|
$(srcdir)/clutter-box.h \
|
2009-10-13 07:14:05 -04:00
|
|
|
$(srcdir)/clutter-box-layout.h \
|
2008-12-11 10:24:07 -05:00
|
|
|
$(srcdir)/clutter-cairo-texture.h \
|
2008-05-28 09:48:11 -04:00
|
|
|
$(srcdir)/clutter-child-meta.h \
|
2009-01-26 05:32:53 -05:00
|
|
|
$(srcdir)/clutter-clone.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(srcdir)/clutter-color.h \
|
2007-06-07 10:41:35 -04:00
|
|
|
$(srcdir)/clutter-container.h \
|
2007-11-13 09:06:19 -05:00
|
|
|
$(srcdir)/clutter-deprecated.h \
|
2007-06-07 10:41:35 -04:00
|
|
|
$(srcdir)/clutter-event.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(srcdir)/clutter-feature.h \
|
|
|
|
|
$(srcdir)/clutter-fixed.h \
|
2009-09-02 07:37:16 -04:00
|
|
|
$(srcdir)/clutter-fixed-layout.h \
|
2009-09-18 12:28:02 -04:00
|
|
|
$(srcdir)/clutter-flow-layout.h \
|
2008-05-09 12:27:06 -04:00
|
|
|
$(srcdir)/clutter-frame-source.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(srcdir)/clutter-group.h \
|
2008-11-17 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1014 - Clutter Animation API Improvements
* clutter/Makefile.am:
* clutter/clutter.h: Update the build
* clutter/clutter-types.h: Add AnimationMode, an enumeration
for easing functions.
* clutter/clutter-alpha.[ch]: Add the :mode property to
control the function bound to an Alpha instance using an
enumeration value. Also add six new alpha functions:
- ease-in, ease-out, ease-in-out
- sine-in, sine-out, sine-in-out
* clutter/clutter-deprecated.h: Deprecate the #defines for
the alpha functions. They will be replaced by entries in the
ClutterAnimationMode.
* clutter/clutter-interval.[ch]: Add ClutterInterval, an
object for defining, validating and computing an interval
between two values.
* clutter/clutter-animation.[ch]: Add ClutterAnimation, an
object responsible for animation the properties of a single
actor along an interval of values. ClutterAnimation memory
management is automatic. A simple wrapper method for
ClutterActor is provided:
clutter_actor_animate()
which will create, or update, an animation for the passed
actor.
* clutter/clutter-debug.h:
* clutter/clutter-main.c: Add a new 'animation' debug note.
* clutter/clutter-script.c: Clean up the alpha functions
whitelist, and add the new functions.
* doc/reference/clutter/Makefile.am:
* doc/reference/clutter/clutter-sections.txt: Update the
API reference.
* doc/reference/clutter/clutter-animation.xml: Renamed to
doc/reference/clutter/clutter-animation-tutorial.xml to
avoid clashes with the ClutterAnimation section.
* doc/reference/clutter/clutter-docs.sgml: Renamed to
doc/reference/clutter/clutter-docs.xml, as it was an XML
file and not a SGML file.
* tests/Makefile.am:
* tests/interactive/Makefile.am:
* tests/interactive/test-animation.c:
* tests/interactive/test-easing.c: Add two tests for the
new simple animation API and the easing functions.
* tests/interactive/test-actors.c:
* tests/interactive/test-behave.c:
* tests/interactive/test-depth.c:
* tests/interactive/test-effects.c:
* tests/interactive/test-layout.c:
* tests/interactive/test-multistage.c:
* tests/interactive/test-paint-wrapper.c:
* tests/interactive/test-rotate.c:
* tests/interactive/test-scale.c:
* tests/interactive/test-texture-quality.c:
* tests/interactive/test-threads.c:
* tests/interactive/test-viewport.c: Update interactive tests
to the deprecations and new alpha API.
2008-11-18 04:50:03 -05:00
|
|
|
$(srcdir)/clutter-interval.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(srcdir)/clutter-keysyms.h \
|
2009-09-01 11:34:28 -04:00
|
|
|
$(srcdir)/clutter-layout-manager.h \
|
2009-09-15 12:37:11 -04:00
|
|
|
$(srcdir)/clutter-layout-meta.h \
|
2008-01-09 09:40:31 -05:00
|
|
|
$(srcdir)/clutter-list-model.h \
|
2007-06-07 10:41:35 -04:00
|
|
|
$(srcdir)/clutter-main.h \
|
2006-11-15 18:37:53 -05:00
|
|
|
$(srcdir)/clutter-media.h \
|
2007-11-15 05:02:25 -05:00
|
|
|
$(srcdir)/clutter-model.h \
|
2008-12-05 08:13:37 -05:00
|
|
|
$(srcdir)/clutter-path.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(srcdir)/clutter-rectangle.h \
|
2007-10-25 10:34:54 -04:00
|
|
|
$(srcdir)/clutter-score.h \
|
2007-10-08 11:03:22 -04:00
|
|
|
$(srcdir)/clutter-script.h \
|
2007-10-25 10:34:54 -04:00
|
|
|
$(srcdir)/clutter-scriptable.h \
|
2007-12-05 16:15:19 -05:00
|
|
|
$(srcdir)/clutter-shader.h \
|
2008-11-18 10:08:40 -05:00
|
|
|
$(srcdir)/clutter-shader-types.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(srcdir)/clutter-stage.h \
|
2008-03-28 18:50:55 -04:00
|
|
|
$(srcdir)/clutter-stage-manager.h \
|
2009-08-13 07:34:07 -04:00
|
|
|
$(srcdir)/clutter-stage-window.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(srcdir)/clutter-texture.h \
|
2008-12-11 06:12:48 -05:00
|
|
|
$(srcdir)/clutter-text.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(srcdir)/clutter-timeline.h \
|
2007-06-09 09:19:52 -04:00
|
|
|
$(srcdir)/clutter-timeout-pool.h \
|
2007-07-26 09:13:23 -04:00
|
|
|
$(srcdir)/clutter-types.h \
|
2007-05-22 05:31:40 -04:00
|
|
|
$(srcdir)/clutter-units.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(srcdir)/clutter-util.h \
|
2008-04-25 09:37:36 -04:00
|
|
|
$(top_builddir)/clutter/clutter-version.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(NULL)
|
2007-01-23 15:29:11 -05:00
|
|
|
|
2009-10-13 12:27:19 -04:00
|
|
|
# glib-genmarshal rules
|
2009-10-16 12:15:47 -04:00
|
|
|
glib_marshal_list = clutter-marshal.list
|
2009-10-13 12:27:19 -04:00
|
|
|
glib_marshal_prefix = clutter_marshal
|
|
|
|
|
include $(top_srcdir)/build/autotools/Makefile.am.marshal
|
|
|
|
|
|
|
|
|
|
# glib-mkenums rules
|
|
|
|
|
glib_enum_h = clutter-enum-types.h
|
|
|
|
|
glib_enum_c = clutter-enum-types.c
|
|
|
|
|
glib_enum_headers = $(source_h)
|
|
|
|
|
include $(top_srcdir)/build/autotools/Makefile.am.enums
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2007-06-09 09:20:22 -04:00
|
|
|
# please, keep this sorted alphabetically
|
2007-03-22 14:21:59 -04:00
|
|
|
source_c = \
|
2009-02-28 14:13:18 -05:00
|
|
|
$(srcdir)/clutter-actor.c \
|
|
|
|
|
$(srcdir)/clutter-alpha.c \
|
|
|
|
|
$(srcdir)/clutter-animatable.c \
|
|
|
|
|
$(srcdir)/clutter-animation.c \
|
|
|
|
|
$(srcdir)/clutter-backend.c \
|
|
|
|
|
$(srcdir)/clutter-behaviour.c \
|
|
|
|
|
$(srcdir)/clutter-behaviour-depth.c \
|
|
|
|
|
$(srcdir)/clutter-behaviour-ellipse.c \
|
|
|
|
|
$(srcdir)/clutter-behaviour-opacity.c \
|
|
|
|
|
$(srcdir)/clutter-behaviour-path.c \
|
|
|
|
|
$(srcdir)/clutter-behaviour-rotate.c \
|
|
|
|
|
$(srcdir)/clutter-behaviour-scale.c \
|
|
|
|
|
$(srcdir)/clutter-bezier.c \
|
|
|
|
|
$(srcdir)/clutter-binding-pool.c \
|
2009-09-11 08:51:23 -04:00
|
|
|
$(srcdir)/clutter-bin-layout.c \
|
2009-09-01 12:42:50 -04:00
|
|
|
$(srcdir)/clutter-box.c \
|
2009-10-13 07:14:05 -04:00
|
|
|
$(srcdir)/clutter-box-layout.c \
|
2009-02-28 14:13:18 -05:00
|
|
|
$(srcdir)/clutter-cairo-texture.c \
|
|
|
|
|
$(srcdir)/clutter-child-meta.c \
|
|
|
|
|
$(srcdir)/clutter-clone.c \
|
|
|
|
|
$(srcdir)/clutter-color.c \
|
|
|
|
|
$(srcdir)/clutter-container.c \
|
2009-03-10 14:28:56 -04:00
|
|
|
clutter-enum-types.c \
|
2009-02-28 14:13:18 -05:00
|
|
|
$(srcdir)/clutter-event.c \
|
|
|
|
|
$(srcdir)/clutter-feature.c \
|
|
|
|
|
$(srcdir)/clutter-fixed.c \
|
2009-09-02 07:37:16 -04:00
|
|
|
$(srcdir)/clutter-fixed-layout.c \
|
2009-09-18 12:28:02 -04:00
|
|
|
$(srcdir)/clutter-flow-layout.c \
|
2009-02-28 14:13:18 -05:00
|
|
|
$(srcdir)/clutter-frame-source.c \
|
|
|
|
|
$(srcdir)/clutter-group.c \
|
|
|
|
|
$(srcdir)/clutter-id-pool.c \
|
|
|
|
|
$(srcdir)/clutter-interval.c \
|
2009-09-01 11:34:28 -04:00
|
|
|
$(srcdir)/clutter-layout-manager.c \
|
2009-09-15 12:37:11 -04:00
|
|
|
$(srcdir)/clutter-layout-meta.c \
|
2009-02-28 14:13:18 -05:00
|
|
|
$(srcdir)/clutter-list-model.c \
|
|
|
|
|
$(srcdir)/clutter-main.c \
|
2009-03-10 14:28:56 -04:00
|
|
|
clutter-marshal.c \
|
2009-03-21 16:39:32 -04:00
|
|
|
$(srcdir)/clutter-master-clock.c \
|
2009-02-28 14:13:18 -05:00
|
|
|
$(srcdir)/clutter-media.c \
|
|
|
|
|
$(srcdir)/clutter-model.c \
|
|
|
|
|
$(srcdir)/clutter-path.c \
|
|
|
|
|
$(srcdir)/clutter-rectangle.c \
|
|
|
|
|
$(srcdir)/clutter-score.c \
|
|
|
|
|
$(srcdir)/clutter-script.c \
|
|
|
|
|
$(srcdir)/clutter-script-parser.c \
|
|
|
|
|
$(srcdir)/clutter-scriptable.c \
|
|
|
|
|
$(srcdir)/clutter-shader.c \
|
|
|
|
|
$(srcdir)/clutter-shader-types.c \
|
|
|
|
|
$(srcdir)/clutter-stage.c \
|
|
|
|
|
$(srcdir)/clutter-stage-manager.c \
|
|
|
|
|
$(srcdir)/clutter-stage-window.c \
|
|
|
|
|
$(srcdir)/clutter-texture.c \
|
|
|
|
|
$(srcdir)/clutter-text.c \
|
|
|
|
|
$(srcdir)/clutter-timeline.c \
|
2009-03-09 13:12:27 -04:00
|
|
|
$(srcdir)/clutter-timeout-interval.c \
|
2009-02-28 14:13:18 -05:00
|
|
|
$(srcdir)/clutter-timeout-pool.c \
|
|
|
|
|
$(srcdir)/clutter-units.c \
|
|
|
|
|
$(srcdir)/clutter-util.c \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
source_h_priv = \
|
2009-02-28 14:13:18 -05:00
|
|
|
$(srcdir)/clutter-bezier.h \
|
|
|
|
|
$(srcdir)/clutter-debug.h \
|
|
|
|
|
$(srcdir)/clutter-keysyms-table.h \
|
2009-03-21 16:39:32 -04:00
|
|
|
$(srcdir)/clutter-master-clock.h \
|
2009-02-28 14:13:18 -05:00
|
|
|
$(srcdir)/clutter-model-private.h \
|
|
|
|
|
$(srcdir)/clutter-private.h \
|
|
|
|
|
$(srcdir)/clutter-id-pool.h \
|
|
|
|
|
$(srcdir)/clutter-script-private.h \
|
2009-03-09 13:12:27 -04:00
|
|
|
$(srcdir)/clutter-timeout-interval.h \
|
2007-03-22 14:21:59 -04:00
|
|
|
$(NULL)
|
|
|
|
|
|
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
|
|
|
libclutter_@CLUTTER_WINSYS@_@CLUTTER_API_VERSION@_la_LIBADD = \
|
2009-10-13 14:27:03 -04:00
|
|
|
$(CLUTTER_LIBS) \
|
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
|
|
|
$(top_builddir)/clutter/cogl/cogl/libclutter-cogl.la \
|
2009-07-29 12:21:07 -04:00
|
|
|
$(top_builddir)/clutter/cogl/pango/libcoglpango.la \
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-27 21:02:02 -04:00
|
|
|
$(top_builddir)/clutter/$(CLUTTER_WINSYS)/libclutter-$(CLUTTER_WINSYS).la \
|
2009-10-13 14:27:03 -04:00
|
|
|
$(clutter_json_libadd) \
|
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_LIB)
|
2007-03-22 14:21:59 -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
|
|
|
libclutter_@CLUTTER_WINSYS@_@CLUTTER_API_VERSION@_la_DEPENDENCIES = \
|
|
|
|
|
$(top_builddir)/clutter/cogl/cogl/libclutter-cogl.la \
|
2009-07-29 12:21:07 -04:00
|
|
|
$(top_builddir)/clutter/cogl/pango/libcoglpango.la \
|
Intial Re-layout of the Cogl source code and introduction of a Cogl Winsys
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
2009-07-27 21:02:02 -04:00
|
|
|
$(top_builddir)/clutter/$(CLUTTER_WINSYS)/libclutter-$(CLUTTER_WINSYS).la \
|
2009-10-13 14:27:03 -04:00
|
|
|
$(clutter_json_dep) \
|
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_LIB)
|
2008-02-20 11:00:33 -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
|
|
|
libclutter_@CLUTTER_WINSYS@_@CLUTTER_API_VERSION@_la_SOURCES = \
|
2008-01-25 14:48:26 -05:00
|
|
|
$(source_c) \
|
|
|
|
|
$(source_h) \
|
|
|
|
|
$(source_h_priv)
|
2007-03-26 19:18:39 -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
|
|
|
libclutter_@CLUTTER_WINSYS@_@CLUTTER_API_VERSION@_la_LDFLAGS = $(LDADD)
|
2007-03-22 14:21:59 -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
|
|
|
lib_LTLIBRARIES = $(CLUTTER_WINSYS_LIB)
|
2007-03-22 14:21:59 -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
|
|
|
EXTRA_LTLIBRARIES = libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2008-01-25 14:48:26 -05:00
|
|
|
clutterdir = $(includedir)/clutter-$(CLUTTER_API_VERSION)/clutter
|
2007-03-22 14:21:59 -04:00
|
|
|
clutter_HEADERS = \
|
|
|
|
|
$(source_h) \
|
2009-03-10 10:40:33 -04:00
|
|
|
$(top_builddir)/clutter/clutter-json.h \
|
|
|
|
|
$(top_builddir)/clutter/clutter-enum-types.h \
|
2009-02-28 14:13:18 -05:00
|
|
|
$(top_srcdir)/clutter/clutter.h
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2009-10-13 12:27:19 -04:00
|
|
|
DISTCLEANFILES += clutter-version.h
|
|
|
|
|
EXTRA_DIST += clutter-version.h.in
|
|
|
|
|
|
2009-02-20 09:39:51 -05:00
|
|
|
BUILT_GIRSOURCES =
|
|
|
|
|
|
|
|
|
|
if LOCAL_JSON_GLIB
|
|
|
|
|
json_gir_include_path=--add-include-path=json
|
2009-06-25 13:56:52 -04:00
|
|
|
json_gir_include=--include=ClutterJson-@CLUTTER_API_VERSION@
|
2009-10-18 12:00:24 -04:00
|
|
|
json_gir_pkg=
|
2009-10-18 12:12:12 -04:00
|
|
|
|
|
|
|
|
# If we are building it, ClutterJson gets the same handling as described
|
|
|
|
|
# for Cogl above
|
|
|
|
|
ClutterJson-@CLUTTER_API_VERSION@.gir: Clutter-@CLUTTER_API_VERSION@.gir json/ClutterJson-@CLUTTER_API_VERSION@.gir
|
|
|
|
|
$(QUIET_GEN) \
|
|
|
|
|
shlib=`sed -n 's/.*shared-library="\([^"]*\)".*/\1/p' < Clutter-@CLUTTER_API_VERSION@.gir` ; \
|
|
|
|
|
sed "s/shared-library=\"[^\"]*\"/shared-library=\"$$shlib\"/"< json/ClutterJson-@CLUTTER_API_VERSION@.gir > $@
|
|
|
|
|
|
|
|
|
|
BUILT_GIRSOURCES += ClutterJson-@CLUTTER_API_VERSION@.gir
|
2009-06-25 13:56:52 -04:00
|
|
|
else
|
|
|
|
|
json_gir_include=--include=Json-1.0
|
2009-10-18 12:00:24 -04:00
|
|
|
json_gir_pkg=--pkg json-glib-1.0
|
2009-10-18 12:12:12 -04:00
|
|
|
endif # LOCAL_JSON_GLIB
|
2009-02-20 09:39:51 -05:00
|
|
|
|
2009-10-18 12:12:12 -04:00
|
|
|
if HAVE_INTROSPECTION
|
2009-02-20 09:39:51 -05:00
|
|
|
# We can't reference the list of COGL header files, since they are in a
|
2009-05-13 18:14:24 -04:00
|
|
|
# subdir Makefile.am, so just extract them from cogl.h instead. The doc
|
|
|
|
|
# comments for COGL are in the headers, so we don't need the source files.
|
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-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
|
2009-10-18 12:49:00 -04:00
|
|
|
$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
|
2009-06-09 07:40:06 -04:00
|
|
|
--namespace Clutter --nsversion=@CLUTTER_API_VERSION@ \
|
|
|
|
|
$(INCLUDES) \
|
2009-10-16 19:30:37 -04:00
|
|
|
$(AM_CPPFLAGS) \
|
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
|
|
|
--add-include-path=cogl/cogl \
|
2009-06-09 07:40:06 -04:00
|
|
|
$(json_gir_include_path) \
|
|
|
|
|
--c-include='clutter/clutter.h' \
|
|
|
|
|
--include=GL-1.0 \
|
|
|
|
|
--include=GObject-2.0 \
|
|
|
|
|
--include=Pango-1.0 \
|
|
|
|
|
--include=PangoCairo-1.0 \
|
|
|
|
|
--include=Cogl-@CLUTTER_API_VERSION@ \
|
2009-06-25 13:56:52 -04:00
|
|
|
$(json_gir_include) \
|
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
|
|
|
--library=libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la \
|
2009-07-17 15:10:06 -04:00
|
|
|
--libtool="$(top_builddir)/libtool" \
|
2009-06-09 07:40:06 -04:00
|
|
|
--pkg gobject-2.0 \
|
2009-10-18 12:00:24 -04:00
|
|
|
$(json_gir_pkg) \
|
2009-06-09 07:40:06 -04:00
|
|
|
--pkg pango \
|
|
|
|
|
--pkg pangocairo \
|
|
|
|
|
--output $@ \
|
|
|
|
|
$(clutter_HEADERS) \
|
|
|
|
|
$(source_c)
|
2009-02-20 09:39:51 -05:00
|
|
|
|
|
|
|
|
BUILT_GIRSOURCES += Clutter-@CLUTTER_API_VERSION@.gir
|
|
|
|
|
|
2009-07-17 15:15:03 -04:00
|
|
|
# ClutterJson.gir and Cogl.gir are used included into Clutter.gir, so need
|
|
|
|
|
# to be built before the typelib is generated
|
2009-08-12 10:32:18 -04:00
|
|
|
Clutter-@CLUTTER_API_VERSION@.typelib: $(clutter_json_gir) Cogl-@CLUTTER_API_VERSION@.gir
|
2009-07-17 15:15:03 -04:00
|
|
|
|
2009-05-13 18:14:24 -04:00
|
|
|
# We build Cogl.gir in the cogl/ subdir, but it needs to reference the shared
|
|
|
|
|
# library that it's built into, so we delay compiling the gir into typelib
|
|
|
|
|
# until after we've built the shared library. To create the final Cogl.gir
|
|
|
|
|
# that we compile and install, we transfer the shared-library="" line from
|
|
|
|
|
# Clutter.gir to Cogl.gir
|
2009-10-18 12:00:24 -04:00
|
|
|
Cogl-@CLUTTER_API_VERSION@.gir: Clutter-@CLUTTER_API_VERSION@.gir cogl/cogl/Cogl-@CLUTTER_API_VERSION@.gir
|
2009-09-16 12:43:58 -04:00
|
|
|
$(QUIET_GEN) \
|
2009-05-13 18:14:24 -04:00
|
|
|
shlib=`sed -n 's/.*shared-library="\([^"]*\)".*/\1/p' < Clutter-@CLUTTER_API_VERSION@.gir` ; \
|
2009-10-18 12:00:24 -04:00
|
|
|
sed "s/shared-library=\"[^\"]*\"/shared-library=\"$$shlib\"/"< cogl/cogl/Cogl-@CLUTTER_API_VERSION@.gir > $@
|
2009-05-13 18:14:24 -04:00
|
|
|
|
|
|
|
|
BUILT_GIRSOURCES += Cogl-@CLUTTER_API_VERSION@.gir
|
|
|
|
|
|
|
|
|
|
# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
|
|
|
|
|
# install anything - we need to install inside our prefix.
|
2009-02-20 09:39:51 -05:00
|
|
|
girdir = $(datadir)/gir-1.0
|
|
|
|
|
gir_DATA = $(BUILT_GIRSOURCES)
|
|
|
|
|
|
|
|
|
|
typelibsdir = $(libdir)/girepository-1.0/
|
2009-05-13 18:14:24 -04:00
|
|
|
|
2009-02-20 09:39:51 -05:00
|
|
|
typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
|
|
|
|
|
|
|
|
|
|
%.typelib: %.gir $(INTROSPECTION_COMPILER)
|
2009-08-17 18:27:22 -04:00
|
|
|
$(QUIET_GEN) \
|
2009-08-17 13:57:18 -04:00
|
|
|
LD_LIBRARY_PATH=.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \
|
2009-08-17 18:27:22 -04:00
|
|
|
$(INTROSPECTION_COMPILER) \
|
2009-08-17 09:21:42 -04:00
|
|
|
--includedir=$(srcdir) \
|
|
|
|
|
--includedir=. \
|
|
|
|
|
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
|
2009-02-20 09:39:51 -05:00
|
|
|
|
|
|
|
|
CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
|
2009-10-18 12:12:12 -04:00
|
|
|
endif # HAVE_INTROSPECTION
|