[cogl/msvc-support: 28/28] Merge branch 'master' into msvc-support

[Chun-wei Fan <fanchunwei src gnome org>]

commit b447c8bc88628c2271706500a11ebb9b5624ac13
Merge: 73c5cb9 2f000c3
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jun 15 15:26:17 2011 +0800

    Merge branch 'master' into msvc-support

 .gitignore                                         |   26 ++--
 Makefile.am                                        |   18 ++-
 NEWS                                               |   57 +++++++
 README.in                                          |  104 +++++++------
 build/autotools/Makefile.am.changelog              |   78 ++++++++++
 build/autotools/Makefile.am.release                |  158 ++++++++++++++++++++
 cogl-pango/Makefile.am                             |    2 +-
 .../cogl-pango-2.0-experimental.pc.in              |   10 +-
 cogl-pango/cogl-pango-fontmap.c                    |    6 +-
 cogl-pango/cogl-pango-render.c                     |   21 ++--
 cogl/Makefile.am                                   |    8 +-
 cogl/{cogl.pc.in => cogl-2.0-experimental.pc.in}   |    0
 cogl/cogl-context.c                                |    4 +-
 cogl/cogl-debug.c                                  |    1 +
 cogl/cogl-debug.h                                  |    1 +
 cogl/cogl-depth-state.h                            |    3 +-
 cogl/cogl-material-compat.c                        |    2 +-
 cogl/cogl-material-compat.h                        |    2 +-
 cogl/cogl-matrix.h                                 |    2 +-
 cogl/cogl-object-private.h                         |  123 ++++++++++------
 cogl/cogl-object.c                                 |   32 ++++
 cogl/cogl-object.h                                 |   73 +++++++++
 cogl/cogl-pipeline-fragend-arbfp.c                 |   25 ++-
 cogl/cogl-pipeline-fragend-glsl.c                  |    9 +
 cogl/cogl-pipeline-private.h                       |    2 +-
 cogl/cogl-texture-2d.h                             |    2 +
 cogl/cogl-vertex-buffer.c                          |    3 +
 cogl/winsys/cogl-texture-pixmap-x11.c              |    2 +-
 config-custom.h                                    |   35 +++++
 configure.ac                                       |   43 ++++-
 doc/RELEASING                                      |   86 +++++++++++
 doc/reference/Makefile.am                          |    2 +-
 .../Makefile.am                                    |   10 +-
 .../blend-strings.xml                              |    0
 .../cogl-docs.xml.in                               |    0
 .../cogl-sections.txt                              |    0
 .../cogl_ortho.png                                 |  Bin 12650 -> 12650 bytes
 .../fill-rule-even-odd.png                         |  Bin 3121 -> 3121 bytes
 .../fill-rule-non-zero.png                         |  Bin 3143 -> 3143 bytes
 .../quad-indices-order.png                         |  Bin 2620 -> 2620 bytes
 .../quad-indices-triangles.png                     |  Bin 8018 -> 8018 bytes
 doc/reference/cogl/Makefile.am                     |   10 +-
 examples/Makefile.am                               |    2 +-
 examples/x11-foreign.c                             |   37 ++++-
 po/pl.po                                           |   10 +-
 45 files changed, 828 insertions(+), 181 deletions(-)
---
diff --cc Makefile.am
index 4e08df2,1ef067b..7b647ba
--- a/Makefile.am
+++ b/Makefile.am
@@@ -8,4 -8,16 +8,20 @@@ SUBDIRS += examples doc po buil
  
  ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
  
- EXTRA_DIST = README.in README config.h.win32 config.h.win32.in
+ EXTRA_DIST = \
+ 	README.in \
 -	config-custom.h
++	README \
++	config-custom.h \
++	config.h.win32.in \
++	config.h.win32
+ 
+ # .changelog expects these to be initializes
+ CLEANFILES=
+ DISTCLEANFILES=
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags --enable-profile
+ 
+ # .release requires .changelog rules
+ include $(top_srcdir)/build/autotools/Makefile.am.changelog
+ include $(top_srcdir)/build/autotools/Makefile.am.release
++
diff --cc cogl/cogl-debug.h
index 59e45ef,292de25..a12930c
--- a/cogl/cogl-debug.h
+++ b/cogl/cogl-debug.h
@@@ -84,7 -74,8 +84,8 @@@ typedef enum 
  
  #define COGL_DEBUG_N_INTS COGL_FLAGS_N_INTS_FOR_SIZE (COGL_DEBUG_N_FLAGS)
  
 -extern unsigned int _cogl_debug_flags[COGL_DEBUG_N_INTS];
 -extern GHashTable *_cogl_debug_instances;
 +COGL_EXP extern unsigned int _cogl_debug_flags[COGL_DEBUG_N_INTS];
++COGL_EXP extern GHashTable *_cogl_debug_instances;
  
  #define COGL_DEBUG_ENABLED(flag) \
    COGL_FLAGS_GET (_cogl_debug_flags, flag)
diff --cc configure.ac
index 2bf4a61,fed7298..ea7105a
--- a/configure.ac
+++ b/configure.ac
@@@ -855,14 -879,9 +879,14 @@@ AC_SUBST(MAINTAINER_CFLAGS
  AC_OUTPUT(
  Makefile
  README
 +config.h.win32
 +build/Makefile
 +build/win32/Makefile
 +build/win32/vs9/Makefile
 +build/win32/vs10/Makefile
  cogl/Makefile
  cogl/cogl-1.0.pc
- cogl/cogl-$COGL_MAJOR_VERSION.0.pc:cogl/cogl.pc.in
+ cogl/cogl-2.0-experimental.pc
  cogl/cogl-defines.h
  cogl-pango/Makefile
  cogl-pango/cogl-pango-1.0.pc