[clutter] Clean up Visual Studio Build Files
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] Clean up Visual Studio Build Files
- Date: Thu, 29 Aug 2013 09:35:24 +0000 (UTC)
commit e2f9841818922d5ef5f69b349c06890e7e07177a
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Aug 29 17:35:13 2013 +0800
Clean up Visual Studio Build Files
-Combine entries in the property sheets and make it a bit more flexible,
and drop some redundant items
-Use Custom Build Rules for generating enumeration and marshalling sources,
and the .def file so that they can be wiped off when a "clean" is
requested, and regenerate automatically when the templates/.symbols
files are updated.
-Improve consistency by using ApiVersion rather than ClutterApiVersion
with the Visual Studio project for other components of the Clutter/GTK+
stack
-Get rid of unneeded configs in the "install" project
build/win32/vs10/clutter.props | 428 +++++++++++++---------------
build/win32/vs10/clutter.sln | 16 +-
build/win32/vs10/clutter.vcxproj.filtersin | 5 +
build/win32/vs10/clutter.vcxprojin | 136 +++++++---
build/win32/vs10/install.vcxproj | 84 +-----
build/win32/vs9/clutter.sln | 16 +-
build/win32/vs9/clutter.vcprojin | 230 ++++++++++++++-
build/win32/vs9/clutter.vsprops | 398 ++++++++++++--------------
build/win32/vs9/install.vcproj | 60 +----
9 files changed, 726 insertions(+), 647 deletions(-)
---
diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props
index dee9559..3bf3d89 100644
--- a/build/win32/vs10/clutter.props
+++ b/build/win32/vs10/clutter.props
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup Label="UserMacros">
- <GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
- <GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>
- <GlibGenMarshalPath>..\..\vs10\$(Platform)</GlibGenMarshalPath>
- <ClutterApiVersion>1.0</ClutterApiVersion>
+ <VSVer>10</VSVer>
+ <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <ApiVersion>1.0</ApiVersion>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
<BaseWinBuildDef>_WIN32_WINNT=0x0500</BaseWinBuildDef>
@@ -15,50 +14,38 @@
<ClutterBuildDefines>$(BaseBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_LOCALEDIR="../share/locale";CLUTTER_SYSCONFDIR="../etc"</ClutterBuildDefines>
<ClutterDisableDeprecationWarnings>CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS</ClutterDisableDeprecationWarnings>
<CallyTestDefs>$(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir";$(ClutterDisableDeprecationWarnings)</CallyTestDefs>
- <TestProgDef>$(BaseBuildDef);TESTS_DATADIR="../share/clutter-$(ClutterApiVersion)/data"</TestProgDef>
-
<TestPerfProgDef>$(BaseBuildDef);TESTS_DATA_DIR="../share/clutter-$(ClutterApiVersion)/data";$(ClutterDisableDeprecationWarnings)</TestPerfProgDef>
- <PreBuildWin>
+ <TestProgDef>$(BaseBuildDef);TESTS_DATADIR="../share/clutter-$(ApiVersion)/data"</TestProgDef>
+
<TestPerfProgDef>$(BaseBuildDef);TESTS_DATA_DIR="../share/clutter-$(ApiVersion)/data";$(ClutterDisableDeprecationWarnings)</TestPerfProgDef>
+ <DoConfigs>
if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H
-
-copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h
-
-:DONE_CONFIG_H
-
-if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H
-
-del clutter.bld.*.win32
-
-copy ..\..\..\clutter\clutter-config.h.win32 clutter.bld.win32.win32
-
-copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h
-
-:DONE_CLUTTER_CONFIG_H
- </PreBuildWin>
- <PreBuildGDK>
-if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H
-
copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h
:DONE_CONFIG_H
+if "$(Configuration)" == "Release" goto DO_CLUTTER_CONFIG_WIN32
+if "$(Configuration)" == "Debug" goto DO_CLUTTER_CONFIG_WIN32
if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H
-
-del clutter.bld.*.win32
-
+if exist clutter.bld.*.win32 del clutter.bld.*.win32
copy ..\..\..\clutter\clutter-config.h.win32_GDK clutter.bld.GDK.win32
-
copy ..\..\..\clutter\clutter-config.h.win32_GDK ..\..\..\clutter\clutter-config.h
+goto DONE_CLUTTER_CONFIG_H
+
+:DO_CLUTTER_CONFIG_WIN32
+if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H
+if exist clutter.bld.*.win32 del clutter.bld.*.win32
+copy ..\..\..\clutter\clutter-config.h.win32 clutter.bld.win32.win32
+copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h
:DONE_CLUTTER_CONFIG_H
- </PreBuildGDK>
- <PreBuildCmd2>
+ </DoConfigs>
+ <GenMarshalSrc>
if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H
cd ..\..\..\clutter
-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --header clutter-marshal.list >
clutter-marshal.h
+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --header clutter-marshal.list >
clutter-marshal.h
-cd ..\build\win32\vs10
+cd ..\build\win32\vs$(VSVer)
:DONE_CLUTTER_MARSHAL_H
@@ -69,26 +56,25 @@ cd ..\..\..\clutter
echo #include "clutter-marshal.h" > clutter-marshal.c
-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --body clutter-marshal.list >>
clutter-marshal.c
+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --body clutter-marshal.list >>
clutter-marshal.c
-cd ..\build\win32\vs10
+cd ..\build\win32\vs$(VSVer)
:DONE_CLUTTER_MARSHAL_C
+</GenMarshalSrc>
-
+<GenEnumsSrc>
cd ..
+call gen-enums.bat $(GlibEtcInstallRoot)
+cd .\vs$(VSVer)
+</GenEnumsSrc>
-gen-enums.bat $(GlibMkEnumsPath)
-
-cd .\vs10
-
-</PreBuildCmd2>
<ClutterDoInstall>
mkdir $(CopyDir)
mkdir $(CopyDir)\bin
-mkdir $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
+mkdir $(CopyDir)\share\clutter-$(ApiVersion)\data
copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
@@ -97,324 +83,307 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
copy ..\*.bat $(CopyDir)\bin
-copy ..\..\..\tests\data\*.png $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
+copy ..\..\..\tests\data\*.png $(CopyDir)\share\clutter-$(ApiVersion)\data
-copy ..\..\..\tests\data\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
+copy ..\..\..\tests\data\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ApiVersion)\data
-copy ..\..\..\tests\data\*.json $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
+copy ..\..\..\tests\data\*.json $(CopyDir)\share\clutter-$(ApiVersion)\data
mkdir $(CopyDir)\lib
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib
-
-
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32
-
-
-copy ..\..\..\clutter\clutter.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
-copy ..\..\..\clutter\clutter-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-copy ..\..\..\clutter\clutter-actor-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32
-copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+if exist clutter.bld.win32.win32 goto DO_INSTALL_COMMON_HEADERS
-copy ..\..\..\clutter\clutter-align-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk
+copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk
-copy ..\..\..\clutter\clutter-animatable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-copy ..\..\..\clutter\clutter-backend.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+:DO_INSTALL_COMMON_HEADERS
-copy ..\..\..\clutter\clutter-bind-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-binding-pool.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-actor-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-blur-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-box-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-align-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-brightness-contrast-effect.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-animatable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-cairo.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-backend.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-canvas.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-bind-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-child-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-binding-pool.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-click-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-clone.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-blur-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-cogl-compat.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-box-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-color-static.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-brightness-contrast-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-color.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-cairo.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-colorize-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-canvas.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-config.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-child-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-click-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-content.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-container.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-cogl-compat.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-deform-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-color-static.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-deprecated.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-color.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-desaturate-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-colorize-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-device-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-config.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-drag-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-drop-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-content.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-container.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-enums.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-deform-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-enum-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-deprecated.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-event.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-desaturate-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-feature.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-device-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-fixed-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-drag-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-flow-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-drop-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-gesture-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-grid-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-enums.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-enum-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-image.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-event.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-input-device.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-feature.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-interval.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-fixed-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-keyframe-transition.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-flow-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-keysyms.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-gesture-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-layout-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-grid-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-layout-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-list-model.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-image.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-macros.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-input-device.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-interval.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-keyframe-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-model.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-keysyms.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-offscreen-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-layout-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-page-turn-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-layout-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-paint-node.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-list-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-paint-nodes.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-macros.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-pan-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-path-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-property-transition.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-offscreen-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-rotate-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-page-turn-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-script.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-paint-node.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-scriptable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-paint-nodes.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-scroll-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-pan-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-settings.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-path-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-shader-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-shader-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-property-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-snap-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-rotate-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-script.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-scriptable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-scroll-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-swipe-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-settings.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-table-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-shader-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-tap-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-shader-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-snap-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-text.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-text-buffer.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-transition.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-swipe-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-transition-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-table-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-tap-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-units.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-version.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-text.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\clutter-zoom-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
+copy ..\..\..\clutter\clutter-text-buffer.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\win32\clutter-win32.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32
+copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+copy ..\..\..\clutter\clutter-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\clutter-transition-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\deprecated\clutter-actor.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\clutter-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\deprecated\clutter-alpha.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\clutter-units.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\deprecated\clutter-animatable.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\clutter-version.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\deprecated\clutter-animation.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\clutter-zoom-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
-copy ..\..\..\clutter\deprecated\clutter-animator.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\win32\clutter-win32.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32
-copy ..\..\..\clutter\deprecated\clutter-backend.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-behaviour.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-behaviour-depth.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-behaviour-ellipse.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-alpha.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-behaviour-opacity.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-animatable.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-behaviour-path.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-animation.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-animator.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-behaviour-scale.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-backend.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-bin-layout.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-behaviour.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-box.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-behaviour-depth.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-cairo-texture.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-behaviour-ellipse.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-container.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-behaviour-opacity.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-fixed.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-behaviour-path.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-frame-source.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-group.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-behaviour-scale.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-input-device.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-bin-layout.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-keysyms.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-box.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-main.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-cairo-texture.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-media.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-container.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-rectangle.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-fixed.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-score.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-frame-source.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-shader.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-stage.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-input-device.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-stage-manager.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-keysyms.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-state.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-main.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-texture.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-media.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-timeline.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-rectangle.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-timeout-pool.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-score.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\deprecated\clutter-util.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-shader.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
+copy ..\..\..\clutter\deprecated\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
+copy ..\..\..\clutter\deprecated\clutter-stage-manager.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\cally\cally-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
+copy ..\..\..\clutter\deprecated\clutter-state.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\cally\cally-clone.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
+copy ..\..\..\clutter\deprecated\clutter-texture.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\cally\cally-factory.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
+copy ..\..\..\clutter\deprecated\clutter-timeline.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\cally\cally-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
+copy ..\..\..\clutter\deprecated\clutter-timeout-pool.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\cally\cally.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
+copy ..\..\..\clutter\deprecated\clutter-util.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated
-copy ..\..\..\clutter\cally\cally-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-copy ..\..\..\clutter\cally\cally-rectangle.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\cally
-copy ..\..\..\clutter\cally\cally-root.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
+copy ..\..\..\clutter\cally\cally-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
-copy ..\..\..\clutter\cally\cally-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
+copy ..\..\..\clutter\cally\cally-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
-copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
+copy ..\..\..\clutter\cally\cally-factory.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
-copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
-
-
-</ClutterDoInstall>
-<ClutterDoInstallGDK>
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk
+copy ..\..\..\clutter\cally\cally-group.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
-copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk
-</ClutterDoInstallGDK>
-<ClutterDoInstallReleaseBin>
-mkdir $(CopyDir)\bin
+copy ..\..\..\clutter\cally\cally.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
-copy $(SolutionDir)Release\$(Platform)\bin\*.dll $(CopyDir)\bin
+copy ..\..\..\clutter\cally\cally-main.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
-copy $(SolutionDir)Release\$(Platform)\bin\*.exe $(CopyDir)\bin
+copy ..\..\..\clutter\cally\cally-rectangle.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
+copy ..\..\..\clutter\cally\cally-root.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
-mkdir $(CopyDir)\lib
+copy ..\..\..\clutter\cally\cally-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
-copy $(SolutionDir)Release\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib
-</ClutterDoInstallReleaseBin>
-<ClutterDoInstallDebugBin>
-mkdir $(CopyDir)\bin
+copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
-copy $(SolutionDir)Debug\$(Platform)\bin\*.dll $(CopyDir)\bin
+copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
-copy $(SolutionDir)Debug\$(Platform)\bin\*.exe $(CopyDir)\bin
+copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ApiVersion)\cally
-mkdir $(CopyDir)\lib
+</ClutterDoInstall>
+<ClutterDoInstallGDK>
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk
-copy $(SolutionDir)Debug\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib
-</ClutterDoInstallDebugBin>
+copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk
+</ClutterDoInstallGDK>
<GenerateClutterDef>
echo EXPORTS > $(DefDir)\clutter.def
@@ -428,11 +397,11 @@ copy $(SolutionDir)Debug\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\l
</GenerateClutterGDKDef>
<ClutterLibtoolCompatibleDllPrefix>lib</ClutterLibtoolCompatibleDllPrefix>
- <ClutterLibtoolCompatibleDllSuffix>-$(ClutterApiVersion)-0</ClutterLibtoolCompatibleDllSuffix>
- <ClutterSeparateVS10DllPrefix />
- <ClutterSeparateVS10DllSuffix>-1-vs10</ClutterSeparateVS10DllSuffix>
- <ClutterDllPrefix>$(ClutterSeparateVS10DllPrefix)</ClutterDllPrefix>
- <ClutterDllSuffix>$(ClutterSeparateVS10DllSuffix)</ClutterDllSuffix>
+ <ClutterLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</ClutterLibtoolCompatibleDllSuffix>
+ <ClutterSeparateVSDllPrefix />
+ <ClutterSeparateVSDllSuffix>-1-vs$(VSVer)</ClutterSeparateVSDllSuffix>
+ <ClutterDllPrefix>$(ClutterSeparateVSDllPrefix)</ClutterDllPrefix>
+ <ClutterDllSuffix>$(ClutterSeparateVSDllSuffix)</ClutterDllSuffix>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>clutterprops</_PropertySheetDisplayName>
@@ -452,6 +421,9 @@ copy $(SolutionDir)Debug\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\l
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <BuildMacro Include="VSVer">
+ <Value>$(VSVer)</Value>
+ </BuildMacro>
<BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibEtcInstallRoot)</Value>
</BuildMacro>
@@ -461,14 +433,8 @@ copy $(SolutionDir)Debug\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\l
<BuildMacro Include="DefDir">
<Value>$(DefDir)</Value>
</BuildMacro>
- <BuildMacro Include="GlibMkEnumsPath">
- <Value>$(GlibMkEnumsPath)</Value>
- </BuildMacro>
- <BuildMacro Include="GlibGenMarshalPath">
- <Value>$(GlibGenMarshalPath)</Value>
- </BuildMacro>
- <BuildMacro Include="ClutterApiVersion">
- <Value>$(ClutterApiVersion)</Value>
+ <BuildMacro Include="ApiVersion">
+ <Value>$(ApiVersion)</Value>
</BuildMacro>
<BuildMacro Include="BaseWinBuildDef">
<Value>$(BaseWinBuildDef)</Value>
@@ -500,14 +466,14 @@ copy $(SolutionDir)Debug\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\l
<BuildMacro Include="TestPerfProgDef">
<Value>$(TestPerfProgDef)</Value>
</BuildMacro>
- <BuildMacro Include="PreBuildGDK">
- <Value>$(PreBuildGDK)</Value>
+ <BuildMacro Include="DoConfigs">
+ <Value>$(DoConfigs)</Value>
</BuildMacro>
- <BuildMacro Include="PreBuildWin">
- <Value>$(PreBuildWin)</Value>
+ <BuildMacro Include="GenMarshalSrc">
+ <Value>$(GenMarshalSrc)</Value>
</BuildMacro>
- <BuildMacro Include="PreBuildCmd2">
- <Value>$(PreBuildCmd2)</Value>
+ <BuildMacro Include="GenEnumsSrc">
+ <Value>$(GenEnumsSrc)</Value>
</BuildMacro>
<BuildMacro Include="ClutterDoInstall">
<Value>$(ClutterDoInstall)</Value>
@@ -533,11 +499,11 @@ copy $(SolutionDir)Debug\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\l
<BuildMacro Include="ClutterLibtoolCompatibleDllSuffix">
<Value>$(ClutterLibtoolCompatibleDllSuffix)</Value>
</BuildMacro>
- <BuildMacro Include="ClutterSeparateVS10DllPrefix">
- <Value>$(ClutterSeparateVS10DllPrefix)</Value>
+ <BuildMacro Include="ClutterSeparateVSDllPrefix">
+ <Value>$(ClutterSeparateVSDllPrefix)</Value>
</BuildMacro>
- <BuildMacro Include="ClutterSeparateVS10DllSuffix">
- <Value>$(ClutterSeparateVS10DllSuffix)</Value>
+ <BuildMacro Include="ClutterSeparateVSDllSuffix">
+ <Value>$(ClutterSeparateVSDllSuffix)</Value>
</BuildMacro>
<BuildMacro Include="ClutterDllPrefix">
<Value>$(ClutterDllPrefix)</Value>
diff --git a/build/win32/vs10/clutter.sln b/build/win32/vs10/clutter.sln
index 1302d3a..23213b6 100644
--- a/build/win32/vs10/clutter.sln
+++ b/build/win32/vs10/clutter.sln
@@ -375,18 +375,18 @@ Global
{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|Win32.Build.0 = Release|Win32
{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|x64.ActiveCfg = Release|x64
{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|x64.Build.0 = Release|x64
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug_GDK|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug_GDK|x64
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug|Win32
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug|x64
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug|x64
{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.ActiveCfg = Debug|Win32
{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.Build.0 = Debug|Win32
{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.ActiveCfg = Debug|x64
{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release_GDK|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release_GDK|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release_GDK|x64
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release_GDK|x64
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release|Win32
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release|Win32
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release|x64
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release|x64
{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.ActiveCfg = Release|Win32
{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|Win32
{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64
diff --git a/build/win32/vs10/clutter.vcxproj.filtersin b/build/win32/vs10/clutter.vcxproj.filtersin
index bb25d10..c89755d 100644
--- a/build/win32/vs10/clutter.vcxproj.filtersin
+++ b/build/win32/vs10/clutter.vcxproj.filtersin
@@ -24,6 +24,11 @@
<ClCompile Include="..\..\..\clutter\cogl\clutter-stage-cogl.c"><Filter>Sources</Filter></ClCompile>
</ItemGroup>
<ItemGroup>
+ <CustomBuild Include="..\..\..\clutter\clutter-marshal.list"><Filter>Resource
Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\..\clutter\clutter-enum-types.h.in"><Filter>Resource
Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\..\clutter\clutter.symbols"><Filter>Resource Files</Filter></CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
<ResourceCompile Include="..\..\..\clutter\win32\resources.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
diff --git a/build/win32/vs10/clutter.vcxprojin b/build/win32/vs10/clutter.vcxprojin
index ecab540..48ebeae 100644
--- a/build/win32/vs10/clutter.vcxprojin
+++ b/build/win32/vs10/clutter.vcxprojin
@@ -126,7 +126,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+ <Command>$(DoConfigs)</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -140,14 +140,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateClutterDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -155,7 +152,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">
<PreBuildEvent>
- <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
+ <Command>$(DoConfigs)</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -169,14 +166,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateClutterGDKDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -184,7 +178,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+ <Command>$(DoConfigs)</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -198,14 +192,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateClutterDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
@@ -213,7 +204,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">
<PreBuildEvent>
- <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
+ <Command>$(DoConfigs)</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -227,14 +218,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateClutterGDKDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
@@ -242,7 +230,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+ <Command>$(DoConfigs)</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
@@ -256,14 +244,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateClutterDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -273,7 +258,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">
<PreBuildEvent>
- <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
+ <Command>$(DoConfigs)</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
@@ -287,14 +272,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateClutterGDKDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -304,7 +286,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+ <Command>$(DoConfigs)</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -315,14 +297,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateClutterDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -332,7 +311,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">
<PreBuildEvent>
- <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
+ <Command>$(DoConfigs)</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -343,14 +322,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateClutterGDKDef)</Command>
- </PreLinkEvent>
<Link>
<AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\clutter.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -398,6 +374,86 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <CustomBuild Include="..\..\..\clutter\clutter-marshal.list">
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">Generating Marshalling
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(GenMarshalSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Marshalling
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenMarshalSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">Generating Marshalling
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(GenMarshalSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Marshalling
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenMarshalSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">Generating Marshalling
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(GenMarshalSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Marshalling
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenMarshalSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">Generating Marshalling
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(GenMarshalSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Marshalling
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenMarshalSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs)</Outputs>
+ </CustomBuild>
+ <CustomBuild Include="..\..\..\clutter\clutter-enum-types.h.in">
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">Generating Enumeration
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(GenEnumsSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Enumeration
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenEnumsSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">Generating Enumeration
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(GenEnumsSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Enumeration
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenEnumsSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">Generating Enumeration
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(GenEnumsSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Enumeration
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenEnumsSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">Generating Enumeration
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(GenEnumsSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Enumeration
Sources...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenEnumsSrc)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+ </CustomBuild>
+ <CustomBuild Include="..\..\..\clutter\clutter.symbols">
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">Generating
clutter.def...</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(GenerateClutterGDKDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(IntDir)clutter.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating clutter.def...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateClutterDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)clutter.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">Generating
clutter.def...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(GenerateClutterGDKDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(IntDir)clutter.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating clutter.def...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateClutterDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)clutter.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">Generating
clutter.def...</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(GenerateClutterGDKDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(IntDir)clutter.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating
clutter.def...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateClutterDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)clutter.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">Generating
clutter.def...</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(GenerateClutterGDKDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(IntDir)clutter.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating clutter.def...</Message>
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateClutterDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)clutter.def;%(Outputs)</Outputs>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
<ResourceCompile Include="..\..\..\clutter\win32\resources.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index 30a906c..cc987c2 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -5,34 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Debug_GDK|Win32">
- <Configuration>Debug_GDK</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Debug_GDK|x64">
- <Configuration>Debug_GDK</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release_GDK|Win32">
- <Configuration>Release_GDK</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release_GDK|x64">
- <Configuration>Release_GDK</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{35B2A4AC-7235-4FC7-995D-469D59195041}</ProjectGuid>
@@ -44,37 +28,19 @@
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -82,87 +48,45 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="clutter.props" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="clutter.props" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="clutter.props" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="clutter.props" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="clutter.props" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="clutter.props" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="clutter.props" />
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="clutter.props" />
- </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(GlibEtcInstallRoot)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(GlibEtcInstallRoot)\</OutDir>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" />
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(GlibEtcInstallRoot)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(GlibEtcInstallRoot)\</OutDir>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PostBuildEvent>
- <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall)</Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">
- <PostBuildEvent>
- <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+ <Command>$(ClutterDoInstall)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall)</Command>
- </PreBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">
- <PreBuildEvent>
- <Command>$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+ <Command>$(ClutterDoInstall)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PostBuildEvent>
- <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)</Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">
- <PostBuildEvent>
- <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+ <Command>$(ClutterDoInstall)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)</Command>
- </PreBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">
- <PreBuildEvent>
- <Command>$(ClutterDoInstallReleaseBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)</Command>
+ <Command>$(ClutterDoInstall)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/build/win32/vs9/clutter.sln b/build/win32/vs9/clutter.sln
index 3b527ba..e1ac960 100644
--- a/build/win32/vs9/clutter.sln
+++ b/build/win32/vs9/clutter.sln
@@ -462,14 +462,14 @@ Global
{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64
{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64
{35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release|x64
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug_GDK|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug_GDK|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release_GDK|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release_GDK|Win32
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug_GDK|x64
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release_GDK|x64
- {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release_GDK|x64
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug|Win32
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release|Win32
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release|Win32
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug|x64
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug|x64
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release|x64
+ {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/win32/vs9/clutter.vcprojin b/build/win32/vs9/clutter.vcprojin
index 6366a57..ed2a893 100644
--- a/build/win32/vs9/clutter.vcprojin
+++ b/build/win32/vs9/clutter.vcprojin
@@ -27,7 +27,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+ CommandLine="$(DoConfigs)"
/>
<Tool
Name="VCCLCompilerTool"
@@ -51,7 +51,7 @@
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\clutter.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -66,7 +66,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+ CommandLine="$(DoConfigs)"
/>
<Tool
Name="VCCLCompilerTool"
@@ -90,7 +90,7 @@
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\clutter.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -104,7 +104,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+ CommandLine="$(DoConfigs)"
/>
<Tool
Name="VCCLCompilerTool"
@@ -128,7 +128,7 @@
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\clutter.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
@@ -143,7 +143,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+ CommandLine="$(DoConfigs)"
/>
<Tool
Name="VCCLCompilerTool"
@@ -167,7 +167,7 @@
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\clutter.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
@@ -182,7 +182,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+ CommandLine="$(DoConfigs)"
/>
<Tool
Name="VCCLCompilerTool"
@@ -206,7 +206,7 @@
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\clutter.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -224,7 +224,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+ CommandLine="$(DoConfigs)"
/>
<Tool
Name="VCCLCompilerTool"
@@ -248,7 +248,7 @@
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\clutter.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -264,7 +264,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+ CommandLine="$(DoConfigs)"
/>
<Tool
Name="VCCLCompilerTool"
@@ -285,7 +285,7 @@
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\clutter.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -302,7 +302,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+ CommandLine="$(DoConfigs)"
/>
<Tool
Name="VCCLCompilerTool"
@@ -323,7 +323,7 @@
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\clutter.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -386,6 +386,204 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
+ <File RelativePath="..\..\..\clutter\clutter-enum-types.h.in">
+ <FileConfiguration Name="Debug|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Enumeration Sources..."
+ CommandLine="$(GenEnumsSrc)"
+
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_GDK|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Enumeration Sources..."
+ CommandLine="$(GenEnumsSrc)"
+
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Enumeration Sources..."
+ CommandLine="$(GenEnumsSrc)"
+
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_GDK|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Enumeration Sources..."
+ CommandLine="$(GenEnumsSrc)"
+
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Enumeration Sources..."
+ CommandLine="$(GenEnumsSrc)"
+
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_GDK|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Enumeration Sources..."
+ CommandLine="$(GenEnumsSrc)"
+
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Enumeration Sources..."
+ CommandLine="$(GenEnumsSrc)"
+
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_GDK|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Enumeration Sources..."
+ CommandLine="$(GenEnumsSrc)"
+
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File RelativePath="..\..\..\clutter\clutter-marshal.list">
+ <FileConfiguration Name="Debug|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Marshalling Sources..."
+ CommandLine="$(GenMarshalSrc)"
+
Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_GDK|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Marshalling Sources..."
+ CommandLine="$(GenMarshalSrc)"
+
Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Marshalling Sources..."
+ CommandLine="$(GenMarshalSrc)"
+
Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_GDK|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Marshalling Sources..."
+ CommandLine="$(GenMarshalSrc)"
+
Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Marshalling Sources..."
+ CommandLine="$(GenMarshalSrc)"
+
Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_GDK|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Marshalling Sources..."
+ CommandLine="$(GenMarshalSrc)"
+
Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Marshalling Sources..."
+ CommandLine="$(GenMarshalSrc)"
+
Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_GDK|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating Marshalling Sources..."
+ CommandLine="$(GenMarshalSrc)"
+
Outputs="..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c"
+ />
+ </FileConfiguration>
+ </File>
+ <File RelativePath="..\..\..\clutter\clutter.symbols">
+ <FileConfiguration Name="Debug|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating clutter.def..."
+ CommandLine="$(GenerateClutterDef)"
+ Outputs="$(IntDir)\clutter.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_GDK|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating clutter.def..."
+ CommandLine="$(GenerateClutterGDKDef)"
+ Outputs="$(IntDir)\clutter.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating clutter.def..."
+ CommandLine="$(GenerateClutterDef)"
+ Outputs="$(IntDir)\clutter.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_GDK|Win32">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating clutter.def..."
+ CommandLine="$(GenerateClutterGDKDef)"
+ Outputs="$(IntDir)\clutter.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating clutter.def..."
+ CommandLine="$(GenerateClutterDef)"
+ Outputs="$(IntDir)\clutter.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_GDK|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating clutter.def..."
+ CommandLine="$(GenerateClutterGDKDef)"
+ Outputs="$(IntDir)\clutter.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating clutter.def..."
+ CommandLine="$(GenerateClutterDef)"
+ Outputs="$(IntDir)\clutter.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_GDK|x64">
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Generating clutter.def..."
+ CommandLine="$(GenerateClutterGDKDef)"
+ Outputs="$(IntDir)\clutter.def"
+ />
+ </FileConfiguration>
+ </File>
<File RelativePath="..\..\..\clutter\win32\resources.rc" />
</Filter>
</Files>
diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops
index 7aaf7ae..2b35c75 100644
--- a/build/win32/vs9/clutter.vsprops
+++ b/build/win32/vs9/clutter.vsprops
@@ -18,8 +18,12 @@
AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
/>
<UserMacro
+ Name="VSVer"
+ Value="9"
+ />
+ <UserMacro
Name="GlibEtcInstallRoot"
- Value="..\..\..\..\vs9\$(PlatformName)"
+ Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
@@ -30,15 +34,7 @@
Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
/>
<UserMacro
- Name="GlibMkEnumsPath"
- Value="..\..\..\vs9\$(PlatformName)"
- />
- <UserMacro
- Name="GlibGenMarshalPath"
- Value="..\..\vs9\$(PlatformName)"
- />
- <UserMacro
- Name="ClutterApiVersion"
+ Name="ApiVersion"
Value="1.0"
/>
<UserMacro
@@ -75,57 +71,60 @@
/>
<UserMacro
Name="TestProgDef"
- Value="$(BaseBuildDef);TESTS_DATADIR=\"../share/clutter-$(ClutterApiVersion)/data\""
+ Value="$(BaseBuildDef);TESTS_DATADIR=\"../share/clutter-$(ApiVersion)/data\""
/>
<UserMacro
Name="TestPerfProgDef"
-
Value="$(BaseBuildDef);TESTS_DATA_DIR=\"../share/clutter-$(ClutterApiVersion)/data\";$(ClutterDisableDeprecationWarnings)"
+
Value="$(BaseBuildDef);TESTS_DATA_DIR=\"../share/clutter-$(ApiVersion)/data\";$(ClutterDisableDeprecationWarnings)"
/>
<UserMacro
- Name="PreBuildWin"
- Value="
-if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H

-copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h

-:DONE_CONFIG_H

-if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H

-del clutter.bld.*.win32

-copy ..\..\..\clutter\clutter-config.h.win32 clutter.bld.win32.win32

-copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h

-:DONE_CLUTTER_CONFIG_H

- "
- />
- <UserMacro
- Name="PreBuildGDK"
+ Name="DoConfigs"
Value="
if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H

copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h

+
:DONE_CONFIG_H

+if "$(ConfigurationName)" == "Release" goto DO_CLUTTER_CONFIG_WIN32

+if "$(ConfigurationName)" == "Debug" goto DO_CLUTTER_CONFIG_WIN32

+
if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H

-del clutter.bld.*.win32

+if exist clutter.bld.*.win32 del clutter.bld.*.win32

copy ..\..\..\clutter\clutter-config.h.win32_GDK clutter.bld.GDK.win32

copy ..\..\..\clutter\clutter-config.h.win32_GDK ..\..\..\clutter\clutter-config.h

+goto DONE_CLUTTER_CONFIG_H

+
+:DO_CLUTTER_CONFIG_WIN32

+if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H

+if exist clutter.bld.*.win32 del clutter.bld.*.win32

+copy ..\..\..\clutter\clutter-config.h.win32 clutter.bld.win32.win32

+copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h

+
:DONE_CLUTTER_CONFIG_H

"
/>
<UserMacro
- Name="PreBuildCmd2"
+ Name="GenMarshalSrc"
Value="
if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H

cd ..\..\..\clutter

-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --header clutter-marshal.list >
clutter-marshal.h

-cd ..\build\win32\vs9

+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --header clutter-marshal.list >
clutter-marshal.h

+cd ..\build\win32\vs$(VSVer)

:DONE_CLUTTER_MARSHAL_H

if exist ..\..\..\clutter\clutter-marshal.c goto DONE_CLUTTER_MARSHAL_C

cd ..\..\..\clutter

echo #include "clutter-marshal.h" > clutter-marshal.c

-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --body clutter-marshal.list >>
clutter-marshal.c

-cd ..\build\win32\vs9

+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --body clutter-marshal.list >>
clutter-marshal.c

+cd ..\build\win32\vs$(VSVer)

:DONE_CLUTTER_MARSHAL_C

-
+ "
+ />
+ <UserMacro
+ Name="GenEnumsSrc"
+ Value="
cd ..

-gen-enums.bat $(GlibMkEnumsPath)

-cd .\vs9

+call gen-enums.bat $(GlibEtcInstallRoot)

+cd .\vs$(VSVer)

"
/>
<UserMacro
@@ -133,190 +132,173 @@ cd .\vs9

Value="
mkdir $(CopyDir)

mkdir $(CopyDir)\bin

-mkdir $(CopyDir)\share\clutter-$(ClutterApiVersion)\data

+mkdir $(CopyDir)\share\clutter-$(ApiVersion)\data

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin

copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin

copy ..\*.bat $(CopyDir)\bin

-copy ..\..\..\tests\data\*.png $(CopyDir)\share\clutter-$(ClutterApiVersion)\data

-copy ..\..\..\tests\data\clutter-1.0.suppressions
$(CopyDir)\share\clutter-$(ClutterApiVersion)\data

-copy ..\..\..\tests\data\*.json $(CopyDir)\share\clutter-$(ClutterApiVersion)\data

+copy ..\..\..\tests\data\*.png $(CopyDir)\share\clutter-$(ApiVersion)\data

+copy ..\..\..\tests\data\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ApiVersion)\data

+copy ..\..\..\tests\data\*.json $(CopyDir)\share\clutter-$(ApiVersion)\data

mkdir $(CopyDir)\lib

-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ClutterApiVersion).lib
$(CopyDir)\lib

+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib

-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32

+if exist clutter.bld.win32.win32 goto DO_INSTALL_COMMON_HEADERS

-copy ..\..\..\clutter\clutter.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-actor-meta.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-align-constraint.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-animatable.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-backend.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-bind-constraint.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-binding-pool.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-bin-layout.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-blur-effect.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-box-layout.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-brightness-contrast-effect.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-cairo.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-canvas.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-child-meta.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-click-action.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-clone.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-cogl-compat.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-color-static.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-color.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-colorize-effect.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-config.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-constraint.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-content.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-container.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-deform-effect.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-deprecated.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-desaturate-effect.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-device-manager.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-drag-action.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-drop-action.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-enums.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-enum-types.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-event.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-feature.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-fixed-layout.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-flow-layout.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-gesture-action.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-grid-layout.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-image.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-input-device.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-interval.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-layout-manager.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-layout-meta.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-list-model.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-keyframe-transition.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-keysyms.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-macros.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-model.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-offscreen-effect.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-page-turn-effect.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-paint-node.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-paint-nodes.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-pan-action.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-path-constraint.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-property-transition.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-rotate-action.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-script.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-scriptable.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-scroll-actor.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-settings.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-shader-effect.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-shader-types.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-snap-constraint.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-stage-manager.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-stage-window.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-swipe-action.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-table-layout.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-tap-action.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-text.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-text-buffer.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-transition.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-transition-group.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-units.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-version.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\clutter-zoom-action.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter

-copy ..\..\..\clutter\win32\clutter-win32.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32

+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk

+copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk

-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-actor.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-alpha.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-animatable.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-animation.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-animator.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-backend.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-behaviour.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-behaviour-depth.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-behaviour-ellipse.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-behaviour-opacity.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-behaviour-path.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-behaviour-scale.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-bin-layout.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-box.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-cairo-texture.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-container.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-fixed.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-frame-source.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-group.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-input-device.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-keysyms.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-main.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-media.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-rectangle.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-score.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-shader.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-stage.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-stage-manager.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-state.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-texture.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-timeline.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-timeout-pool.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

-copy ..\..\..\clutter\deprecated\clutter-util.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated

+:DO_INSTALL_COMMON_HEADERS

-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally-clone.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally-factory.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally-rectangle.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally-root.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

-copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally

+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32

-"
- />
- <UserMacro
- Name="ClutterDoInstallGDK"
- Value="
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk

+copy ..\..\..\clutter\clutter.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-actor-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-align-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-animatable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-backend.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-bind-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-binding-pool.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-blur-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-box-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-brightness-contrast-effect.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-cairo.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-canvas.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-child-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-click-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-cogl-compat.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-color-static.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-color.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-colorize-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-config.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-content.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-container.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-deform-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-deprecated.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-desaturate-effect.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-device-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-drag-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-drop-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-enums.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-enum-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-event.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-feature.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-fixed-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-flow-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-gesture-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-grid-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-image.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-input-device.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-interval.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-layout-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-layout-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-list-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-keyframe-transition.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-keysyms.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-macros.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-offscreen-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-page-turn-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-paint-node.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-paint-nodes.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-pan-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-path-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-property-transition.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-rotate-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-script.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-scriptable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-scroll-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-settings.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-shader-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-shader-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-snap-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-swipe-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-table-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-tap-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-text.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-text-buffer.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-transition-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-units.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-version.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\clutter-zoom-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

+copy ..\..\..\clutter\win32\clutter-win32.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32

-copy ..\..\..\clutter\gdk\clutter-gdk.h
$(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk

- "
- />
- <UserMacro
- Name="ClutterDoInstallReleaseBin"
- Value="
-mkdir $(CopyDir)\bin

-copy $(SolutionDir)Release\$(PlatformName)\bin\*.dll $(CopyDir)\bin

+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-actor.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-alpha.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-animatable.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-animation.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-animator.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-backend.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-behaviour.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-behaviour-depth.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-behaviour-ellipse.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-behaviour-opacity.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-behaviour-path.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-behaviour-scale.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-bin-layout.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-box.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-cairo-texture.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-container.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-fixed.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-frame-source.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-group.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-input-device.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-keysyms.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-main.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-media.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-rectangle.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-score.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-shader.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-stage.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-stage-manager.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-state.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-texture.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-timeline.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-timeout-pool.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

+copy ..\..\..\clutter\deprecated\clutter-util.h
$(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated

-copy $(SolutionDir)Release\$(PlatformName)\bin\*.exe $(CopyDir)\bin

+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally-factory.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally-group.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally-main.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally-rectangle.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally-root.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

+copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ApiVersion)\cally

-mkdir $(CopyDir)\lib

-copy $(SolutionDir)Release\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib

- "
+"
/>
- <UserMacro
- Name="ClutterDoInstallDebugBin"
+ <UserMacro
+ Name="ClutterDoInstallGDK"
Value="
-mkdir $(CopyDir)\bin

-copy $(SolutionDir)Debug\$(PlatformName)\bin\*.dll $(CopyDir)\bin

+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk

-copy $(SolutionDir)Debug\$(PlatformName)\bin\*.exe $(CopyDir)\bin

-
-mkdir $(CopyDir)\lib

-copy $(SolutionDir)Debug\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib

+copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk

"
/>
<UserMacro
@@ -339,24 +321,24 @@ copy $(SolutionDir)Debug\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(CopyDi
/>
<UserMacro
Name="ClutterLibtoolCompatibleDllSuffix"
- Value="-$(ClutterApiVersion)-0"
+ Value="-$(ApiVersion)-0"
/>
<UserMacro
- Name="ClutterSeparateVS9DllPrefix"
+ Name="ClutterSeparateVSDllPrefix"
Value=""
/>
<UserMacro
- Name="ClutterSeparateVS9DllSuffix"
- Value="-1-vs9"
+ Name="ClutterSeparateVSDllSuffix"
+ Value="-1-vs$(VSVer)"
/>
<!-- Change these two to GlibLibtoolCompatibleDllPrefix and
GlibLibtoolCompatibleDllSuffix if that is what you want -->
<UserMacro
Name="ClutterDllPrefix"
- Value="$(ClutterSeparateVS9DllPrefix)"
+ Value="$(ClutterSeparateVSDllPrefix)"
/>
<UserMacro
Name="ClutterDllSuffix"
- Value="$(ClutterSeparateVS9DllSuffix)"
+ Value="$(ClutterSeparateVSDllSuffix)"
/>
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index 713a2b5..91c4c43 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -27,19 +27,7 @@
>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall)"
- />
- </Configuration>
- <Configuration
- Name="Debug_GDK|Win32"
- InheritedPropertySheets=".\clutter.vsprops"
- OutputDirectory="$(GlibEtcInstallRoot)"
- ConfigurationType="10"
- CharacterSet="2"
- >
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall)
$(ClutterDoInstallGDK)"
+ CommandLine="$(ClutterDoInstall)"
/>
</Configuration>
<Configuration
@@ -52,20 +40,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall)"
- />
- </Configuration>
- <Configuration
- Name="Debug_GDK|x64"
- InheritedPropertySheets=".\clutter.vsprops"
- OutputDirectory="$(GlibEtcInstallRoot)"
- ConfigurationType="10"
- CharacterSet="2"
- DeleteExtensionsOnClean=""
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall)
$(ClutterDoInstallGDK)"
+ CommandLine="$(ClutterDoInstall)"
/>
</Configuration>
<Configuration
@@ -78,20 +53,7 @@
>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)"
- />
- </Configuration>
- <Configuration
- Name="Release_GDK|Win32"
- InheritedPropertySheets=".\clutter.vsprops"
- OutputDirectory="$(GlibEtcInstallRoot)"
- ConfigurationType="10"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)
$(ClutterDoInstallGDK)"
+ CommandLine="$(ClutterDoInstall)"
/>
</Configuration>
<Configuration
@@ -105,21 +67,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)"
- />
- </Configuration>
- <Configuration
- Name="Release_GDK|x64"
- InheritedPropertySheets=".\clutter.vsprops"
- OutputDirectory="$(GlibEtcInstallRoot)"
- ConfigurationType="10"
- CharacterSet="2"
- WholeProgramOptimization="1"
- DeleteExtensionsOnClean=""
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)
$(ClutterDoInstallGDK)"
+ CommandLine="$(ClutterDoInstall)"
/>
</Configuration>
</Configurations>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
