[cogl/msvc-support] Update VS support for commits in master
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/msvc-support] Update VS support for commits in master
- Date: Thu, 2 Jun 2011 06:52:47 +0000 (UTC)
commit 69ea00be41047d675e4dbacf96184f14a0e82bfd
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Jun 2 15:07:28 2011 +0800
Update VS support for commits in master
Adapted to the following commits by Robert:
ee7cc9e7889498c7ed3574b85e7294fff1bb45b1
a29a76dbabf8e68febc50288465fccdfd8d1313f
60b25615fd76716d99998bf6755a246c3ea495e6
b380fed23d61688d1ea199ac28ff4bfba0a32985
build/win32/vs10/cogl.props | 6 ++++--
build/win32/vs9/cogl.vsprops | 5 +++--
cogl/cogl-defines.h.win32 | 4 ++++
cogl/cogl.symbols | 10 ++++++++++
config.h.win32.in | 3 ---
5 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 6c8438a..c6a287d 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -29,7 +29,7 @@ if exist ..\..\..\cogl\cogl-enum-types.h goto DONE_COGL_ENUMS_H
cd ..\..\..\cogl
-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h > cogl-enum-types.h
+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h > cogl-enum-types.h
cd ..\build\win32\vs10
@@ -40,7 +40,7 @@ if exist ..\..\..\cogl\cogl-enum-types.c goto DONE_COGL_ENUMS_C
cd ..\..\..\cogl
-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h > cogl-enum-types.c
+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h > cogl-enum-types.c
cd ..\build\win32\vs10
@@ -110,6 +110,8 @@ copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+
copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 04790ca..82951ac 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -63,13 +63,13 @@ copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\cogl-defines.h

if exist ..\..\..\cogl\cogl-enum-types.h goto DONE_COGL_ENUMS_H

cd ..\..\..\cogl

-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h > cogl-enum-types.h

+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h > cogl-enum-types.h

cd ..\build\win32\vs9

:DONE_COGL_ENUMS_H

if exist ..\..\..\cogl\cogl-enum-types.c goto DONE_COGL_ENUMS_C

cd ..\..\..\cogl

-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h > cogl-enum-types.c

+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h > cogl-enum-types.c

cd ..\build\win32\vs9

:DONE_COGL_ENUMS_C

@@ -110,6 +110,7 @@ copy ..\..\..\cogl\cogl-path.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl�
copy ..\..\..\cogl\cogl-pixel-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-shader.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-texture.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-texture-2d.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-texture-3d.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-types.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-vertex-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

diff --git a/cogl/cogl-defines.h.win32 b/cogl/cogl-defines.h.win32
index 6c13c18..128172f 100644
--- a/cogl/cogl-defines.h.win32
+++ b/cogl/cogl-defines.h.win32
@@ -49,6 +49,10 @@ G_BEGIN_DECLS
#endif
#endif
+#ifndef GL_OES_EGL_image
+#define GLeglImageOES void *
+#endif
+
G_END_DECLS
#endif
diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols
index 30772e7..09bfa77 100644
--- a/cogl/cogl.symbols
+++ b/cogl/cogl.symbols
@@ -325,6 +325,7 @@ cogl_is_shader
cogl_is_texture
#ifdef COGL_ENABLE_EXPERIMENTAL_API
+cogl_is_texture_2d_EXP
cogl_is_texture_3d_EXP
#endif
@@ -741,6 +742,7 @@ cogl_swap_chain_set_has_alpha_EXP
cogl_swap_chain_set_length_EXP
#endif
+cogl_texture_error_quark
cogl_texture_flags_get_type
cogl_texture_get_data
cogl_texture_get_format
@@ -773,6 +775,10 @@ cogl_texture_unref
#endif
#ifdef COGL_ENABLE_EXPERIMENTAL_API
+cogl_texture_2d_new_from_data_EXP
+cogl_texture_2d_new_from_foreign_EXP
+cogl_texture_2d_new_with_size_EXP
+
cogl_texture_3d_new_from_data_EXP
cogl_texture_3d_new_with_size_EXP
#endif
@@ -832,6 +838,10 @@ cogl_viewport
cogl_winsys_feature_get_type
+#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
+cogl_wayland_texture_2d_new_from_buffer_EXP
+#endif
+
#ifdef COGL_ENABLE_EXPERIMENTAL_API
#ifdef COGL_HAS_XLIB
cogl_xlib_get_display_EXP
diff --git a/config.h.win32.in b/config.h.win32.in
index 158ad58..3744628 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -3,9 +3,6 @@
/* Can use Cogl 2.0 API internally */
#define COGL_ENABLE_EXPERIMENTAL_2_0_API 1
-/* Cogl can create its own OpenGL context */
-#define COGL_HAS_FULL_WINSYS 1
-
/* Cogl supports OpenGL using the GLX API */
/*#undef COGL_HAS_GLX_SUPPORT*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
