mirror of
https://github.com/brl/mutter.git
synced 2024-12-26 12:52:14 +00:00
323eaf3fb3
Conflicts:
clutter/cogl/gl/cogl-texture.c
clutter/cogl/gles/cogl-primitives.c
* cogl-material:
clutter-{clone-,}texture weren't updating their material opacity.
Updates GLES1 support for CoglMaterial
Normalizes gl vs gles code in preperation for synching material changes
Removes cogl_blend_func and cogl_alpha_func
Fully integrates CoglMaterial throughout the rest of Cogl
[cogl-material] Restore the GL_TEXTURE_ENV_MODE after material_rectangle
[cogl-material] Make the user_tex_coords parameter of _rectangle const
[test-cogl-material] Remove return value from material_rectangle_paint
Add cogl-material.h and cogl-matrix.h to libclutterinclude_HEADERS
[cogl-material] improvements for cogl_material_rectangle
[cogl-material] Adds a cogl_material_set_color function
[cogl-material] Some improvements for how we sync CoglMaterial state with OpenGL
[cogl-material] Converts clutter-texture/clutter-clone-texture to the material API
[doc] Hooks up cogl-material reference documentation
Updates previous GLES multi-texturing code to use CoglMaterial
Adds a CoglMaterial abstraction, which includes support for multi-texturing
[doc] Hooks up cogl-matrix reference documentation
Adds CoglMatrix utility code
[tests] Adds an interactive unit test for multi-texturing
[multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2
64 lines
2.1 KiB
Makefile
64 lines
2.1 KiB
Makefile
libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl
|
|
libclutterinclude_HEADERS = \
|
|
$(top_builddir)/clutter/cogl/cogl.h \
|
|
$(top_builddir)/clutter/cogl/cogl-defines-gl.h \
|
|
$(top_builddir)/clutter/cogl/cogl-color.h \
|
|
$(top_builddir)/clutter/cogl/cogl-deprecated.h \
|
|
$(top_builddir)/clutter/cogl/cogl-fixed.h \
|
|
$(top_builddir)/clutter/cogl/cogl-offscreen.h \
|
|
$(top_builddir)/clutter/cogl/cogl-path.h \
|
|
$(top_builddir)/clutter/cogl/cogl-shader.h \
|
|
$(top_builddir)/clutter/cogl/cogl-texture.h \
|
|
$(top_builddir)/clutter/cogl/cogl-types.h \
|
|
$(top_builddir)/clutter/cogl/cogl-vertex-buffer.h \
|
|
$(top_builddir)/clutter/cogl/cogl-material.h \
|
|
$(top_builddir)/clutter/cogl/cogl-matrix.h
|
|
|
|
INCLUDES = \
|
|
-I$(top_srcdir) \
|
|
-I$(top_srcdir)/clutter \
|
|
-I$(top_srcdir)/clutter/cogl \
|
|
-I$(top_srcdir)/clutter/cogl/common \
|
|
-I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \
|
|
-I$(top_builddir)/clutter \
|
|
-I$(top_builddir)/clutter/cogl \
|
|
-DG_LOG_DOMAIN=\"Cogl-GL\" \
|
|
-DCLUTTER_COMPILATION \
|
|
$(CLUTTER_CFLAGS) \
|
|
$(CLUTTER_DEBUG_CFLAGS) \
|
|
$(MAINTAINER_CFLAGS) \
|
|
$(GCC_FLAGS)
|
|
|
|
LDADD = $(CLUTTER_LIBS)
|
|
|
|
noinst_LTLIBRARIES = libclutter-cogl.la
|
|
|
|
libclutter_cogl_la_SOURCES = \
|
|
$(top_builddir)/clutter/cogl/cogl.h \
|
|
$(top_builddir)/clutter/cogl/cogl-defines-gl.h \
|
|
$(top_builddir)/clutter/cogl/cogl-color.h \
|
|
$(top_builddir)/clutter/cogl/cogl-deprecated.h \
|
|
$(top_builddir)/clutter/cogl/cogl-fixed.h \
|
|
$(top_builddir)/clutter/cogl/cogl-offscreen.h \
|
|
$(top_builddir)/clutter/cogl/cogl-path.h \
|
|
$(top_builddir)/clutter/cogl/cogl-shader.h \
|
|
$(top_builddir)/clutter/cogl/cogl-texture.h \
|
|
$(top_builddir)/clutter/cogl/cogl-types.h \
|
|
cogl-internal.h \
|
|
cogl-texture-private.h \
|
|
cogl-fbo.h \
|
|
cogl-shader-private.h \
|
|
cogl-program.h \
|
|
cogl-context.h \
|
|
cogl.c \
|
|
cogl-primitives.c \
|
|
cogl-texture.c \
|
|
cogl-fbo.c \
|
|
cogl-shader.c \
|
|
cogl-program.c \
|
|
cogl-context.c
|
|
|
|
EXTRA_DIST = cogl-defines.h.in
|
|
|
|
libclutter_cogl_la_LIBADD = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
|