From 90e99cf0ae14135406fd70047fc79e0d36f811d2 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 24 Dec 2012 18:11:48 +0800 Subject: Visual C++ property sheets: Fix header "install" The headers to "install" was out of date, so fix that. --- build/win32/vs10/clutter.props | 52 +++++++++++++++++++++++------------------ build/win32/vs9/clutter.vsprops | 30 +++++++++++++----------- 2 files changed, 45 insertions(+), 37 deletions(-) diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props index 8d7ef7610..53c7197f5 100644 --- a/build/win32/vs10/clutter.props +++ b/build/win32/vs10/clutter.props @@ -7,7 +7,7 @@ 1.0 $(GlibEtcInstallRoot) $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - _WIN32_WINNT=0x0500 + _WIN32_WINNT=0x0501 $(BaseWinBuildDef) HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;COGL_HAS_WIN32_SUPPORT;CLUTTER_ENABLE_EXPERIMENTAL_API $(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG @@ -78,7 +78,7 @@ cd ..\build\win32\vs10 cd .. -gen-enums.bat $(GlibMkEnumsPath) +gen-enums.bat $(GlibEtcInstallRoot) cd .\vs10 @@ -90,11 +90,6 @@ mkdir $(CopyDir)\bin mkdir $(CopyDir)\share\clutter-$(ClutterApiVersion)\data -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin - - -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin - copy ..\*.bat $(CopyDir)\bin copy ..\..\..\tests\data\*.png $(CopyDir)\share\clutter-$(ClutterApiVersion)\data @@ -104,11 +99,6 @@ copy ..\..\..\tests\data\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(Clu copy ..\..\..\tests\data\*.json $(CopyDir)\share\clutter-$(ClutterApiVersion)\data -mkdir $(CopyDir)\lib - -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib - - mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32 @@ -122,14 +112,8 @@ copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ClutterApiVer copy ..\..\..\clutter\clutter-align-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter -copy ..\..\..\clutter\clutter-alpha.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter - copy ..\..\..\clutter\clutter-animatable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter -copy ..\..\..\clutter\clutter-animation.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter - -copy ..\..\..\clutter\clutter-animator.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 @@ -144,7 +128,7 @@ copy ..\..\..\clutter\clutter-box-layout.h $(CopyDir)\include\clutter-$(ClutterA copy ..\..\..\clutter\clutter-brightness-contrast-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter -copy ..\..\..\clutter\clutter-cairo-texture.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 @@ -198,6 +182,8 @@ copy ..\..\..\clutter\clutter-flow-layout.h $(CopyDir)\include\clutter-$(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 @@ -206,6 +192,8 @@ copy ..\..\..\clutter\clutter-input-device.h $(CopyDir)\include\clutter-$(Clutte copy ..\..\..\clutter\clutter-interval.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-layout-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter @@ -220,8 +208,6 @@ copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ClutterApiVers copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter -copy ..\..\..\clutter\clutter-media.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 @@ -230,6 +216,8 @@ copy ..\..\..\clutter\clutter-page-turn-effect.h $(CopyDir)\include\clutter-$(Cl copy ..\..\..\clutter\clutter-paint-node.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter +copy ..\..\..\clutter\clutter-pan-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter + copy ..\..\..\clutter\clutter-paint-nodes.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter copy ..\..\..\clutter\clutter-path-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter @@ -238,10 +226,14 @@ copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ClutterApiVers 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 @@ -256,8 +248,6 @@ copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(Clutt copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter -copy ..\..\..\clutter\clutter-state.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 @@ -272,12 +262,16 @@ copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ClutterApi 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 @@ -285,10 +279,14 @@ 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 @@ -305,6 +303,8 @@ copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h $(CopyDir)\include\c 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 @@ -317,10 +317,14 @@ copy ..\..\..\clutter\deprecated\clutter-frame-source.h $(CopyDir)\include\clutt 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 @@ -331,6 +335,8 @@ copy ..\..\..\clutter\deprecated\clutter-stage.h $(CopyDir)\include\clutter-$(Cl 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 diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops index c7d91eb67..693bae2c6 100644 --- a/build/win32/vs9/clutter.vsprops +++ b/build/win32/vs9/clutter.vsprops @@ -43,7 +43,7 @@ />