From daf2b67ed28d3e6ef6d2b2ffa99c3ab86d67d0e6 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 8 Dec 2011 17:02:17 +0800 Subject: [PATCH] Update VS property sheets Use a pregenerated .bat file to generate the clutter-enum-types.[ch], which will greatly simplify the maintenanace of the VS build files as public headers are added or removed. --- build/win32/vs10/clutter.props | 21 +++------------------ build/win32/vs9/clutter.vsprops | 14 +++----------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props index 12f5105f7..91d097da3 100644 --- a/build/win32/vs10/clutter.props +++ b/build/win32/vs10/clutter.props @@ -35,26 +35,11 @@ copy ..\..\..\clutter\clutter-version.h.win32 ..\..\..\clutter\clutter-version.h :DONE_CLUTTER_VERSION_H -if exist ..\..\..\clutter\clutter-enum-types.h goto DONE_CLUTTER_ENUM_H +cd .. -cd ..\..\..\clutter +gen-enums.bat $(GlibEtcInstallRoot) -perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.h.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-deprecated.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h ./clutter-enums.h ./clutter-event.h ./clutter-feature.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-layout-manager.h ./clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-swipe-action.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-types.h ./clutter-units.h ./clutter-util.h ./win32/clutter-win32.h > clutter-enum-types.h - -cd ..\build\win32\vs10 - -:DONE_CLUTTER_ENUM_H - - -if exist ..\..\..\clutter\clutter-enum-types.c goto DONE_CLUTTER_ENUM_C - -cd ..\..\..\clutter - -perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.c.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-deprecated.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h ./clutter-enums.h ./clutter-event.h ./clutter-feature.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-layout-manager.h ./clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-swipe-action.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-types.h ./clutter-units.h ./clutter-util.h ./win32/clutter-win32.h > clutter-enum-types.c - -cd ..\build\win32\vs10 - -:DONE_CLUTTER_ENUM_C +cd .\vs10 if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops index 92316a93b..169ae34f8 100644 --- a/build/win32/vs9/clutter.vsprops +++ b/build/win32/vs9/clutter.vsprops @@ -77,17 +77,9 @@ if exist ..\..\..\clutter\clutter-version.h goto DONE_CLUTTER_VERSION_H &#x copy ..\..\..\clutter\clutter-version.h.win32 ..\..\..\clutter\clutter-version.h :DONE_CLUTTER_VERSION_H -if exist ..\..\..\clutter\clutter-enum-types.h goto DONE_CLUTTER_ENUM_H -cd ..\..\..\clutter -perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.h.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-deprecated.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h ./clutter-enums.h ./clutter-event.h ./clutter-feature.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-layout-manager.h ./clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-swipe-action.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-types.h ./clutter-units.h ./clutter-util.h ./win32/clutter-win32.h > clutter-enum-types.h -cd ..\build\win32\vs9 -:DONE_CLUTTER_ENUM_H - -if exist ..\..\..\clutter\clutter-enum-types.c goto DONE_CLUTTER_ENUM_C -cd ..\..\..\clutter -perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.c.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-deprecated.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h ./clutter-enums.h ./clutter-event.h ./clutter-feature.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-layout-manager.h ./clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-swipe-action.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-types.h ./clutter-units.h ./clutter-util.h ./win32/clutter-win32.h > clutter-enum-types.c -cd ..\build\win32\vs9 -:DONE_CLUTTER_ENUM_C +cd .. +gen-enums.bat $(GlibEtcInstallRoot) +cd .\vs9 if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H cd ..\..\..\clutter