[clutter/msvc-support-master: 56/56] Merge branch 'master' into msvc-support-master

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [clutter/msvc-support-master: 56/56] Merge branch 'master' into msvc-support-master
Date: Mon, 7 Nov 2011 03:42:59 +0000 (UTC)
commit bb9e452a36d7a4fe3ed2090c050d096c26aae988
Merge: 61c3b93 e0bfdbf
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Nov 7 11:42:16 2011 +0800

    Merge branch 'master' into msvc-support-master

 .gitignore                                         |    2 +-
 README.in                                          |   51 +-
 clutter/Makefile.am                                |  229 ++-
 clutter/clutter-actor.h                            |   34 -
 clutter/clutter-animatable.h                       |    2 -
 clutter/clutter-backend-private.h                  |    6 +-
 clutter/clutter-backend.h                          |   37 +-
 clutter/clutter-cairo-texture.c                    |   92 +-
 clutter/clutter-cairo-texture.h                    |    2 -
 clutter/clutter-deprecated.h                       |    8 +-
 clutter/clutter-group.c                            |   17 +-
 clutter/clutter-group.h                            |   57 +-
 clutter/clutter-keysyms-update.pl                  |   17 +-
 clutter/clutter-keysyms.h                          |   13 +-
 clutter/clutter-layout-manager.c                   |    1 -
 clutter/clutter-main.c                             |  161 ++-
 clutter/clutter-main.h                             |  169 +-
 clutter/clutter-profile.c                          |    3 +-
 clutter/clutter-stage-manager.h                    |    3 +-
 clutter/clutter-stage-window.c                     |   14 +
 clutter/clutter-stage-window.h                     |    4 +
 clutter/clutter-stage.h                            |   39 -
 clutter/clutter-texture.h                          |    2 -
 clutter/clutter-types.h                            |    9 +-
 clutter/clutter-util.h                             |    4 -
 clutter/clutter-version.h.in                       |   16 +
 clutter/clutter.h                                  |    2 -
 clutter/clutter.pc.in                              |   11 +-
 clutter/cogl/clutter-backend-cogl.c                |  338 +---
 clutter/cogl/clutter-backend-cogl.h                |   33 -
 clutter/cogl/clutter-stage-cogl.c                  |  137 +-
 clutter/cogl/clutter-stage-cogl.h                  |   17 -
 clutter/deprecated/clutter-actor.h                 |   16 +
 clutter/deprecated/clutter-backend.h               |   36 +
 clutter/deprecated/clutter-group.h                 |   23 +
 .../clutter-keysyms.h}                             |   18 +-
 clutter/deprecated/clutter-main.h                  |   53 +
 clutter/deprecated/clutter-shader.h                |   24 +
 clutter/deprecated/clutter-stage.h                 |   45 +
 clutter/egl/clutter-backend-eglnative.c            |  368 ++++
 clutter/egl/clutter-backend-eglnative.h            |   75 +
 clutter/{cogl => egl}/clutter-cex100.h.in          |    0
 clutter/{cogl => egl}/clutter-egl-headers.h        |    0
 clutter/{cogl => egl}/clutter-egl.h                |    3 +
 clutter/evdev/clutter-device-manager-evdev.c       |   11 +-
 .../clutter-backend-gdk-private.h}                 |   20 +-
 clutter/gdk/clutter-backend-gdk.c                  |  470 +++++
 clutter/gdk/clutter-backend-gdk.h                  |   73 +
 clutter/gdk/clutter-device-manager-gdk.c           |  249 +++
 clutter/gdk/clutter-device-manager-gdk.h           |   63 +
 clutter/gdk/clutter-event-gdk.c                    |  346 +++
 clutter/gdk/clutter-gdk.h                          |   58 +
 clutter/gdk/clutter-input-device-gdk.c             |  160 ++
 clutter/gdk/clutter-input-device-gdk.h             |   55 +
 clutter/gdk/clutter-settings-gdk.h                 |   28 +
 clutter/gdk/clutter-stage-gdk.c                    |  605 ++++++
 clutter/gdk/clutter-stage-gdk.h                    |   81 +
 clutter/osx/clutter-backend-osx.c                  |    6 -
 clutter/osx/clutter-stage-osx.h                    |    3 +-
 clutter/{cogl => tslib}/clutter-event-tslib.c      |   29 +-
 .../clutter-event-tslib.h}                         |   23 +-
 clutter/wayland/clutter-backend-wayland.c          |   15 -
 clutter/win32/clutter-backend-win32.c              |    6 -
 clutter/win32/clutter-stage-win32.c                |   10 +-
 clutter/x11/clutter-backend-x11.c                  |  439 +++--
 clutter/x11/clutter-backend-x11.h                  |   12 +-
 clutter/{cogl => x11}/clutter-glx-texture-pixmap.c |    0
 clutter/{cogl => x11}/clutter-glx-texture-pixmap.h |    0
 clutter/{cogl => x11}/clutter-glx.h                |    0
 clutter/x11/clutter-stage-x11.c                    |  146 +-
 clutter/x11/clutter-stage-x11.h                    |    9 +-
 clutter/x11/clutter-x11-texture-pixmap.c           |   25 +-
 configure.ac                                       |  569 +++---
 doc/cookbook/examples/Makefile.am                  |    4 +-
 doc/reference/cally/Makefile.am                    |    2 +-
 doc/reference/clutter/Makefile.am                  |   27 +-
 doc/reference/clutter/running-clutter.xml          |    1 +
 po/bg.po                                           | 2227 ++++++++++++++++++++
 tests/accessibility/Makefile.am                    |    2 +-
 tests/conform/Makefile.am                          |    2 +-
 tests/conform/test-behaviours.c                    |    2 -
 tests/conform/test-cogl-texture-pixmap-x11.c       |   10 +-
 tests/conform/test-conform-common.c                |    4 +-
 tests/conform/test-score.c                         |    2 -
 tests/conform/test-script-parser.c                 |    2 -
 tests/interactive/Makefile.am                      |    7 +-
 tests/interactive/test-actor-clone.c               |    1 -
 tests/interactive/test-actors.c                    |    1 -
 tests/interactive/test-behave.c                    |    1 -
 tests/interactive/test-depth.c                     |    2 -
 tests/interactive/test-devices.c                   |    5 +
 tests/interactive/test-multistage.c                |    2 -
 tests/interactive/test-paint-wrapper.c             |    1 -
 tests/interactive/test-pixmap.c                    |   49 +-
 tests/interactive/test-scale.c                     |    2 -
 tests/interactive/test-script.c                    |    2 -
 tests/interactive/test-texture-quality.c           |    2 -
 tests/interactive/test-threads.c                   |    2 -
 tests/micro-bench/Makefile.am                      |    2 +-
 tests/performance/Makefile.am                      |    2 +-
 100 files changed, 6540 insertions(+), 1528 deletions(-)
