GNOME.org
 

[clutter/msvc-support] Remove the remainder of Cogl

commit e8dd8afa2416ca0af89e62983cc66bd3ba68810f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri May 13 12:52:02 2011 +0800

    Remove the remainder of Cogl
    
    -Removed my own files for VS support in Cogl.
    
    -VS project/filter files for Cogl has been dropped for Clutter, and
     the README.txt files have been updated accordingly.  The property sheets
     and projects have been updated in a preliminary fashion for now to refer
     to the "external" Cogl that should have been installed earlier.
    
    -VS support for building Cogl components have been moved and updated
     into the Cogl project, also under the msvc-support branch...

 build/win32/vs10/Makefile.am                  |    9 -
 build/win32/vs10/README.txt                   |    7 +-
 build/win32/vs10/clutter.props                |  123 +----
 build/win32/vs10/clutter.sln                  |   20 -
 build/win32/vs10/clutter.vcxprojin            |   26 +-
 build/win32/vs10/cogl-pango.vcxproj.filtersin |   16 -
 build/win32/vs10/cogl-pango.vcxprojin         |  138 -----
 build/win32/vs10/cogl.vcxproj.filtersin       |   26 -
 build/win32/vs10/cogl.vcxprojin               |  148 -----
 build/win32/vs10/install.vcxproj              |    8 -
 build/win32/vs9/Makefile.am                   |    5 -
 build/win32/vs9/README.txt                    |    7 +-
 build/win32/vs9/clutter.sln                   |   29 -
 build/win32/vs9/clutter.vcprojin              |   16 +-
 build/win32/vs9/clutter.vsprops               |   71 +---
 build/win32/vs9/cogl-pango.vcprojin           |  131 -----
 build/win32/vs9/cogl.vcprojin                 |  138 -----
 clutter/cogl/cogl/cogl-defines.h.win32        |   39 --
 clutter/cogl/cogl/cogl.symbols                |  773 -------------------------
 clutter/cogl/pango/cogl-pango.symbols         |   12 -
 20 files changed, 29 insertions(+), 1713 deletions(-)
---
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 89ee554..5e6d9a0 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -15,16 +15,7 @@ EXTRA_DIST = \
 	clutter.vcxproj.filters		\
 	clutter.vcxproj.filtersin	\
 	clutter.props		\
-	cogl-pango.vcxproj	\
-	cogl-pango.vcxprojin	\
-	cogl-pango.vcxproj.filters	\
-	cogl-pango.vcxproj.filtersin	\
-	cogl.vcxproj		\
-	cogl.vcxprojin	\
-	cogl.vcxproj.filters		\
-	cogl.vcxproj.filtersin	\
 	install.vcxproj	\
-	Makefile.am		\
 	test-cogl-perf.vcxproj		\
 	test-cogl-perf.vcxproj.filters		\
 	test-conformance.vcxproj		\
diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt
index 9695c9e..4a0d53b 100644
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs10/README.txt
@@ -6,7 +6,7 @@ first need to use some Unix-like environment or manual work to expand
 the files needed, like config.h.win32.in into config.h.win32 and the
 .vcprojin files here into corresponding actual .vcproj files.
 
-You will need the parts from GNOME: JSON-GLib, GDK-Pixbuf,
+You will need the parts from GNOME: Cogl, JSON-GLib, GDK-Pixbuf,
 Pango**, atk (2.x)* and GLib. External dependencies are at least zlib, libpng,
 gettext-runtime** and Cairo**, and glext.h from
 http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder
@@ -24,8 +24,8 @@ packages that are not downloaded as binaries from ftp://ftp.gnome.org have
 makefiles and/or VS project files that can be used to compile with VS directly,
 except the optional PCRE, which is built on VS using CMake; GLib & ATK-2.x have
 VS10 project files in the latest stable versions, GDK-Pixbuf have VS10 project files
-in the latest unstable version, and JSON-GLib and Pango should have VS10 project files
-in the next unstable release):
+in the latest unstable version, and Cogl, JSON-GLib and Pango should have VS10 project
+files in the next unstable release):
 -Unzip the binary packages for gettext-runtime, freetype, expat and fontconfig
  downloaded from ftp://ftp.gnome.org**
 -zlib
@@ -41,6 +41,7 @@ in the next unstable release):
 -ATK-2.x*
 -GDK-Pixbuf
 -JSON-GLib
+-Cogl
  (Note that Pango, ATK-2.x, GDK-Pixbuf and JSON-GLib are not dependent on each
  other, so building them in any order will do)
 
diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props
index 2072562..6ed4b57 100644
--- a/build/win32/vs10/clutter.props
+++ b/build/win32/vs10/clutter.props
@@ -6,8 +6,6 @@
 	<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API</LibBuildDefines>
     <ClutterBuildDefines>CLUTTER_DISABLE_DEPRECATED;COGL_DISABLE_DEPRECATED;G_LOG_DOMAIN="Clutter";CLUTTER_PREFIX="../";CLUTTER_LIBDIR="../lib";CLUTTER_DATADIR="../share";CLUTTER_LOCALEDIR="../share/locale"</ClutterBuildDefines>
-    <CoglBuildDefines>G_LOG_DOMAIN="Cogl-win32";_WIN32_WINNT=0x0500</CoglBuildDefines>
-    <CoglPangoBuildDefines>G_LOG_DOMAIN="CoglPango";_WIN32_WINNT=0x0500</CoglPangoBuildDefines>
     <GTKModPfx>PREFIXDIR="/some/dummy/dir"</GTKModPfx>
     <TestDataDef>TESTS_DATADIR="../tests/data"</TestDataDef>
     <PreBuildCmd>
@@ -32,13 +30,6 @@ copy ..\..\..\clutter\clutter-version.h.win32 ..\..\..\clutter\clutter-version.h
 :DONE_CLUTTER_VERSION_H
 
 
-if exist ..\..\..\clutter\cogl\cogl\cogl-defines.h goto DONE_COGL_DEFINES_H
-
-copy ..\..\..\clutter\cogl\cogl\cogl-defines.h.win32 ..\..\..\clutter\cogl\cogl\cogl-defines.h
-
-:DONE_COGL_DEFINES_H
-
-
 if exist ..\..\..\clutter\clutter-enum-types.h goto DONE_CLUTTER_ENUM_H
 
 cd ..\..\..\clutter
@@ -61,28 +52,6 @@ cd ..\build\win32\vs10
 :DONE_CLUTTER_ENUM_C
 
 
-if exist ..\..\..\clutter\cogl\cogl\cogl-enum-types.h goto DONE_COGL_ENUMS_H
-
-cd ..\..\..\clutter\cogl\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-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-array.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-array.h ./cogl-vertex-array.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h &gt; cogl-enum-types.h
-
-cd ..\..\..\build\win32\vs10
-
-:DONE_COGL_ENUMS_H
-
-
-if exist ..\..\..\clutter\cogl\cogl\cogl-enum-types.c goto DONE_COGL_ENUMS_C
-
-cd ..\..\..\clutter\cogl\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-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-array.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-array.h ./cogl-vertex-array.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h &gt; cogl-enum-types.c
-
-cd ..\..\..\build\win32\vs10
-
-:DONE_COGL_ENUMS_C
-
-
 if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H
 
 cd ..\..\..\clutter