---
diff --cc clutter/Makefile.am
index 5b3d714,e18e08c..7742a92
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@@ -675,48 -769,24 +769,66 @@@ libclutter_ CLUTTER_API_VERSION@_la_LDF
  	$(win32_resources_ldflag) \
  	$(NULL)
  
 +dist-hook: ../build/win32/vs9/clutter.vcproj ../build/win32/vs10/clutter.vcxproj ../build/win32/vs10/clutter.vcxproj.filters
 +
 +../build/win32/vs9/clutter.vcproj: $(top_srcdir)/build/win32/vs9/clutter.vcprojin
 +	for F in `echo $(win32_source_c) $(cally_sources_c) $(source_c) $(source_c_priv) $(deprecated_c) $(deprecated_c_priv) $(built_source_c) | tr '/' '\\'`; do \
 +		case $$F in \
 +		*.c)	echo '   <File RelativePath="..\..\..\clutter\'$$F'" />' \
 +			;; \
 +		esac; \
 +	done >clutter.sourcefiles
 +	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/clutter.vcprojin >$@
 +	rm clutter.sourcefiles
 +	
 +../build/win32/vs10/clutter.vcxproj: $(top_srcdir)/build/win32/vs10/clutter.vcxprojin
 +	for F in `echo $(win32_source_c) $(cally_sources_c) $(source_c) $(source_c_priv) $(deprecated_c) $(deprecated_c_priv) $(built_source_c) | tr '/' '\\'`; do \
 +		case $$F in \
 +		*.c)	echo '    <ClCompile Include="..\..\..\clutter\'$$F'" />' \
 +			;; \
 +		esac; \
 +	done >clutter.vs10.sourcefiles
 +	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/clutter.vcxprojin >$@
 +	rm clutter.vs10.sourcefiles
 +	
 +../build/win32/vs10/clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/clutter.vcxproj.filtersin
 +	for F in `echo $(win32_source_c) $(cally_sources_c) $(source_c) $(source_c_priv) $(deprecated_c) $(deprecated_c_priv) $(built_source_c) | tr '/' '\\'`; do \
 +		case $$F in \
 +		*.c)	echo '    <ClCompile Include="..\..\..\clutter\'$$F'"><Filter>Sources</Filter></ClCompile>' \
 +			;; \
 +		esac; \
 +	done >clutter.vs10.sourcefiles.filters
 +	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/clutter.vcxproj.filtersin >$@
 +	rm clutter.vs10.sourcefiles.filters
 +	
 +EXTRA_DIST += \
 +	clutter-version.h.win32	\
 +	clutter-config.h.win32	\
 +	clutter-version.h.win32.in	\
 +	clutter.symbols	\
 +	$(NULL)
 +
 +# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
 +DISTCLEANFILES += ../build/win32/vs9/clutter.vcproj ../build/win32/vs10/clutter.vcxproj ../build/win32/vs10/clutter.vcxproj.filters
 +
+ install-exec-local:
+ 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	for lib in `echo $(compat_libs)`; do \
+ 	  (cd $(DESTDIR)$(libdir) && \
+ 	    rm -f $$lib.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION); \
+ 	  ) ; \
+ 	  (cd $(DESTDIR)$(libdir) && \
+ 	    { ln -s -f libclutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0 || \
+ 	      { rm -f $$lib.0 && ln -s libclutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib.0; }; \
+ 	    } \
+ 	  ) ; \
+ 	  (cd $(DESTDIR)$(libdir) && \
+ 	    { ln -s -f libclutter-$(CLUTTER_API_VERSION).so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib || \
+ 	      { rm -f $$lib && ln -s libclutter-1.0.so.0.$(CLUTTER_LT_CURRENT).$(CLUTTER_LT_REVISION) $$lib; }; \
+ 	    } \
+ 	  ) ; \
+ 	done
+ 
  # gobject-introspection rules
  -include $(INTROSPECTION_MAKEFILE)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]