@@ -334,92 +303,10 @@ copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(Clutter
 copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
 
 
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\pango\cogl-pango.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl2-path.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl2-clip-state.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-attribute.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-bitmap.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-buffer.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-clip-state.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-clutter.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-color.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-context.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-defines.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-deprecated.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-display.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-enum-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-fixed.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-framebuffer.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-index-array.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-indices.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-material-compat.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-matrix.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-object.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-offscreen.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-onscreen-template.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-path.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-pipeline.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-pixel-array.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-primitive.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-primitives.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-renderer.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-shader.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-swap-chain.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-texture-3d.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-vector.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-vertex-array.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
-copy ..\..\..\clutter\cogl\cogl\cogl-vertex-buffer.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cogl
-
 </ClutterDoInstall>
     <GenerateClutterDef>
          echo EXPORTS &gt; ..\..\..\clutter\clutter.def
 
-         cl -EP ..\..\..\clutter\cogl\pango\cogl-pango.symbols &gt;&gt; ..\..\..\clutter\clutter.def
-
-         cl -EP -DCOGL_ENABLE_EXPERIMENTAL_API -D_COGL_SUPPORTS_GTYPE_INTEGRATION ..\..\..\clutter\cogl\cogl\cogl.symbols &gt;&gt; ..\..\..\clutter\clutter.def
-
          cl -EP -DHAVE_CAIRO -DHAVE_CLUTTER_WIN32 ..\..\..\clutter\clutter.symbols &gt;&gt; ..\..\..\clutter\clutter.def
 
      </GenerateClutterDef>
@@ -438,13 +325,13 @@ copy ..\..\..\clutter\cogl\cogl\cogl-vertex-buffer.h $(CopyDir)\include\clutter-
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;..\..\..\clutter\cogl;..\..\..\clutter\cogl\cogl;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;G_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <DisableSpecificWarnings>4819;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cogl-pango-2.0.lib;cogl-2.0.lib;glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -461,12 +348,6 @@ copy ..\..\..\clutter\cogl\cogl\cogl-vertex-buffer.h $(CopyDir)\include\clutter-
     <BuildMacro Include="ClutterBuildDefines">
       <Value>$(ClutterBuildDefines)</Value>
     </BuildMacro>
-    <BuildMacro Include="CoglBuildDefines">
-      <Value>$(CoglBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CoglPangoBuildDefines">
-      <Value>$(CoglPangoBuildDefines)</Value>
-    </BuildMacro>
     <BuildMacro Include="GTKModPfx">
       <Value>$(GTKModPfx)</Value>
     </BuildMacro>
diff --git a/build/win32/vs10/clutter.sln b/build/win32/vs10/clutter.sln
index 5d9767a..9be85e6 100644
--- a/build/win32/vs10/clutter.sln
+++ b/build/win32/vs10/clutter.sln
@@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clutter", "clutter.vcxproj", "{EA036190-0950-4640-84F9-D459A33B33A8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl", "cogl.vcxproj", "{F3A80987-5411-43DB-A23B-06F2076E1206}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-pango", "cogl-pango.vcxproj", "{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-picking", "test-picking.vcxproj", "{F433DB3C-1223-489A-AD0C-C64B09F51139}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-cogl-perf", "test-cogl-perf.vcxproj", "{0DA94D83-B64E-40AC-8074-96C2416BBBE8}"
@@ -49,22 +45,6 @@ Global
 		{EA036190-0950-4640-84F9-D459A33B33A8}.Release|Win32.Build.0 = Release|Win32
 		{EA036190-0950-4640-84F9-D459A33B33A8}.Release|x64.ActiveCfg = Release|x64
 		{EA036190-0950-4640-84F9-D459A33B33A8}.Release|x64.Build.0 = Release|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.Build.0 = Debug|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.ActiveCfg = Debug|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.Build.0 = Debug|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.ActiveCfg = Release|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.Build.0 = Release|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.ActiveCfg = Release|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.Build.0 = Release|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.Build.0 = Debug|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.ActiveCfg = Debug|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.Build.0 = Debug|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.ActiveCfg = Release|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.Build.0 = Release|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.ActiveCfg = Release|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.Build.0 = Release|x64
 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|Win32.Build.0 = Debug|Win32
 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/build/win32/vs10/clutter.vcxprojin b/build/win32/vs10/clutter.vcxprojin
index fd00556..38e33ed 100644
--- a/build/win32/vs10/clutter.vcxprojin
+++ b/build/win32/vs10/clutter.vcxprojin
@@ -74,7 +74,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cogl\pango;..\..\..\clutter\win32;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -88,7 +88,7 @@
       <Command>$(GenerateClutterDef)</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;gdk_pixbuf-2.0.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\clutter\clutter.def</ModuleDefinitionFile>
       <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib</ImportLibrary>
@@ -103,7 +103,7 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cogl\pango;..\..\..\clutter\win32;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -117,7 +117,7 @@
       <Command>$(GenerateClutterDef)</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;gdk_pixbuf-2.0.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\clutter\clutter.def</ModuleDefinitionFile>
       <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib</ImportLibrary>
@@ -133,7 +133,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cogl\pango;..\..\..\clutter\win32;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(LibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -146,7 +146,7 @@
       <Command>$(GenerateClutterDef)</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;gdk_pixbuf-2.0.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\clutter\clutter.def</ModuleDefinitionFile>
       <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib</ImportLibrary>
@@ -159,7 +159,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cogl\pango;..\..\..\clutter\win32;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(LibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -171,7 +171,7 @@
       <Command>$(GenerateClutterDef)</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;gdk_pixbuf-2.0.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\clutter\clutter.def</ModuleDefinitionFile>
       <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib</ImportLibrary>
@@ -188,16 +188,6 @@
   <ItemGroup>
     <ResourceCompile Include="..\..\..\clutter\win32\resources.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cogl-pango.vcxproj">
-      <Project>{fe5abd0f-91e8-4aa5-9c1c-408427d5f768}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cogl.vcxproj">
-      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index 2450358..698fd96 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -115,14 +115,6 @@
       <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="cogl-pango.vcxproj">
-      <Project>{fe5abd0f-91e8-4aa5-9c1c-408427d5f768}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cogl.vcxproj">
-      <Project>{f3a80987-5411-43db-a23b-06f2076e1206}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="test-cogl-perf.vcxproj">
       <Project>{0da94d83-b64e-40ac-8074-96c2416bbbe8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index f148042..da1cf16 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -8,12 +8,7 @@ EXTRA_DIST = \
 	clutter.vcproj		\
 	clutter.vcprojin	\
 	clutter.vsprops		\
-	cogl-pango.vcproj	\
-	cogl-pango.vcprojin	\
-	cogl.vcproj		\
-	cogl.vcprojin	\
 	install.vcproj	\
-	Makefile.am		\
 	test-cogl-perf.vcproj		\
 	test-conformance.vcproj		\
 	test-conformance.vcprojin	\
diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
index e312a0e..89cdbb0 100644
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -6,7 +6,7 @@ first need to use some Unix-like environment or manual work to expand
 the files needed, like config.h.win32.in into config.h.win32 and the
 .vcprojin files here into corresponding actual .vcproj files.
 
-You will need the parts from GNOME: JSON-GLib, GDK-Pixbuf,
+You will need the parts from GNOME: Cogl, JSON-GLib, GDK-Pixbuf,
 Pango**, atk (2.x)* and GLib. External dependencies are at least zlib, libpng,
 gettext-runtime** and Cairo**, and glext.h from
 http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder
@@ -24,8 +24,8 @@ packages that are not downloaded as binaries from ftp://ftp.gnome.org have
 makefiles and/or VS project files that can be used to compile with VS directly,
 except the optional PCRE, which is built on VS using CMake; GLib & ATK-2.x have
 VS9 project files in the latest stable versions, GDK-Pixbuf have VS9 project files
-in the latest unstable version, and JSON-GLib and Pango should have VS9 project files
-in the next unstable release):
+in the latest unstable version, and JSON-GLib, Pango and Cogl should have VS9
+project files in the next unstable release):
 -Unzip the binary packages for gettext-runtime, freetype, expat and fontconfig
  downloaded from ftp://ftp.gnome.org**
 -zlib
@@ -41,6 +41,7 @@ in the next unstable release):
 -ATK-2.x*
 -GDK-Pixbuf
 -JSON-GLib
+-Cogl
  (Note that Pango, ATK-2.x, GDK-Pixbuf and JSON-GLib are not dependent on each
  other, so building them in any order will do)
 
diff --git a/build/win32/vs9/clutter.sln b/build/win32/vs9/clutter.sln
index 6fafdb9..ff3f21b 100644
--- a/build/win32/vs9/clutter.sln
+++ b/build/win32/vs9/clutter.sln
@@ -2,17 +2,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clutter", "clutter.vcproj", "{EA036190-0950-4640-84F9-D459A33B33A8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
-		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl", "cogl.vcproj", "{F3A80987-5411-43DB-A23B-06F2076E1206}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-pango", "cogl-pango.vcproj", "{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-picking", "test-picking.vcproj", "{F433DB3C-1223-489A-AD0C-C64B09F51139}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -77,13 +66,11 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}"
 	ProjectSection(ProjectDependencies) = postProject
 		{27BA2900-A28A-4869-B16D-FBE581A12402} = {27BA2900-A28A-4869-B16D-FBE581A12402}
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
 		{F433DB3C-1223-489A-AD0C-C64B09F51139} = {F433DB3C-1223-489A-AD0C-C64B09F51139}
 		{B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC} = {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC}
 		{F072974F-6675-4A79-96FF-0B0DEB113AA4} = {F072974F-6675-4A79-96FF-0B0DEB113AA4}
 		{B8849C58-6773-453C-A2E5-00F02EE20B18} = {B8849C58-6773-453C-A2E5-00F02EE20B18}
 		{0DA94D83-B64E-40AC-8074-96C2416BBBE8} = {0DA94D83-B64E-40AC-8074-96C2416BBBE8}
-		{F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206}
 		{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
 		{2D1AD595-270B-4B38-9475-A269E225C10C} = {2D1AD595-270B-4B38-9475-A269E225C10C}
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D} = {E77D40D0-19D4-4865-BE20-B6DA05BA234D}
@@ -109,22 +96,6 @@ Global
 		{EA036190-0950-4640-84F9-D459A33B33A8}.Debug|x64.Build.0 = Debug|x64
 		{EA036190-0950-4640-84F9-D459A33B33A8}.Release|x64.ActiveCfg = Release|x64
 		{EA036190-0950-4640-84F9-D459A33B33A8}.Release|x64.Build.0 = Release|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.Build.0 = Debug|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.ActiveCfg = Release|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.Build.0 = Release|Win32
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.ActiveCfg = Debug|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.Build.0 = Debug|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.ActiveCfg = Release|x64
-		{F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.Build.0 = Release|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.Build.0 = Debug|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.ActiveCfg = Release|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.Build.0 = Release|Win32
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.ActiveCfg = Debug|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.Build.0 = Debug|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.ActiveCfg = Release|x64
-		{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.Build.0 = Release|x64
 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Debug|Win32.Build.0 = Debug|Win32
 		{F433DB3C-1223-489A-AD0C-C64B09F51139}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/build/win32/vs9/clutter.vcprojin b/build/win32/vs9/clutter.vcprojin
index 2f694be..513b727 100644
--- a/build/win32/vs9/clutter.vcprojin
+++ b/build/win32/vs9/clutter.vcprojin
@@ -32,7 +32,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cogl\pango;..\..\..\clutter\win32;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\cally"
 				PreprocessorDefinitions="_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(ClutterBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -47,7 +47,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib winmm.lib intl.lib gdk_pixbuf-2.0.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="..\..\..\clutter\clutter.def"
@@ -70,7 +70,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cogl\pango;..\..\..\clutter\win32;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\cally"
 				PreprocessorDefinitions="_DEBUG;CLUTTER_ENABLE_DEBUG;$(LibBuildDefines);$(ClutterBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -85,7 +85,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib winmm.lib intl.lib gdk_pixbuf-2.0.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="..\..\..\clutter\clutter.def"
@@ -110,7 +110,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cogl\pango;..\..\..\clutter\win32;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\cally"
 				PreprocessorDefinitions="$(LibBuildDefines);$(ClutterBuildDefines)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -124,7 +124,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib winmm.lib intl.lib gdk_pixbuf-2.0.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="..\..\..\clutter\clutter.def"
@@ -147,7 +147,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cogl\pango;..\..\..\clutter\win32;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\cally"
 				PreprocessorDefinitions="$(LibBuildDefines);$(ClutterBuildDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -160,7 +160,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib winmm.lib intl.lib gdk_pixbuf-2.0.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="..\..\..\clutter\clutter.def"
diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops
index e3303db..5972d28 100644
--- a/build/win32/vs9/clutter.vsprops
+++ b/build/win32/vs9/clutter.vsprops
@@ -8,14 +8,14 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;..\..\..\clutter\cogl;..\..\..\clutter\cogl\cogl;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
+		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;;$(GlibEtcInstallRoot)\include\cogl-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
 		PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES;G_DISABLE_DEPRECATED"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 		DisableSpecificWarnings="4819"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+		AdditionalDependencies="cogl-pango-2.0.lib cogl-2.0.lib glib-2.0.lib gobject-2.0.lib"
 		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
 	/>
 	<UserMacro
@@ -35,14 +35,6 @@
 		Value="CLUTTER_DISABLE_DEPRECATED;COGL_DISABLE_DEPRECATED;G_LOG_DOMAIN=\&quot;Clutter\&quot;;CLUTTER_PREFIX=\&quot;../\&quot;;CLUTTER_LIBDIR=\&quot;../lib\&quot;;CLUTTER_DATADIR=\&quot;../share\&quot;;CLUTTER_LOCALEDIR=\&quot;../share/locale\&quot;"
 	/>
 	<UserMacro
-		Name="CoglBuildDefines"
-		Value="G_LOG_DOMAIN=\&quot;Cogl-win32\&quot;;_WIN32_WINNT=0x0500"
-	/>
-	<UserMacro
-		Name="CoglPangoBuildDefines"
-		Value="G_LOG_DOMAIN=\&quot;CoglPango\&quot;;_WIN32_WINNT=0x0500"
-	/>
-	<UserMacro
 		Name="GTKModPfx"
 		Value="PREFIXDIR=\&quot;/some/dummy/dir\&quot;"
 	/>
@@ -65,10 +57,6 @@ if exist ..\..\..\clutter\clutter-version.h goto DONE_CLUTTER_VERSION_H&#x0D;&#x
 copy ..\..\..\clutter\clutter-version.h.win32 ..\..\..\clutter\clutter-version.h&#x0D;&#x0A;
 :DONE_CLUTTER_VERSION_H&#x0D;&#x0A;
 
-if exist ..\..\..\clutter\cogl\cogl\cogl-defines.h goto DONE_COGL_DEFINES_H&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-defines.h.win32 ..\..\..\clutter\cogl\cogl\cogl-defines.h&#x0D;&#x0A;
-:DONE_COGL_DEFINES_H&#x0D;&#x0A;
-
 if exist ..\..\..\clutter\clutter-enum-types.h goto DONE_CLUTTER_ENUM_H&#x0D;&#x0A;
 cd ..\..\..\clutter&#x0D;&#x0A;
 perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.h.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-behaviour.h ./clutter-behaviour-depth.h ./clutter-behaviour-ellipse.h ./clutter-behaviour-opacity.h ./clutter-behaviour-path.h ./clutter-behaviour-rotate.h ./clutter-behaviour-scale.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h	 ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-deprecated.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-effect.h ./clutter-event.h ./clutte
 r-feature.h ./clutter-fixed.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-frame-source.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-keysyms-compat.h ./clutter-layout-manager.h ./clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-score.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-timeout-pool.h ./clutter-types.h ./clutter-units.h ./clutter-util.h ./win32/clutter-win32.h &gt; clutter-enum-types.h&#x0D;&#x0A;
@@ -81,18 +69,6 @@ perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.c.in .
 cd ..\build\win32\vs9&#x0D;&#x0A;
 :DONE_CLUTTER_ENUM_C&#x0D;&#x0A;
 
-if exist ..\..\..\clutter\cogl\cogl\cogl-enum-types.h goto DONE_COGL_ENUMS_H&#x0D;&#x0A;
-cd ..\..\..\clutter\cogl\cogl&#x0D;&#x0A;
-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-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-array.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-array.h ./cogl-vertex-array.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h &gt; cogl-enum-types.h&#x0D;&#x0A;
-cd ..\..\..\build\win32\vs9&#x0D;&#x0A;
-:DONE_COGL_ENUMS_H&#x0D;&#x0A;
-
-if exist ..\..\..\clutter\cogl\cogl\cogl-enum-types.c goto DONE_COGL_ENUMS_C&#x0D;&#x0A;
-cd ..\..\..\clutter\cogl\cogl&#x0D;&#x0A;
-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-material-compat.h ./cogl-pipeline.h ./cogl-vector.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-array.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-array.h ./cogl-vertex-array.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h &gt; cogl-enum-types.c&#x0D;&#x0A;
-cd ..\..\..\build\win32\vs9&#x0D;&#x0A;
-:DONE_COGL_ENUMS_C&#x0D;&#x0A;
-
 if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H&#x0D;&#x0A;
 cd ..\..\..\clutter&#x0D;&#x0A;
 $(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --header clutter-marshal.list &gt; clutter-marshal.h&#x0D;&#x0A;
@@ -124,7 +100,7 @@ copy ..\..\..\tests\data\*.json $(OutDir)\tests\data&#x0D;&#x0A;
 mkdir $(OutDir)\lib&#x0D;&#x0A;
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
 
-mkdir $(OutDir)\include\clutter-1.0\clutter&#x0D;&#x0A;
+mkdir $(OutDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
 
 copy ..\..\..\clutter\clutter.h $(OutDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
 copy ..\..\..\clutter\clutter-action.h $(OutDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
@@ -226,53 +202,12 @@ copy ..\..\..\clutter\cally\cally-text.h $(OutDir)\include\clutter-$(ClutterApiV
 copy ..\..\..\clutter\cally\cally-texture.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
 copy ..\..\..\clutter\cally\cally-util.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
 
-mkdir $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\pango\cogl-pango.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl2-path.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl2-clip-state.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-attribute.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-bitmap.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-buffer.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-color.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-clip-state.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-clutter.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-context.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-defines.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-deprecated.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-display.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-enum-types.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-fixed.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-framebuffer.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-index-array.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-indices.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-material-compat.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-matrix.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-object.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-offscreen.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-onscreen-template.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-path.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-pipeline.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-pixel-array.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-primitive.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-primitives.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-renderer.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-shader.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-swap-chain.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-texture.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-texture-3d.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-types.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-vector.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-vertex-array.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\clutter\cogl\cogl\cogl-vertex-buffer.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cogl&#x0D;&#x0A;
 "
 	/>
 	<UserMacro
 		Name="GenerateClutterDef"
 		Value="
 		       echo EXPORTS &gt; ..\..\..\clutter\clutter.def&#x0D;&#x0A;
-			   cl -EP ..\..\..\clutter\cogl\pango\cogl-pango.symbols &gt;&gt; ..\..\..\clutter\clutter.def&#x0D;&#x0A;
-		       cl -EP -DCOGL_ENABLE_EXPERIMENTAL_API -D_COGL_SUPPORTS_GTYPE_INTEGRATION ..\..\..\clutter\cogl\cogl\cogl.symbols &gt;&gt; ..\..\..\clutter\clutter.def&#x0D;&#x0A;
 			   cl -EP -DHAVE_CAIRO -DHAVE_CLUTTER_WIN32 ..\..\..\clutter\clutter.symbols &gt;&gt; ..\..\..\clutter\clutter.def&#x0D;&#x0A;
 			  "
 	/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]