Merge branch 'clutter-1.22' back into master

This is the bulk of the clutter-1.22 → master merge.

The clutter-1.22 branch is where the current development of Clutter
happens, and contains all the history of the project after the API
bump branch point.

.gitignore

@@ -12,6 +12,7 @@ compile
 *.lo
 *.la
 *.gcov
+.dirstamp
 README
 stamp-enum-types
 stamp-marshal
@@ -23,12 +24,16 @@ stamp-marshal
 /clutter/gcov-report.txt
 /clutter/clutter-json.h
 /clutter/cex100/clutter-cex100.h
+/clutter/*.log
+/clutter/*.trs
 /clutter-lcov.info
 /clutter-lcov
-/build/autotools/*.m4
 !/build/autotools/introspection.m4
 !/build/autotools/as-linguas.m4
 !/build/autotools/as-compiler-flag.m4
+!/build/autotools/glibtests.m4
+/build/autotools/*.m4
+/build/test-driver
 *.gir
 *.typelib
 *.gcda

Makefile.am

@@ -2,11 +2,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 NULL =
 
-SUBDIRS = clutter doc po build
+SUBDIRS = build clutter tests doc po
-
-if BUILD_TESTS
-SUBDIRS += tests
-endif
 
 if BUILD_EXAMPLES
 SUBDIRS += examples

NEWS

@@ -1,3 +1,646 @@
+Clutter 1.21.2                                                       2014-12-15
+===============================================================================
+
+  • List of changes since Clutter 1.20.0
+
+    - Improve input device handling
+    Both on the evdev input backend, and the XInput2 backend for X11.
+
+    - Allow content implementations to drive actors preferred size
+    If a ClutterActor is only used to paint a ClutterContent implementation,
+    it should be possible to allow the actor to have the same preferred size
+    of its content. We use a ClutterRequestMode to specify this behaviour.
+
+    - Documentation fixes
+
+  • List of bugs fixed since Clutter 1.20.0
+
+    #738520 - evdev: Flush event queue before removing device(s)
+    #739050 - Fix some weird graphical glitches in RTL
+    #741350 - Improve touchpad detection on libinput
+    #740997 - Easing modes are not used when computing the value of a
+              KeyframeTransition
+    #676326 - actor: Add a :request-content-size property
+    #711182 - Incorrect drawing behaviour with clutter content centered
+    #709252 - ensure that all deprecated symbols are correctly annotated for
+              gtk-doc
+    #669743 - ObjectInfo property is_actor not correctly set when updating
+              existing actor using ClutterScriptParser
+    #719962 - clutter/osx: add clutter_osx_disable_event_retrieval
+    #681300 - Miss CLUTTER_INPUT_BACKEND description in doc
+    #729462 - DeviceManagerXi2: Update cached core pointer in getter if NULL
+
+Many thanks to:
+
+  Carlos Garnacho, Jasper St. Pierre, Jonas Ådahl, Rico Tzschichholz,
+  Samuel Degrande, Sjoerd Simons, cee1.
+
+Clutter 1.20.0                                                       2014-09-22
+===============================================================================
+
+  • List of changes since Clutter 1.19.10
+
+    - Translations updated
+    Greek
+
+  • List of bugs fixed since Clutter 1.19.10
+
+    - #736826 - clutter_text_set_font_name invalid example using "pt"
+
+Clutter 1.19.10                                                      2014-09-17
+===============================================================================
+
+  • List of changes since Clutter 1.19.8
+
+    - Honour the desktop window scaling factor in the GDK backend
+    The GDK backend will become the default backend in the next cycle, so we
+    need to improve its functionality out of the box.
+
+    - Ensure accessibility support is correctly initialized
+    We need to make sure that the accessibility implementation that Clutter
+    relies on is initialized the way we expect it to.
+
+    - Improve default paint volume computation
+    We should reduce the cases that lead to an invalid paint volume.
+
+    - Improve input handling on Wayland and X11
+
+    - Translations updates
+    Hebrew
+
+  • List of bugs fixed since Clutter 1.19.8
+
+    #736682 - clutter-actor: Don't ask children that have no allocation for
+              a paint volume
+    #736413 - USB mouse doesn't register slow movements to the right or down
+              in Gnome on Wayland
+    #734480 - Handle CLUTTER_SCALE envvar
+    #734115 - Deprecated property crashes /actor/transforms/anchor-point
+    #735388 - xi2 device manager gets a "0" client pointer if queried very
+              early in app lifetime
+    #735244 - shell forgets the DPI of screen sometimes
+
+Many thanks to:
+
+  Bastien Nocera, Adel Gadllah, Alejandro Piñeiro, Carlos Garnacho, Jonas
+  Ådahl, Yosef Or Boczko
+
+Clutter 1.19.8                                                       2014-08-21
+===============================================================================
+
+  • List of changes since Clutter 1.19.6
+  
+    - Improve the GDK backend
+    The GDK backend is now reporting touch events, as well as supporting
+    foreign Wayland surfaces for the Stage window. The goal is to make the
+    GDK backend the preferred one in the next development cycle.
+
+    - Fix drawing transparent Canvas content inside transparent actors
+
+    - Translation updates
+    German, Assamese
+
+  • List of bugs fixed since Clutter 1.19.6
+
+    #733202 - evdev: Add API to set the xkb layout index
+    #734934 - Add touch event translation code to GDK backend
+    #734935 - Add support for wayland foreign windows in GDK backend
+    #734761 - Memory leak in implicit transition
+
+Many thanks to:
+
+  Lionel Landwerlin Christian Kirbach, Rui Matos, Tom Beckmann, ngoswami,
+  Sunjin Yang
+
+Clutter 1.19.6                                                       2014-07-24
+===============================================================================
+
+  • List of changes since Clutter 1.19.4
+
+    - Add a signal for the end of the frame on ClutterStage
+    The ::after-paint signal is useful to execute custom code after all the
+    painting on a specific ClutterStage has been performend, but before the
+    frame contents have been presented on the screen.
+
+    - Improvements in the reliability of the evdev input backend
+
+    - Improvements in the GestureAction implementation
+
+  • List of bugs fixed since Clutter 1.19.4
+
+    #732342 - ClutterStage: Add an ::after-paint signal
+    #732907 - Allow for calling clutter_gesture_action_cancel() within the
+              ::gesture-end handler
+    #733062 - Evdev: set button state in input devices
+    #733300 - ClutterAnimation: fix memory leak
+    #733561 - Make a GType for ClutterEventSequence
+    #733562 - evdev: update xkb_state when resuming input
+    #733560 - Touch events trigger enter events on press, but no leave events
+              on release
+
+Many thanks to:
+
+  Carlos Garnacho, Giovanni Campagna, Owen W. Taylor
+
+Clutter 1.19.4                                                       2014-06-25
+===============================================================================
+
+  • List of changes since Clutter 1.19.2
+
+    - Depend on libinput 0.4
+    The evdev input backend now depends on libinput 0.4.0.
+
+  • List of bugs fixed since Clutter 1.19.2
+
+    #731268 - Events being clamped to the pre-fullscreen window size when
+              stage goes fullscreen
+    #731178 - evdev: Used floating point instead of fixed point numbers
+    #731254 - evdev: Follow libinput enum rename
+    #731536 - evdev: Add clutter_evdev_warp_pointer
+    #732234 - Touch events may leave a stage-less device, or happen on one
+    #732235 - clutter gesture actions may mistakenly handle enter/leave events
+
+Many thanks to:
+
+  Jonas Ådahl, Chun-wei Fan, Gustavo Noronha Silva, Jasper St. Pierre,
+  Carlos Garnacho.
+
+Clutter 1.19.2                                                       2014-05-28
+===============================================================================
+
+  • List of changes since Clutter 1.18
+
+    - Improve event handling on evdev input backend
+    Clutter now allows writing applications and compositors that can respond
+    to eventts from touch devices, as well as reporting correct smooth
+    scrolling deltas.
+
+  • List of bugs fixed since Clutter 1.18
+
+    #723560 - wayland: Generate better smooth scroll deltas
+    #730577 - Do not compress touch events so eagerly
+    #728968 - evdev: Implement touch support
+    #728967 - evdev: Add libinput-specific helpers
+    #730215 - Add a way to pause the ClutterMasterClock
+
+Many thanks to:
+
+  Carlos Garnacho, Jasper St. Pierre, Jonas Ådahl.
+
+Clutter 1.18.2                                                       2014-04-14
+===============================================================================
+
+  • List of changes since Clutter 1.18.0
+
+    - Fix the list of dependencies
+    Clutter 1.18 depends on Cogl 1.17.5 when building the EGL/KMS backend.
+
+    - Fixes for the Visual Studio build files
+    Use the new symbol visibility annotations when building with MSVC.
+
+    - Fix event handling on Windows
+    An optimization led to a crash on the Windows backend when delivering
+    events without an associated ClutterStage.
+
+    - Ensure that set_child_above/below work on the Stage
+    ClutterStage should respect the paint order when using the Actor API.
+
+    - Skip conformance test suite on X11 when DISPLAY is unset
+    Instead of bailing out when initializing the test suite we should just
+    tell the test suite API to skip the units. This allows the TAP driver
+    to catch the skipped tests and avoid warnings.
+
+    - Translation updates
+    Danish, French, Indonesian, Greek.
+
+  • List of bugs fixed since Clutter 1.18.0
+
+    #728177 - Cannot collect coverage with lcov 1.10
+    #727020 - wayland: Add missing CLUTTER_AVAILABLE annotations
+    #711645 - clutter_actor_set_child_above_sibling() not working in
+              ClutterStage
+    #726762 - Fix Import of Clutter Version Constants
+    #726703 - build error: undefined reference to
+              `cogl_kms_renderer_set_kms_fd'
+
+Many thanks to:
+
+  Chun-wei Fan, Adel Gadllah, Andika Triwidada, Ask H. Larsen, David Warman,
+  Emilio Pozuelo Monfort, Vadim Rutkovsky, maria thukididu, teuf.
+
+Clutter 1.18.0                                                       2014-03-18
+===============================================================================
+
+  • List of changes since Clutter 1.17.6
+
+    - Update build environment for Visual Studio
+
+    - Improve the API for implementing Wayland compositors
+    Allow integrating with logind and KMS; provide clipped redraws on both
+    Wayland clients, and direct KMS.
+
+    - Port the documentation to MarkDown
+
+    - Use symbol annotations to ensure the public ABI
+
+    - Translations updates
+    Korean, Traditional Chinese (Hong Kong and Taiwan), Chinese, Portuguese,
+    Latvian, Russian, French.
+
+  • List of bugs fixed since Clutter 1.17.6
+
+    #725716 - Fix build of clutter-test-utils.c on Windows
+    #725873 - Fix the Win32 backend for newer Visual Studio Versions
+    #725722 - Grid layout actor width/height swapped
+    #726199 - evdev changes needed for logind integration work
+    #726341 - eglnative: Add clutter-stage-window implementation
+    #726315 - clutter-stage-wayland: Enable clipped redraws
+    #726313 - stage-cogl: Fix feature check in clutter_stage_cogl_redraw
+    #726198 - egl: Add a way to set the KMS FD
+    #708781 - wayland: Keep track of button modifier state
+    #711857 - Avoid needless event copies when queueing from a backend
+              to a stage
+
+Many thanks to:
+
+  Jasper St. Pierre, Chun-wei Fan, Adel Gadllah, Bastian Winkler, Changwoo Ryu,
+  Chao-Hsiung Liao, Duarte Loreto, Jonas Ådahl, Rui Matos, Rūdolfs Mazurs,
+  Wylmer Wang, Yuri Myasoedov, teuf.
+
+Clutter 1.17.6                                                       2014-03-03
+===============================================================================
+
+  • List of changes since Clutter 1.17.4
+
+    - Use libinput instead of libevdev
+    The evdev input backend is now based on libinput instead of directly
+    using the evdev API; this allows for shared input behaviour with
+    different toolkits.
+
+    - Improvements in the X11 input handling
+    Remove the chance of input devices going out of sync; avoid excessive
+    round trips when asking for the client pointer; retrieve the text
+    direction for the current keymap.
+
+    - Improve RTL handling in ClutterText
+    Try to use the correct text direction based on the contents, keymap,
+    and actor's direction instead of just the latter.
+
+    - Translation updates
+    Brazilian Portuguese, Lithuanian, Czech, Hungarian, Serbian, Polish,
+    Galician.
+
+  • List of bugs fixed
+
+    #
+    #724788 - stage-cogl: Fix buffer_age code path
+    #724971 - Avoid stale ClutterInputDevice pointers in the device list
+    #720566 - [RFC] evdev: Port evdev input backend to libinput
+    #725102 - Patches to rework the evdev backend's keymap handling
+    #725103 - evdev: Set the initial core pointer coordinates to a sane value
+    #705779 - The text in the search-entry isn't aligned to right in RTL text
+    #725561 - DeviceManagerXi2: Cache the client pointer
+
+Many thanks to:
+
+  Rui Matos, Adel Gadllah, Jasper St. Pierre, Aurimas Černius, Balázs Úr,
+  Carlos Garnacho, Fran Diéguez, Jonas Ådahl, Marek Černocký, Piotr Drąg,
+  Rafael Ferreira, Мирослав Николић.
+
+Clutter 1.17.4                                                       2014-02-19
+===============================================================================
+
+  • List of changes since Clutter 1.17.2
+
+    - Add per-gesture thresholds
+    It is possible to give horizontal and vertical thresholds to each
+    ClutterGestureAction instance; if unset, the default is to use the
+    dnd threshold from ClutterSettings.
+
+    - Allow negative factors in ClutterActor scale properties
+    The functions already accepted these values, but the properties did not.
+
+    - Depend on Cogl 1.17.3
+
+    - Translation updates
+    Spanish, Hebrew, Czech, Brazilian Portuguese, Traditional Chinese (Hong
+    Kong and Taiwan), Serbian, Galician, Indonesian, Italian, Aragonese,
+    Norwegian bokmål, Ukranian.
+
+  • List of bugs fixed since Clutter 1.17.2
+
+    #711540 - Fix bad logic in checks
+    #662818 - Fix documentation of 'hsla()' parsing
+    #710232 - Mention that ClutterTransition is abstract in the documentation
+    #706311 - Extend :scale-[xyz] factors in the negative range
+    #724242 - Add per-action thresholds
+
+Many thanks to:
+
+  Bastien Nocera, Daniel Mustieles, Kjartan Maraas, Milo Casagrande, Adel
+  Gadllah, Andika Triwidada, Chao-Hsiung Liao, Daniel Korostil, Fran Diéguez,
+  Jorge Pérez Pérez, Marek Černocký, Rafael Ferreira, Yosef Or Boczko,
+  Мирослав Николић
+
+
+Clutter 1.17.2                                                       2014-01-22
+===============================================================================
+
+  • List of changes since Clutter 1.16.0
+
+    - Allow ClutterScript definitions for Interval and Transition classes
+    ClutterInterval instances can be defined, and used, in ClutterScript
+    UI definition files.
+
+    - Add generic API for event filtering
+    Event filtering is meant to be used to intercept events before they
+    reach the scene graph.
+
+    - Deprecated ClutterTableLayout
+    The Table layout manager is fully superceded by ClutterGridLayout, which
+    supports dynamic grid layouts, RTL flipping, expansion and alignment of
+    children using the ClutterActor flags, and implicit animations using the
+    actor's easing state.
+
+    - Allow GestureAction subclasses to change the trigger edge
+    GestureAction can emit the ::gesture-begin signal depending on the
+    value of the :threshold-trigger-edge property. Using this property it
+    is possible to specify whether the gesture begins after a certain
+    threshold is passed; before a certain threshold is passed; or
+    immediately.
+
+    - Use the window scaling factor when creating Cairo surfaces
+    ClutterCanvas will use the window scaling factor setting when creating
+    Cairo surfaces; it is also possible to set the scaling factor on a
+    per-instance basis, for future compatibility.
+
+    - Detect window scaling factor automatically on X11
+    Use the XSETTING exposed by the environment to change the window
+    scaling factor.
+
+    - Support ClutterStage cursor visibility in the Wayland backend
+    It is possible to show and hide the cursor on the Stage on Wayland.
+
+    - Translations updates
+    Czech, Greek, Hebrew, Chinese simplified, Brazilian Portuguese,
+    Galician, Italian, Spanish.
+
+  • List of bugs fixed since Clutter 1.16.0
+
+    705915 - Support high dpi displays
+    722322 - check coordinate validity in do_pick()
+    722220 - Incorrect string reported in accessible text-changed events
+             when text is removed
+    722188 - atk_text_get_n_selections() should return 0 when no text is
+             selected
+    710229 - Restore initial ClutterGestureAction behavior
+    710227 - ClutterGestureAction memory corruption
+    719901 - ClutterStageCogl: Ignore a clip the size of the stage
+    719900 - ClutterStageCogl: Clip in the right coordinate system
+    719747 - ClutterStage: Don't add empty actors to the stage clip
+    719716 - Make test-clip friendly for people with only one mouse button
+    719563 - input-device: Guard against double free
+    719368 - Don't queue redraws when reallocating actor that haven't moved
+    719367 - Bind constraints: Don't force redraws on source relayout
+    712816 - device-manager-evdev: Stop using deprecated libevdev API
+    712812 - Crash and memory leak fixes for device removals
+    712563 - Fixes for cogl journal usage when picking
+    707560 - Event filter
+    712322 - input-device-xi2: Calculate the correct state for button events
+    707071 - Remove use of XFixes for showing/hiding the cursor
+    709762 - ClutterDragAction can mix pointer and touch events
+    709590 - wayland: Implement support for 'cursor-visible' stage property
+
+Many thanks to:
+
+  Jasper St. Pierre, Rui Matos, Owen W. Taylor, Alejandro Piñeiro, Lionel
+  Landwerlin, Bastian Winkler, Neil Roberts, Rafael Ferreira, Chun-wei Fan,
+  Daniel Mustieles, Dimitris Spingos, Enrico Nicoletto, Florian Müllner, Fran
+  Diéguez, Jonas Ådahl, Marek Černocký, Milo Casagrande, Piotr Drąg, Robert
+  Bragg, Sphinx Jiang, Yosef Or Boczko
+
+Clutter 1.16.0                                                       2013-09-23
+===============================================================================
+
+  • List of changes since Clutter 1.15.96
+
+    - Fix a division by zero in the X11 backend
+
+    - Translation updates
+    Portuguese, Danish
+
+  • List of bugs fixed since Clutter 1.15.96
+
+    #707033 - Hidden division by zero in examples/basic-actor.c
+
+Many thanks to:
+
+  Duarte Loreto, Kenneth Nielsen.
+
+Clutter 1.15.96                                                      2013-09-20
+===============================================================================
+
+  • List of changes since Clutter 1.15.94
+
+    - Fix a crasher bug happening on X11
+    Some events coming from the system would result in a segmentation fault.
+
+  • List of bugs fixed since Clutter 1.15.94
+
+    #708439 - clutter-xi2: don't access the stage if we don't have one
+
+Clutter 1.15.94                                                      2013-09-19
+===============================================================================
+
+  • List of changes since Clutter 1.15.92
+
+    - Improve the evdev input backend
+    The evdev input backend is used when writing applications and compositors
+    that directly drive the frame buffer on Linux. By ensuring that the evdev
+    input backend works correctly it is possible to manage input sources like
+    pointers, keyboards, and touch devices using the raw evdev device nodes.
+    Clutter now depends on libevdev in order to poll the evdev interfaces.
+
+    - Allow scaling windowing surfaces
+    The main part of the work to support high resolution displays is to make
+    sure that windowing surfaces can be created with a scaling factor, while
+    trasparently handling the new size from an application's perspective. The
+    scaling factor is currently set manually, but it in the near future it will
+    be automatically set by the environment.
+
+    - Translation updates
+    Serbian, Aragonese, Russian, Latvian, Belarusian, Assamese, Indonesian,
+    German, Hebrew.
+
+  • List of bugs fixed since Clutter 1.15.92
+
+    #706652 - evdev: add callback to constrain the pointer position
+    #706543 - evdev: use monotonic times for the events
+    #706494 - an assortment of wayland and evdev related changes
+    #707377 - wayland: Check for NULL surface on pointer leave events
+    #707808 - box-layout: Fix floating point truncation when calculating a
+              child's size
+    #707774 - ClutterClickAction can trigger a crash if disposes at
+              inappropriate time
+    #707869 - Add API to restrict the windowing backend to load
+    #708079 - Clutter clutter-1.16 branch fails to commit after commit
+              da3e6988
+    #708383 - ClutterEvent: preserve extended state across
+              clutter_event_copy()
+
+Many thanks to:
+
+  Giovanni Campagna, Emmanuele Bassi, Lionel Landwerlin, Andika Triwidada,
+  Chun-wei Fan, Florian Müllner, Ihar Hrachyshka, Jasper St. Pierre, Jorge
+  Pérez Pérez, Nilamdyuti Goswami, Rob Bradford, Rūdolfs Mazurs, Yuri
+  Myasoedov, Мирослав Николић.
+
+Clutter 1.15.92                                                      2013-09-02
+===============================================================================
+
+  • List of changes since Clutter 1.15.90
+
+    - Fix regression in BoxLayout for RTL text direction
+
+    - Update Visual Studio build files
+
+    - Translation updates
+    Polish, French, Slovak, Lithuanian, Catalan
+
+  • List of bugs fixed since Clutter 1.15.90
+
+    #706450 - box-layout: Fix RTL layout swapping with non-zero container
+              offsets
+
+Many thanks to:
+
+  Chun-wei Fan, Jasper St. Pierre, Alexandre Franke, Aurimas Černius, Gil
+  Forcada, Ján Kyselica, Piotr Drąg
+
+Clutter 1.15.90                                                      2013-08-19
+===============================================================================
+
+  • List of changes since Clutter 1.15.2
+
+    - Update the Wayland backend
+    Use the new 1.2 behaviour and API, and improve the coverage of windowing
+    system features, alongside a slew of bugs.
+
+    - Drop support for XInput 1.x
+    The XInput 1.x extension was never really used after the introduction of
+    the 2.x version.
+
+    - Fix event and device handling when using evdev
+
+    - Allow using ClutterContent on a ClutterStage
+
+    - Fixes for the Windows backend
+    The build script has also been updated with the required dependencies.
+
+    - Documentation fixes
+
+    - Translations updated
+
+  • List of bugs fixed since Clutter 1.15.2
+
+    #703809 - Some LayoutManager fixes
+    #704625 - Cannot assign a ClutterContent to a stage
+    #698836 - Add interactive test for ClutterZoomAction/ClutterRotateAction
+    #705739 - Crash when removing a ClutterActor from a scene at the end of
+              an animation
+    #705710 - evdev: fix X11 to evdev keycode translation
+    #704269 - evdev: add a way for applications to tweak how devices are
+              opened
+    #704457 - Setting the size of the stage causes it to not be shown on
+              wayland
+    #699578 - Implement foreign surface support for stages
+    #704279 - wayland: Add API for disabling the event dispatching
+    #703336 - clutter-actor: Make clutter_actor_has_mapped_clones public
+    #701356 - Update the windows backend to work with latest Cogl
+    #703969 - Select for events with XIAllMasterDevices under XI2
+    #703878 - wayland: Don't pass the shell and compositor down to Cogl
+    #703608 - Update ClutterWaylandSurface to use a resource instead of
+              wl_buffer
+    #703877 - Bump the required Cogl version to 1.15.1
+
+Many thanks to:
+
+  Giovanni Campagna, Neil Roberts, Florian Müllner, Jasper St. Pierre, Rob
+  Bradford, Matej Urbančič, Adel Gadllah, Chao-Hsiung Liao, Chris Cummins,
+  Chun-wei Fan, Lionel Landwerlin, Rafael Ferreira
+
+Clutter 1.15.2                                                       2013-07-10
+===============================================================================
+
+  • List of changes since Clutter 1.14
+
+    - Improve state tracking and short circuiting
+    ClutterActor now tracks clones and unmapped actors more aggressively, to
+    reduce the amount of work necessary when updating the scene graph.
+
+    - Wayland backend improvements and updates
+
+    - Documentation updates
+    Clean up the API reference for readability, and improve the comments in
+    the inlined example code. Also, include the cookbook in the distribution
+    tarball.
+
+    - Allow installation of conformance tests
+    Clutter now allows installing its conformance tests into a well-known
+    location; this allows running the conformance test suite against an
+    installed version of Clutter.
+
+    - Add ClutterFlowLayout:snap-to-grid
+    ClutterFlowLayout users can now ask the layout manager to not align the
+    actors to a grid.
+
+    - Improve gesture recognizers
+
+    - Deprecations
+    ClutterText::cursor-event has been replaced by ClutterText::cursor-changed;
+    ClutterGeometry has been deprecated; ClutterActor::realize and ::unrealize,
+    along with their virtual functions, have been deprecated.
+
+  • List of bugs fixed since Clutter 1.14
+
+    #682789 - Deprecate ClutterGeometry (and remove it for 2.0)
+    #698668 - A few improvements to ClutterGestureAction
+    #698669 - Fix "trigger edge after" behavior with more than 1 touch point
+    #698671 - Refactor event handling code in ClutterGestureAction
+    #698674 - Improve ClutterZoomAction behavior
+    #698783 - Add a paint callback for ClutterStage
+    #698766 - Implicit transitions queued on invisible actors should be ignored
+    #648873 - Feature request: ClutterFlowLayout not aligning on a grid
+    #699675 - Offscreen effects allocating too much memory
+    #692706 - Frequent crash in cally_stage_notify_key_focus_cb
+    #701974 - x11: trap errors when calling XIQueryDevice
+    #696813 - clutter_actor_set_child_above/below_sibling leaking a reference
+              on the actor
+    #701208 - deform-effect: correctly set the cull-face mode of the back
+              pipeline
+    #700980 - Tap action now longer works
+    #702016 - ClutterText reset font when dpi changes and font was set using
+              a pango description
+    #702610 - text: relayout on cursor visibility change
+    #702941 - Install conformance tests
+    RH#975171 - gnome-shell: screen magnifier can cause crash with Cogl error
+    #702202 - conform tests hang on wayland
+    #703188 - Stage doesn't appear when running under Wayland
+    #703476 - tests/actor-offscreen-redirect: Fix race condition
+    #703566 - Need to be able to share Wayland display between GTK and Clutter
+    #697285 - Inconsistent setting of the time member on the events
+    #703882 - Prevent buffer/text/max-length properties notification in the
+              allocation cycle
+
+Many thanks to:
+
+  Lionel Landwerlin, Chris Cummins, Matthias Clasen, Rob Bradford, Alejandro
+  Piñeiro, Jasper St. Pierre, Bastian Winkler, Colin Walters, Craig R. Hughes,
+  Daniel Mustieles, Marek Černocký, Adel Gadllah, Ask H. Larsen, Bastien
+  Nocera, Cosimo Cecchi, Dimitris Spingos, Duarte Loreto, Emanuele Aina, Fran
+  Diéguez, Gil Forcada, Matej Urbančič, Milo Casagrande, Neil Roberts, Rui
+  Matos, Samuel Degrande, Sebastian Keller, Sjoerd Simons.
+
 Clutter 1.13.2                                                       2012-12-18
 ===============================================================================
 

README.in

@@ -21,7 +21,6 @@ When building the X11 backend, Clutter depends on the following extensions:
   • XComposite ≥ @XCOMPOSITE_REQ_VERSION@
   • XDamage
   • XExt
-  • XFixes ≥ @XFIXES_REQ_VERSION@
   • XInput (1.x or 2.x)
   • XKB
 
@@ -38,6 +37,12 @@ When building the CEx100 backend, Clutter also depends on:
 
   • libgdl
 
+When building the evdev input backend, Clutter also depends on:
+
+  • xkbcommon
+  • libudev ≥ @LIBUDEV_REQ_VERSION@
+  • libinput ≥ @LIBINPUT_REQ_VERSION@
+
 If you are building the API reference you will also need:
 
   • GTK-Doc ≥ @GTK_DOC_REQ_VERSION@
@@ -287,9 +292,9 @@ if possible, add new unit tests for the conformance test suite in case of new
 features. Ensure you run the conformance test suite every for every patch you
 wish to submit, by using:
 
-  cd tests/conform && make test
+  make -C tests/conform check
 
-and verifying that the test suite passes.
+and verifying that the whole test suite passes.
 
 RELEASE NOTES
 -------------------------------------------------------------------------------
@@ -298,6 +303,61 @@ Relevant information for developers with existing Clutter applications
 wanting to port to newer releases (see NEWS for general information on new
 features).
 
+Release Notes for Clutter 1.22
+-------------------------------------------------------------------------------
+
+• The ClutterRequestMode enumeration has a new value. Code checking for the
+  values of ClutterRequestMode should already be resilient to changes to this
+  enumerations, like for all enumerations in Clutter.
+
+Release Notes for Clutter 1.20
+-------------------------------------------------------------------------------
+
+• The clutter_stage_set_paint_callback() experimental function has been
+  removed from the Clutter ABI; it has been replaced by the ::after-paint
+  signal on the ClutterStage class. The set_paint_callback() method was
+  marked as "experimental", required a special definition to be usable, and
+  no guarantees were made on its continued existence.
+
+Release Notes for Clutter 1.18
+-------------------------------------------------------------------------------
+
+• Until 1.18, ClutterStage removed its children during its dispose()
+  implementation, before the default ClutterActor::destroy() implementation
+  would run. ClutterStage will now destroy the children when it is destroyed
+  to ensure that the children are destroyed, and that custom code can remove
+  references through the ClutterActor::destroy signal.
+
+• Clutter does not depend on the XFIXES extension API on X11 any more. Before
+  1.18 Clutter used the XFIXES API to hide the cursor; the API is less than
+  useful for toolkits and applications, so Clutter unconditionally uses the
+  fall back code that was in place in case XFIXES was not available.
+
+• ClutterText emits the ::insert-text and ::delete-text signals before the
+  contents of the ClutterTextBuffer are changed, as documented. The signal
+  emission cannot be guaranteed if the ClutterTextBuffer API is used instead
+  of the ClutterText API.
+
+• Starting from 1.18, the Clutter evdev input device backend no longer uses
+  libevdev and libgudev directly, but relies on libinput for discovering,
+  reading and processing input devices.
+
+• The Clutter evdev input device backend was already considered
+  experimental and not subject to Clutter's API and ABI stabitility
+  guarantees. Starting from 1.18, users have to explicitly acknowldge
+  this by having to #define CLUTTER_ENABLE_COMPOSITOR_API to use its
+  public API.
+
+Release Notes for Clutter 1.16
+-------------------------------------------------------------------------------
+
+• Implicit transitions will not be created on actors that are not mapped,
+  unless they are in a cloned branch of the scene graph. This was never an
+  approved case, as ClutterActor would implicitly skip layout and paint on
+  unmapped actors, but now it's being enforced through the animation machinery
+  as well. Using explicit transitions still works, as explicit transitions
+  completely place the developer in charge.
+
 Release Notes for Clutter 1.14
 -------------------------------------------------------------------------------
 

README.md

@@ -24,8 +24,7 @@ On X11, Clutter depends on the following extensions:
 * XComposite
 * XDamage
 * XExt
-* XFixes
+* XInput 2.x
-* XInput (1.x or 2.x)
 * XKB
 
 If you are building the API reference you will also need:
@@ -54,30 +53,24 @@ The official Clutter website is:
 
 The API references for the latest stable release are available at:
 
-        http://docs.clutter-project.org/docs/clutter/stable/
+        https://developer.gnome.org/clutter/stable/
-        http://docs.clutter-project.org/docs/cogl/stable/
-        http://docs.clutter-project.org/docs/cally/stable/
 
 The Clutter Cookbook is available at:
 
-        http://docs.clutter-project.org/docs/clutter-cookbook/
+        https://developer.gnome.org/clutter-cookbook/
 
 New releases of Clutter are available at:
 
-        http://source.clutter-project.org/sources/clutter/
+        https://download.gnome.org/sources/clutter/
-
-The Clutter blog is available at:
-
-        http://www.clutter-project.org/blog/
 
 To subscribe to the Clutter mailing lists and read the archives, use the
 Mailman web interface available at:
 
-        http://lists.clutter-project.org/
+        https://mail.gnome.org/mailman/listinfo/clutter-list
 
 New bug page on Bugzilla:
 
-        http://bugzilla.gnome.org/enter_bug.cgi?product=clutter
+        https://bugzilla.gnome.org/enter_bug.cgi?product=clutter
 
 Clutter is licensed under the terms of the GNU Lesser General Public
 License, version 2.1 or (at your option) later: see the `COPYING` file
@@ -93,7 +86,7 @@ be followed:
 2. make
 3. make install
 
-To build Clutter from a Git clone, run the autogen.sh script instead
+To build Clutter from a Git clone, run the `autogen.sh` script instead
 of the configure one. The `autogen.sh` script will run the configure script
 for you, unless the `NOCONFIGURE` environment variable is set to a non-empty
 value.
@@ -134,7 +127,7 @@ The usual workflow for contributions should be:
 2. Create a branch (`git checkout -b my_work`)
 3. Commit your changes (`git commit -am "Added my awesome feature"`)
 4. Push to the branch (`git push origin my_work`)
-5. Create an [Bug][1] with a link to your branch
+5. Create an [Bug][bugzilla-clutter] with a link to your branch
 6. Sit back, relax and wait for feedback and eventual merge
 
 Bugs
@@ -142,7 +135,7 @@ Bugs
 
 Bugs should be reported to the Clutter Bugzilla at:
 
-        http://bugzilla.gnome.org/enter_bug.cgi?product=clutter
+        https://bugzilla.gnome.org/enter_bug.cgi?product=clutter
 
 You will need a Bugzilla account.
 
@@ -162,7 +155,5 @@ behaviour.
 If the bug exposes a crash, the exact text printed out and a stack trace
 obtained using gdb are greatly appreciated.
 
-
+[building-clutter]: https://wiki.gnome.org/Projects/Clutter/Building
-
+[bugzilla-clutter]: https://bugzilla.gnome.org/enter_bug.cgi?product=clutter
-[building-clutter]: http://wiki.clutter-project.org/wiki/BuildingClutter
-[1]: http://bugzilla.gnome.org/enter_bug.cgi?product=clutter

build/autotools/Makefile.am

@@ -11,4 +11,8 @@ EXTRA_DIST = \
 	gtk-doc.m4		\
 	as-compiler-flag.m4	\
 	as-linguas.m4		\
+	glibtests.m4		\
+	glib-tap.mk		\
+	tap-driver.sh		\
+	tap-test		\
 	$(NULL)

build/autotools/Makefile.am.enums

@@ -26,16 +26,17 @@ $(if $(glib_enum_headers),,$(error Need to define glib_enum_headers))
 
 enum_tmpl_h=$(addprefix $(srcdir)/, $(glib_enum_h:.h=.h.in))
 enum_tmpl_c=$(addprefix $(srcdir)/, $(glib_enum_c:.c=.c.in))
+enum_headers=$(addprefix $(srcdir)/, $(glib_enum_headers))
 
 CLEANFILES += stamp-enum-types
 DISTCLEANFILES += $(glib_enum_h) $(glib_enum_c)
 BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c)
 EXTRA_DIST += $(enum_tmpl_h) $(enum_tmpl_c)
 
-stamp-enum-types: $(glib_enum_headers) $(enum_tmpl_h)
+stamp-enum-types: $(enum_headers) $(enum_tmpl_h)
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
 		--template $(enum_tmpl_h) \
-	$(glib_enum_headers) > xgen-eh \
+	$(enum_headers) > xgen-eh \
 	&& (cmp -s xgen-eh $(glib_enum_h) || cp -f xgen-eh $(glib_enum_h)) \
 	&& rm -f xgen-eh \
 	&& echo timestamp > $(@F)
@@ -43,9 +44,9 @@ stamp-enum-types: $(glib_enum_headers) $(enum_tmpl_h)
 $(glib_enum_h): stamp-enum-types
 	@true
 
-$(glib_enum_c): $(glib_enum_headers) $(glib_enum_h) $(enum_tmpl_c)
+$(glib_enum_c): $(enum_headers) $(enum_tmpl_h) $(enum_tmpl_c)
 	$(AM_V_GEN)$(GLIB_MKENUMS) \
 		--template $(enum_tmpl_c) \
-	$(glib_enum_headers) > xgen-ec \
+	$(enum_headers) > xgen-ec \
 	&& cp -f xgen-ec $(glib_enum_c) \
 	&& rm -f xgen-ec

build/autotools/Makefile.am.gitignore

@@ -3,12 +3,14 @@
 # generator of Git ignore files, and it's not meant to be used as
 # the top-level Git ignore file generator.
 
+GIT_IGNORE_FILES = $(noinst_PROGRAMS) $(check_PROGRAMS) $(check_SCRIPTS) $(GIT_IGNORE_EXTRA)
+
 $(srcdir)/.gitignore: Makefile.am
 	$(QUIET_GEN)( \
 	  echo "*.o" ; \
 	  echo ".gitignore" ; \
 	) > $(srcdir)/.gitignore ; \
-	for p in $(noinst_PROGRAMS); do \
+	for p in $(GIT_IGNORE_FILES); do \
 		echo "/$$p" >> $(srcdir)/.gitignore ; \
 	done
 

build/autotools/Makefile.am.release

@@ -11,12 +11,12 @@ TAR_OPTIONS = --owner=0 --group=0
 #RELEASE_URL_BASE = http://source.clutter-project.org/sources/clutter
 #RELEASE_URL      = $(RELEASE_URL_BASE)/$(CLUTTER_MAJOR_VERSION).$(CLUTTER_MINOR_VERSION)
 
-RELEASE_ANNOUNCE_LIST = clutter-announce@clutter-project.org
+RELEASE_ANNOUNCE_LIST = clutter-list@gnome.org
 RELEASE_ANNOUNCE_CC   = gnome-announce-list@gnome.org
 
-RELEASE_DOC_URL = http://docs.clutter-project.org/docs/
+RELEASE_DOC_URL = https://developer.gnome.org
 
-BUGS_URL = http://bugzilla.gnome.org/enter_bug.cgi?product=clutter
+BUGS_URL = https://bugzilla.gnome.org/enter_bug.cgi?product=clutter
 
 tar_file    = $(distdir).tar.xz
 sha256_file = $(distdir).sha256sum
@@ -29,7 +29,7 @@ release-tag:
 	  echo "*** Cannot tag a Git version; please, update the Clutter version" >&2; \
 	else \
 	  if test -d "$(top_srcdir)/.git"; then \
-	    echo "  TAG    Tagging release $(CLUTTER_VERSION)..." ; \
+	    echo "  TAG      Tagging release $(CLUTTER_VERSION)..." ; \
 	    $(top_srcdir)/build/missing --run git tag \
 	 	-s \
 	      	-m "Clutter $(CLUTTER_VERSION) ($(CLUTTER_RELEASE_STATUS))" \
@@ -43,7 +43,7 @@ release-check: release-verify-even-micro release-verify-sane-changelogs release-
 	TAR_OPTIONS="$(TAR_OPTIONS)" $(MAKE) $(AM_MAKEFLAGS) distcheck
 
 release-verify-news:
-	@echo -n "  CHK    Checking that the NEWS file has been updated..."
+	@echo -n "  CHK      Checking that the NEWS file has been updated..."
 	@if ! grep -q "$(CLUTTER_VERSION)" $(top_srcdir)/NEWS; then \
 	  (echo "Ouch." && \
 	   echo "*** The version in the NEWS file does not match $(CLUTTER_VERSION)." && \
@@ -52,7 +52,7 @@ release-verify-news:
 	@echo "Good."
 
 release-verify-sane-changelogs: changelogs
-	@echo -n "  CHK    Checking that the ChangeLog files are sane..."
+	@echo -n "  CHK      Checking that the ChangeLog files are sane..."
 	@if grep -q "is required to generate" $(CHANGELOGS); then \
 	  (echo "Ouch." && \
 	   echo "*** Some of the ChangeLogs are not generated correctly." && \
@@ -60,7 +60,7 @@ release-verify-sane-changelogs: changelogs
 	@echo "Good."
 
 release-verify-even-micro:
-	@echo -n "  CHK    Checking that $(VERSION) has an even micro component..."
+	@echo -n "  CHK      Checking that $(VERSION) has an even micro component..."
 	@test "$(CLUTTER_MICRO_VERSION)" = "`echo $(CLUTTER_MICRO_VERSION)/2*2 | bc`" || \
 	  (echo "Ouch." && \
 	   echo "*** The version micro component '$(CLUTTER_MICRO_VERSION)' is not an even number." && \
@@ -69,10 +69,10 @@ release-verify-even-micro:
 	@echo "Good."
 
 release-upload: $(sha256_file)
-	@echo -n "  SCP    Uploading to master.gnome.org... "
+	@echo -n "  SCP      Uploading to master.gnome.org... "
 	@scp $(tar_file) master.gnome.org:
 	@echo "Done."
-	@echo -n "  EXEC   Running ftpadmin install... "
+	@echo -n "  EXEC     Running ftpadmin install... "
 	@ssh master.gnome.org ftpadmin install $(tar_file)
 	@mv -f $(sha256_file) $(top_builddir)/build/$(sha256_file)
 	@echo "Done."
@@ -128,7 +128,7 @@ release-message:
 	 else \
 	   echo "   Clutter: http://developer.gnome.org/clutter/stable/"; \
 	 fi
-	@echo "  Cookbook: $(RELEASE_DOC_URL)/clutter-cookbook/$(CLUTTER_API_VERSION)/"
+	@echo "  Cookbook: $(RELEASE_DOC_URL)/clutter-cookbook/$(CLUTTER_VERSION)/"
 	@echo ""
 	@echo "Release Notes:"
 	@if test "x$(CLUTTER_RELEASE_STATUS)" = "xsnapshot"; then \

build/autotools/Makefile.am.silent

@@ -4,16 +4,16 @@ QUIET_GEN = $(AM_V_GEN)
 
 QUIET_LN     = $(QUIET_LN_$(V))
 QUIET_LN_    = $(QUIET_LN_$(AM_DEFAULT_VERBOSITY))
-QUIET_LN_0   = @echo '  LN     '$@;
+QUIET_LN_0   = @echo '  LN       '$@;
 
 QUIET_RM     = $(QUIET_RM_$(V))
 QUIET_RM_    = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
-QUIET_RM_0   = @echo '  RM     '$@;
+QUIET_RM_0   = @echo '  RM       '$@;
 
 QUIET_SCAN   = $(QUIET_SCAN_$(V))
 QUIET_SCAN_  = $(QUIET_SCAN_$(AM_DEFAULT_VERBOSITY))
-QUIET_SCAN_0 = @echo '  GISCAN '$@;
+QUIET_SCAN_0 = @echo '  GISCAN   '$@;
 
 QUIET_COMP   = $(QUIET_COMP_$(V))
 QUIET_COMP_  = $(QUIET_COMP_$(AM_DEFAULT_VERBOSITY))
-QUIET_COMP_0 = @echo '  GICOMP '$@;
+QUIET_COMP_0 = @echo '  GICOMP   '$@;

build/autotools/glib-tap.mk

@@ -0,0 +1,134 @@
+# GLIB - Library of useful C routines
+
+TESTS_ENVIRONMENT= \
+	G_TEST_SRCDIR="$(abs_srcdir)" 		\
+	G_TEST_BUILDDIR="$(abs_builddir)" 	\
+	G_DEBUG=gc-friendly 			\
+	MALLOC_CHECK_=2 			\
+	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build/autotools/tap-driver.sh
+LOG_COMPILER = $(top_srcdir)/build/autotools/tap-test
+
+NULL =
+
+# initialize variables for unconditional += appending
+BUILT_SOURCES =
+BUILT_EXTRA_DIST =
+CLEANFILES = *.log *.trs
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
+EXTRA_DIST =
+TESTS =
+
+installed_test_LTLIBRARIES =
+installed_test_PROGRAMS =
+installed_test_SCRIPTS =
+nobase_installed_test_DATA =
+
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+noinst_SCRIPTS =
+noinst_DATA =
+
+check_LTLIBRARIES =
+check_PROGRAMS =
+check_SCRIPTS =
+check_DATA =
+
+# We support a fairly large range of possible variables.  It is expected that all types of files in a test suite
+# will belong in exactly one of the following variables.
+#
+# First, we support the usual automake suffixes, but in lowercase, with the customary meaning:
+#
+#   test_programs, test_scripts, test_data, test_ltlibraries
+#
+# The above are used to list files that are involved in both uninstalled and installed testing.  The
+# test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite.
+# Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is
+# installed in the same way as it appears in the package layout.
+#
+# In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled',
+# like so:
+#
+#   installed_test_programs, uninstalled_test_programs
+#   installed_test_scripts, uninstalled_test_scripts
+#   installed_test_data, uninstalled_test_data
+#   installed_test_ltlibraries, uninstalled_test_ltlibraries
+#
+# Additionally, we support 'extra' infixes for programs and scripts.  This is used for support programs/scripts
+# that should not themselves be run as testcases (but exist to be used from other testcases):
+#
+#   test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs
+#   test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts
+#
+# Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data
+# file automatically end up in the tarball.
+#
+#   dist_test_scripts, dist_test_data, dist_test_extra_scripts
+#   dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts
+#   dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts
+#
+# Note that no file is automatically disted unless it appears in one of the dist_ variables.  This follows the
+# standard automake convention of not disting programs scripts or data by default.
+#
+# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted
+# variants) will be run as part of the in-tree 'make check'.  These are all assumed to be runnable under
+# gtester.  That's a bit strange for scripts, but it's possible.
+
+TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
+         $(dist_test_scripts) $(dist_uninstalled_test_scripts)
+
+# Note: build even the installed-only targets during 'make check' to ensure that they still work.
+# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
+# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were
+# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'.
+all_test_programs     = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \
+                        $(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs)
+all_test_scripts      = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \
+                        $(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts)
+all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \
+                        $(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts)
+all_test_scripts     += $(all_dist_test_scripts)
+EXTRA_DIST           += $(all_dist_test_scripts)
+all_test_data         = $(test_data) $(uninstalled_test_data) $(installed_test_data)
+all_dist_test_data    = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data)
+all_test_data        += $(all_dist_test_data)
+EXTRA_DIST           += $(all_dist_test_data)
+all_test_ltlibs       = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries)
+
+if ENABLE_ALWAYS_BUILD_TESTS
+noinst_LTLIBRARIES += $(all_test_ltlibs)
+noinst_PROGRAMS += $(all_test_programs)
+noinst_SCRIPTS += $(all_test_scripts)
+noinst_DATA += $(all_test_data)
+else
+check_LTLIBRARIES += $(all_test_ltlibs)
+check_PROGRAMS += $(all_test_programs)
+check_SCRIPTS += $(all_test_scripts)
+check_DATA += $(all_test_data)
+endif
+
+if ENABLE_INSTALLED_TESTS
+installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \
+                          $(test_extra_programs) $(installed_test_extra_programs)
+installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \
+                          $(test_extra_scripts) $(test_installed_extra_scripts)
+installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \
+                          $(dist_installed_test_scripts) $(dist_installed_test_extra_scripts)
+nobase_installed_test_DATA += $(test_data) $(installed_test_data)
+nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data)
+installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries)
+installed_testcases = $(test_programs) $(installed_test_programs) \
+                      $(test_scripts) $(installed_test_scripts) \
+                      $(dist_test_scripts) $(dist_installed_test_scripts)
+
+installed_test_meta_DATA = $(installed_testcases:=.test)
+
+%.test: %$(EXEEXT) Makefile
+	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
+	echo 'Type=session' >> $@.tmp; \
+	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \
+	mv $@.tmp $@)
+
+CLEANFILES += $(installed_test_meta_DATA)
+endif

build/autotools/glibtests.m4

@@ -0,0 +1,28 @@
+dnl GLIB_TESTS
+dnl
+
+AC_DEFUN([GLIB_TESTS],
+[
+  AC_ARG_ENABLE(installed-tests,
+                AS_HELP_STRING([--enable-installed-tests],
+                               [Enable installation of some test cases]),
+                [case ${enableval} in
+                  yes) ENABLE_INSTALLED_TESTS="1"  ;;
+                  no)  ENABLE_INSTALLED_TESTS="" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;;
+                 esac])
+  AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1")
+  AC_ARG_ENABLE(always-build-tests,
+                AS_HELP_STRING([--enable-always-build-tests],
+                               [Enable always building tests during 'make all']),
+                [case ${enableval} in
+                  yes) ENABLE_ALWAYS_BUILD_TESTS="1"  ;;
+                  no)  ENABLE_ALWAYS_BUILD_TESTS="" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
+                 esac])
+  AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
+  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+    AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
+    AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
+  fi
+])

build/autotools/introspection.m4

@@ -41,6 +41,8 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
     ],dnl
     [auto],[dnl
         PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
+	dnl Canonicalize enable_introspection
+	enable_introspection=$found_introspection
     ],dnl
     [dnl	
         AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])

build/autotools/tap-driver.sh

@@ -0,0 +1,652 @@
+#! /bin/sh
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+scriptversion=2011-12-27.17; # UTC
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+me=tap-driver.sh
+
+fatal ()
+{
+  echo "$me: fatal: $*" >&2
+  exit 1
+}
+
+usage_error ()
+{
+  echo "$me: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  tap-driver.sh --test-name=NAME --log-file=PATH --trs-file=PATH
+                [--expect-failure={yes|no}] [--color-tests={yes|no}]
+                [--enable-hard-errors={yes|no}] [--ignore-exit]
+                [--diagnostic-string=STRING] [--merge|--no-merge]
+                [--comments|--no-comments] [--] TEST-COMMAND
+The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the result and output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=0
+color_tests=0
+merge=0
+ignore_exit=0
+comments=0
+diag_string='#'
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "$me $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) shift;; # No-op.
+  --merge) merge=1;;
+  --no-merge) merge=0;;
+  --ignore-exit) ignore_exit=1;;
+  --comments) comments=1;;
+  --no-comments) comments=0;;
+  --diagnostic-string) diag_string=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+test $# -gt 0 || usage_error "missing test command"
+
+case $expect_failure in
+  yes) expect_failure=1;;
+    *) expect_failure=0;;
+esac
+
+if test $color_tests = yes; then
+  init_colors='
+    color_map["red"]="" # Red.
+    color_map["grn"]="" # Green.
+    color_map["lgn"]="" # Light green.
+    color_map["blu"]="" # Blue.
+    color_map["mgn"]="" # Magenta.
+    color_map["std"]=""     # No color.
+    color_for_result["ERROR"] = "mgn"
+    color_for_result["PASS"]  = "grn"
+    color_for_result["XPASS"] = "red"
+    color_for_result["FAIL"]  = "red"
+    color_for_result["XFAIL"] = "lgn"
+    color_for_result["SKIP"]  = "blu"'
+else
+  init_colors=''
+fi
+
+# :; is there to work around a bug in bash 3.2 (and earlier) which
+# does not always set '$?' properly on redirection failure.
+# See the Autoconf manual for more details.
+:;{
+  (
+    # Ignore common signals (in this subshell only!), to avoid potential
+    # problems with Korn shells.  Some Korn shells are known to propagate
+    # to themselves signals that have killed a child process they were
+    # waiting for; this is done at least for SIGINT (and usually only for
+    # it, in truth).  Without the `trap' below, such a behaviour could
+    # cause a premature exit in the current subshell, e.g., in case the
+    # test command it runs gets terminated by a SIGINT.  Thus, the awk
+    # script we are piping into would never seen the exit status it
+    # expects on its last input line (which is displayed below by the
+    # last `echo $?' statement), and would thus die reporting an internal
+    # error.
+    # For more information, see the Autoconf manual and the threads:
+    # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
+    # <http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-February/004121.html>
+    trap : 1 3 2 13 15
+    if test $merge -gt 0; then
+      exec 2>&1
+    else
+      exec 2>&3
+    fi
+    "$@"
+    echo $?
+  ) | LC_ALL=C ${AM_TAP_AWK-awk} \
+        -v me="$me" \
+        -v test_script_name="$test_name" \
+        -v log_file="$log_file" \
+        -v trs_file="$trs_file" \
+        -v expect_failure="$expect_failure" \
+        -v merge="$merge" \
+        -v ignore_exit="$ignore_exit" \
+        -v comments="$comments" \
+        -v diag_string="$diag_string" \
+'
+# FIXME: the usages of "cat >&3" below could be optimized when using
+# FIXME: GNU awk, and/on on systems that supports /dev/fd/.
+
+# Implementation note: in what follows, `result_obj` will be an
+# associative array that (partly) simulates a TAP result object
+# from the `TAP::Parser` perl module.
+
+## ----------- ##
+##  FUNCTIONS  ##
+## ----------- ##
+
+function fatal(msg)
+{
+  print me ": " msg | "cat >&2"
+  exit 1
+}
+
+function abort(where)
+{
+  fatal("internal error " where)
+}
+
+# Convert a boolean to a "yes"/"no" string.
+function yn(bool)
+{
+  return bool ? "yes" : "no";
+}
+
+function add_test_result(result)
+{
+  if (!test_results_index)
+    test_results_index = 0
+  test_results_list[test_results_index] = result
+  test_results_index += 1
+  test_results_seen[result] = 1;
+}
+
+# Whether the test script should be re-run by "make recheck".
+function must_recheck()
+{
+  for (k in test_results_seen)
+    if (k != "XFAIL" && k != "PASS" && k != "SKIP")
+      return 1
+  return 0
+}
+
+# Whether the content of the log file associated to this test should
+# be copied into the "global" test-suite.log.
+function copy_in_global_log()
+{
+  for (k in test_results_seen)
+    if (k != "PASS")
+      return 1
+  return 0
+}
+
+# FIXME: this can certainly be improved ...
+function get_global_test_result()
+{
+    if ("ERROR" in test_results_seen)
+      return "ERROR"
+    if ("FAIL" in test_results_seen || "XPASS" in test_results_seen)
+      return "FAIL"
+    all_skipped = 1
+    for (k in test_results_seen)
+      if (k != "SKIP")
+        all_skipped = 0
+    if (all_skipped)
+      return "SKIP"
+    return "PASS";
+}
+
+function stringify_result_obj(result_obj)
+{
+  if (result_obj["is_unplanned"] || result_obj["number"] != testno)
+    return "ERROR"
+
+  if (plan_seen == LATE_PLAN)
+    return "ERROR"
+
+  if (result_obj["directive"] == "TODO")
+    return result_obj["is_ok"] ? "XPASS" : "XFAIL"
+
+  if (result_obj["directive"] == "SKIP")
+    return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL;
+
+  if (length(result_obj["directive"]))
+      abort("in function stringify_result_obj()")
+
+  return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL
+}
+
+function decorate_result(result)
+{
+  color_name = color_for_result[result]
+  if (color_name)
+    return color_map[color_name] "" result "" color_map["std"]
+  # If we are not using colorized output, or if we do not know how
+  # to colorize the given result, we should return it unchanged.
+  return result
+}
+
+function report(result, details)
+{
+  if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/)
+    {
+      msg = ": " test_script_name
+      add_test_result(result)
+    }
+  else if (result == "#")
+    {
+      msg = " " test_script_name ":"
+    }
+  else
+    {
+      abort("in function report()")
+    }
+  if (length(details))
+    msg = msg " " details
+  # Output on console might be colorized.
+  print decorate_result(result) msg
+  # Log the result in the log file too, to help debugging (this is
+  # especially true when said result is a TAP error or "Bail out!").
+  print result msg | "cat >&3";
+}
+
+function testsuite_error(error_message)
+{
+  report("ERROR", "- " error_message)
+}
+
+function handle_tap_result()
+{
+  details = result_obj["number"];
+  if (length(result_obj["description"]))
+    details = details " " result_obj["description"]
+
+  if (plan_seen == LATE_PLAN)
+    {
+      details = details " # AFTER LATE PLAN";
+    }
+  else if (result_obj["is_unplanned"])
+    {
+       details = details " # UNPLANNED";
+    }
+  else if (result_obj["number"] != testno)
+    {
+       details = sprintf("%s # OUT-OF-ORDER (expecting %d)",
+                         details, testno);
+    }
+  else if (result_obj["directive"])
+    {
+      details = details " # " result_obj["directive"];
+      if (length(result_obj["explanation"]))
+        details = details " " result_obj["explanation"]
+    }
+
+  report(stringify_result_obj(result_obj), details)
+}
+
+# `skip_reason` should be empty whenever planned > 0.
+function handle_tap_plan(planned, skip_reason)
+{
+  planned += 0 # Avoid getting confused if, say, `planned` is "00"
+  if (length(skip_reason) && planned > 0)
+    abort("in function handle_tap_plan()")
+  if (plan_seen)
+    {
+      # Error, only one plan per stream is acceptable.
+      testsuite_error("multiple test plans")
+      return;
+    }
+  planned_tests = planned
+  # The TAP plan can come before or after *all* the TAP results; we speak
+  # respectively of an "early" or a "late" plan.  If we see the plan line
+  # after at least one TAP result has been seen, assume we have a late
+  # plan; in this case, any further test result seen after the plan will
+  # be flagged as an error.
+  plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN)
+  # If testno > 0, we have an error ("too many tests run") that will be
+  # automatically dealt with later, so do not worry about it here.  If
+  # $plan_seen is true, we have an error due to a repeated plan, and that
+  # has already been dealt with above.  Otherwise, we have a valid "plan
+  # with SKIP" specification, and should report it as a particular kind
+  # of SKIP result.
+  if (planned == 0 && testno == 0)
+    {
+      if (length(skip_reason))
+        skip_reason = "- "  skip_reason;
+      report("SKIP", skip_reason);
+    }
+}
+
+function extract_tap_comment(line)
+{
+  if (index(line, diag_string) == 1)
+    {
+      # Strip leading `diag_string` from `line`.
+      line = substr(line, length(diag_string) + 1)
+      # And strip any leading and trailing whitespace left.
+      sub("^[ \t]*", "", line)
+      sub("[ \t]*$", "", line)
+      # Return what is left (if any).
+      return line;
+    }
+  return "";
+}
+
+# When this function is called, we know that line is a TAP result line,
+# so that it matches the (perl) RE "^(not )?ok\b".
+function setup_result_obj(line)
+{
+  # Get the result, and remove it from the line.
+  result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0)
+  sub("^(not )?ok[ \t]*", "", line)
+
+  # If the result has an explicit number, get it and strip it; otherwise,
+  # automatically assing the next progresive number to it.
+  if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/)
+    {
+      match(line, "^[0-9]+")
+      # The final `+ 0` is to normalize numbers with leading zeros.
+      result_obj["number"] = substr(line, 1, RLENGTH) + 0
+      line = substr(line, RLENGTH + 1)
+    }
+  else
+    {
+      result_obj["number"] = testno
+    }
+
+  if (plan_seen == LATE_PLAN)
+    # No further test results are acceptable after a "late" TAP plan
+    # has been seen.
+    result_obj["is_unplanned"] = 1
+  else if (plan_seen && testno > planned_tests)
+    result_obj["is_unplanned"] = 1
+  else
+    result_obj["is_unplanned"] = 0
+
+  # Strip trailing and leading whitespace.
+  sub("^[ \t]*", "", line)
+  sub("[ \t]*$", "", line)
+
+  # This will have to be corrected if we have a "TODO"/"SKIP" directive.
+  result_obj["description"] = line
+  result_obj["directive"] = ""
+  result_obj["explanation"] = ""
+
+  if (index(line, "#") == 0)
+    return # No possible directive, nothing more to do.
+
+  # Directives are case-insensitive.
+  rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*"
+
+  # See whether we have the directive, and if yes, where.
+  pos = match(line, rx "$")
+  if (!pos)
+    pos = match(line, rx "[^a-zA-Z0-9_]")
+
+  # If there was no TAP directive, we have nothing more to do.
+  if (!pos)
+    return
+
+  # Let`s now see if the TAP directive has been escaped.  For example:
+  #  escaped:     ok \# SKIP
+  #  not escaped: ok \\# SKIP
+  #  escaped:     ok \\\\\# SKIP
+  #  not escaped: ok \ # SKIP
+  if (substr(line, pos, 1) == "#")
+    {
+      bslash_count = 0
+      for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--)
+        bslash_count += 1
+      if (bslash_count % 2)
+        return # Directive was escaped.
+    }
+
+  # Strip the directive and its explanation (if any) from the test
+  # description.
+  result_obj["description"] = substr(line, 1, pos - 1)
+  # Now remove the test description from the line, that has been dealt
+  # with already.
+  line = substr(line, pos)
+  # Strip the directive, and save its value (normalized to upper case).
+  sub("^[ \t]*#[ \t]*", "", line)
+  result_obj["directive"] = toupper(substr(line, 1, 4))
+  line = substr(line, 5)
+  # Now get the explanation for the directive (if any), with leading
+  # and trailing whitespace removed.
+  sub("^[ \t]*", "", line)
+  sub("[ \t]*$", "", line)
+  result_obj["explanation"] = line
+}
+
+function get_test_exit_message(status)
+{
+  if (status == 0)
+    return ""
+  if (status !~ /^[1-9][0-9]*$/)
+    abort("getting exit status")
+  if (status < 127)
+    exit_details = ""
+  else if (status == 127)
+    exit_details = " (command not found?)"
+  else if (status >= 128 && status <= 255)
+    exit_details = sprintf(" (terminated by signal %d?)", status - 128)
+  else if (status > 256 && status <= 384)
+    # We used to report an "abnormal termination" here, but some Korn
+    # shells, when a child process die due to signal number n, can leave
+    # in $? an exit status of 256+n instead of the more standard 128+n.
+    # Apparently, both behaviours are allowed by POSIX (2008), so be
+    # prepared to handle them both.  See also Austing Group report ID
+    # 0000051 <http://www.austingroupbugs.net/view.php?id=51>
+    exit_details = sprintf(" (terminated by signal %d?)", status - 256)
+  else
+    # Never seen in practice.
+    exit_details = " (abnormal termination)"
+  return sprintf("exited with status %d%s", status, exit_details)
+}
+
+function write_test_results()
+{
+  print ":global-test-result: " get_global_test_result() > trs_file
+  print ":recheck: "  yn(must_recheck()) > trs_file
+  print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file
+  for (i = 0; i < test_results_index; i += 1)
+    print ":test-result: " test_results_list[i] > trs_file
+  close(trs_file);
+}
+
+BEGIN {
+
+## ------- ##
+##  SETUP  ##
+## ------- ##
+
+'"$init_colors"'
+
+# Properly initialized once the TAP plan is seen.
+planned_tests = 0
+
+COOKED_PASS = expect_failure ? "XPASS": "PASS";
+COOKED_FAIL = expect_failure ? "XFAIL": "FAIL";
+
+# Enumeration-like constants to remember which kind of plan (if any)
+# has been seen.  It is important that NO_PLAN evaluates "false" as
+# a boolean.
+NO_PLAN = 0
+EARLY_PLAN = 1
+LATE_PLAN = 2
+
+testno = 0     # Number of test results seen so far.
+bailed_out = 0 # Whether a "Bail out!" directive has been seen.
+
+# Whether the TAP plan has been seen or not, and if yes, which kind
+# it is ("early" is seen before any test result, "late" otherwise).
+plan_seen = NO_PLAN
+
+## --------- ##
+##  PARSING  ##
+## --------- ##
+
+is_first_read = 1
+
+while (1)
+  {
+    # Involutions required so that we are able to read the exit status
+    # from the last input line.
+    st = getline
+    if (st < 0) # I/O error.
+      fatal("I/O error while reading from input stream")
+    else if (st == 0) # End-of-input
+      {
+        if (is_first_read)
+          abort("in input loop: only one input line")
+        break
+      }
+    if (is_first_read)
+      {
+        is_first_read = 0
+        nextline = $0
+        continue
+      }
+    else
+      {
+        curline = nextline
+        nextline = $0
+        $0 = curline
+      }
+    # Copy any input line verbatim into the log file.
+    print | "cat >&3"
+    # Parsing of TAP input should stop after a "Bail out!" directive.
+    if (bailed_out)
+      continue
+
+    # TAP test result.
+    if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/)
+      {
+        testno += 1
+        setup_result_obj($0)
+        handle_tap_result()
+      }
+    # TAP plan (normal or "SKIP" without explanation).
+    else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/)
+      {
+        # The next two lines will put the number of planned tests in $0.
+        sub("^1\\.\\.", "")
+        sub("[^0-9]*$", "")
+        handle_tap_plan($0, "")
+        continue
+      }
+    # TAP "SKIP" plan, with an explanation.
+    else if ($0 ~ /^1\.\.0+[ \t]*#/)
+      {
+        # The next lines will put the skip explanation in $0, stripping
+        # any leading and trailing whitespace.  This is a little more
+        # tricky in truth, since we want to also strip a potential leading
+        # "SKIP" string from the message.
+        sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "")
+        sub("[ \t]*$", "");
+        handle_tap_plan(0, $0)
+      }
+    # "Bail out!" magic.
+    # Older versions of prove and TAP::Harness (e.g., 3.17) did not
+    # recognize a "Bail out!" directive when preceded by leading
+    # whitespace, but more modern versions (e.g., 3.23) do.  So we
+    # emulate the latter, "more modern" behaviour.
+    else if ($0 ~ /^[ \t]*Bail out!/)
+      {
+        bailed_out = 1
+        # Get the bailout message (if any), with leading and trailing
+        # whitespace stripped.  The message remains stored in `$0`.
+        sub("^[ \t]*Bail out![ \t]*", "");
+        sub("[ \t]*$", "");
+        # Format the error message for the
+        bailout_message = "Bail out!"
+        if (length($0))
+          bailout_message = bailout_message " " $0
+        testsuite_error(bailout_message)
+      }
+    # Maybe we have too look for dianogtic comments too.
+    else if (comments != 0)
+      {
+        comment = extract_tap_comment($0);
+        if (length(comment))
+          report("#", comment);
+      }
+  }
+
+## -------- ##
+##  FINISH  ##
+## -------- ##
+
+# A "Bail out!" directive should cause us to ignore any following TAP
+# error, as well as a non-zero exit status from the TAP producer.
+if (!bailed_out)
+  {
+    if (!plan_seen)
+      {
+        testsuite_error("missing test plan")
+      }
+    else if (planned_tests != testno)
+      {
+        bad_amount = testno > planned_tests ? "many" : "few"
+        testsuite_error(sprintf("too %s tests run (expected %d, got %d)",
+                                bad_amount, planned_tests, testno))
+      }
+    if (!ignore_exit)
+      {
+        # Fetch exit status from the last line.
+        exit_message = get_test_exit_message(nextline)
+        if (exit_message)
+          testsuite_error(exit_message)
+      }
+  }
+
+write_test_results()
+
+exit 0
+
+} # End of "BEGIN" block.
+'
+
+# TODO: document that we consume the file descriptor 3 :-(
+} 3>"$log_file"
+
+test $? -eq 0 || fatal "I/O or internal error"
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

build/autotools/tap-test

@@ -0,0 +1,5 @@
+#! /bin/sh
+
+# run a GTest in tap mode. The test binary is passed as $1
+
+$1 -k --tap

build/mingw/mingw-fetch-dependencies.sh

@@ -8,12 +8,15 @@
 TOR_URL="http://ftp.gnome.org/pub/gnome/binaries/win32";
 
 TOR_BINARIES=( \
-    glib/2.28/glib{-dev,}_2.28.1-1_win32.zip \
+    gtk+/2.16/gtk+{-dev,}_2.16.6-2_win32.zip );
-    gtk+/2.16/gtk+{-dev,}_2.16.6-2_win32.zip \
-    pango/1.28/pango{-dev,}_1.28.0-1_win32.zip );
 
 TOR_DEP_URL="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies";
 
+ZLIB_VERSION=1.2.4-2
+FFI_VERSION=3.0.6
+GLIB_VERSION=2.34.3
+GLIB_MINOR_VERSION="${GLIB_VERSION%.*}"
+
 TOR_DEPS=( \
     cairo{-dev,}_1.10.0-2_win32.zip \
     gettext-runtime-{dev-,}0.17-1.zip \
@@ -21,13 +24,17 @@ TOR_DEPS=( \
     freetype{-dev,}_2.3.12-1_win32.zip \
     expat_2.0.1-1_win32.zip \
     libpng{-dev,}_1.4.0-1_win32.zip \
-    zlib{-dev,}_1.2.4-2_win32.zip );
+    zlib{-dev,}_${ZLIB_VERSION}_win32.zip \
+    libffi{-dev,}_${FFI_VERSION}-1_win32.zip \
+    gettext-runtime{-dev,}_0.18.1.1-2_win32.zip );
 
 GNOME_SOURCES_URL="http://ftp.gnome.org/pub/GNOME/sources/"
 SOURCES_DEPS=(\
-    cogl/1.8/cogl-1.8.0.tar.bz2 \
+    glib/${GLIB_MINOR_VERSION}/glib-${GLIB_VERSION}.tar.xz \
-    json-glib/0.12/json-glib-0.12.2.tar.bz2 \
+    cogl/1.14/cogl-1.14.0.tar.xz \
-    atk/2.1/atk-2.1.91.tar.bz2 );
+    json-glib/0.16/json-glib-0.16.0.tar.xz \
+    atk/2.8/atk-2.8.0.tar.xz \
+    pango/1.34/pango-1.34.1.tar.xz );
 
 GL_HEADER_URLS=( \
     http://cgit.freedesktop.org/mesa/mesa/plain/include/GL/gl.h \
@@ -132,7 +139,7 @@ function do_untar_source_d ()
     local exdir="$1"; shift;
     local tarfile="$1"; shift;
 
-    tar -C "$exdir" -jxvf "$tarfile" "$@";
+    tar -C "$exdir" -axvf "$tarfile" "$@";
 
     if [ "$?" -ne 0 ]; then
 	echo "Failed to extract $tarfile";
@@ -185,13 +192,51 @@ function find_compiler ()
     echo "Using compiler ${MINGW_TOOL_PREFIX}gcc and target $TARGET";
 }
 
+function generate_pc_file ()
+{
+    local pcfile="$1"; shift;
+    local libs="$1"; shift;
+    local version="$1"; shift;
+    local include="$1"; shift;
+    local bn=`basename "$pcfile"`;
+
+    if test -z "$include"; then
+        include="\${prefix}/include";
+    fi;
+
+    if ! test -f "$pcfile"; then
+        cat > "$pcfile" <<EOF
+prefix=$ROOT_DIR
+exec_prefix=\${prefix}
+libdir=\${prefix}/lib
+sharedlibdir=\${libdir}
+includedir=$include
+
+Name: $bn
+Description: $bn
+
+Requires:
+Libs: -L\${libdir} $libs
+Cflags: -I\${includedir}
+Version: $version
+EOF
+    fi
+}
+
 function do_cross_compile ()
 {
     local dep="$1"; shift;
     local builddir="$BUILD_DIR/$dep";
 
     cd "$builddir"
-    ./configure --prefix="$ROOT_DIR" --host="$TARGET" --target="$TARGET" --build="`./config.guess`" CFLAGS="-mms-bitfields -I$ROOT_DIR/include" PKG_CONFIG="$RUN_PKG_CONFIG";
+    ./configure --prefix="$ROOT_DIR" \
+        --host="$TARGET" \
+        --target="$TARGET" \
+        --build="$build_config" \
+        CFLAGS="-mms-bitfields -I${ROOT_DIR}/include" \
+        LDFLAGS="-L${ROOT_DIR}/lib" \
+        PKG_CONFIG="$RUN_PKG_CONFIG" \
+        "$@";
 
     if [ "$?" -ne 0 ]; then
 	echo "Failed to configure $dep";
@@ -321,6 +366,13 @@ for header in "${GL_HEADERS[@]}"; do
     fi;
 done;
 
+# We need pkg-config files for zlib and ffi to build glib. The
+# prepackaged binaries from tml doesn't seem to include them so we'll
+# just generate it manually.
+generate_pc_file "$ROOT_DIR/lib/pkgconfig/zlib.pc" "-lz" "$ZLIB_VERSION"
+generate_pc_file "$ROOT_DIR/lib/pkgconfig/libffi.pc" "-lffi" "$FFI_VERSION" \
+    "${ROOT_DIR}/lib/libffi-${FFI_VERSION}/include"
+
 RUN_PKG_CONFIG="$BUILD_DIR/run-pkg-config.sh";
 
 echo "Generating $BUILD_DIR/run-pkg-config.sh";
@@ -356,8 +408,13 @@ build_config=`bash $DOWNLOAD_DIR/config.guess`;
 for dep in "${SOURCES_DEPS[@]}"; do
     echo "Building $dep...";
     src="${dep##*/}";
-    src="${src%%.tar.bz2}";
+    src="${src%%.tar.*}";
-    do_cross_compile "$src"
+
+    if echo "$src" | grep -q '^glib'; then
+        do_cross_compile "$src" --disable-modular-tests
+    else
+        do_cross_compile "$src"
+    fi;
 done;
 
 echo

build/win32/vs10/Makefile.am

@@ -14,14 +14,13 @@ EXTRA_DIST = \
 	clutter.vcxprojin	\
 	clutter.vcxproj.filters		\
 	clutter.vcxproj.filtersin	\
-	clutter.props		\
+	clutter-build-defines.props	\
+	clutter-gen-srcs.props	\
+	clutter-install.props	\
+	clutter-version-paths.props	\
 	install.vcxproj	\
 	test-cogl-perf.vcxproj		\
 	test-cogl-perf.vcxproj.filters		\
-	test-conformance-clutter.vcxproj		\
-	test-conformance-clutter.vcxprojin	\
-	test-conformance-clutter.vcxproj.filters		\
-	test-conformance-clutter.vcxproj.filtersin	\
 	test-interactive-clutter.vcxproj		\
 	test-interactive-clutter.vcxprojin	\
 	test-interactive-clutter.vcxproj.filters		\

build/win32/vs10/cally-atkcomponent-example.vcxproj

@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -169,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/cally-atkcomponent-example.vcxproj.filters

@@ -23,4 +23,4 @@
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/cally-atkeditabletext-example.vcxproj

@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -169,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters

@@ -23,4 +23,4 @@
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/cally-atkevents-example.vcxproj

@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -173,4 +177,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/cally-atkevents-example.vcxproj.filters

@@ -23,4 +23,4 @@
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/cally-atktext-example.vcxproj

@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -169,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/cally-atktext-example.vcxproj.filters

@@ -22,4 +22,4 @@
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/cally-clone-example.vcxproj

@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -169,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/cally-clone-example.vcxproj.filters

@@ -23,4 +23,4 @@
       <Filter>Headers</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/clutter-build-defines.props

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="clutter-version-paths.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <BaseWinBuildDef>_WIN32_WINNT=0x0501</BaseWinBuildDef>
+    <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;DLL_EXPORT</LibBuildDefines>
+    <DebugLibBuildDefines>$(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG</DebugLibBuildDefines>
+    <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
+    <ClutterBuildDefines>$(BaseWinBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_LOCALEDIR="../share/locale";CLUTTER_SYSCONFDIR="../etc";COGL_DISABLE_DEPRECATION_WARNINGS</ClutterBuildDefines>
+    <ClutterDisableDeprecationWarnings>CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS</ClutterDisableDeprecationWarnings>
+    <AvoidSDLMain>SDL_MAIN_HANDLED</AvoidSDLMain>
+    <CallyTestDefs>$(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir";$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)</CallyTestDefs>
+    <TestProgDef>$(BaseWinBuildDef);TESTS_DATADIR="../share/clutter-$(ApiVersion)/data";TESTS_DATA_DIR="../share/clutter-$(ApiVersion)/data";$(AvoidSDLMain)</TestProgDef>
+    <TestPerfProgDef>$(TestProgDef);$(ClutterDisableDeprecationWarnings)</TestPerfProgDef>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>clutterbuilddefinesprops</_PropertySheetDisplayName>
+    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\clutter;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cogl-pango-1.0.lib;cogl-path-1.0.lib;cogl-1.0.lib;glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="BaseWinBuildDef">
+      <Value>$(BaseWinBuildDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="LibBuildDefines">
+      <Value>$(LibBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="DebugLibBuildDefines">
+      <Value>$(DebugLibBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ReleaseLibBuildDefines">
+      <Value>$(ReleaseLibBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterBuildDefines">
+      <Value>$(ClutterBuildDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterDisableDeprecationWarnings">
+      <Value>$(ClutterDisableDeprecationWarnings)</Value>
+    </BuildMacro>
+    <BuildMacro Include="AvoidSDLMain">
+      <Value>$(AvoidSDLMain)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CallyTestDefs">
+      <Value>$(CallyTestDefs)</Value>
+    </BuildMacro>
+    <BuildMacro Include="TestProgDef">
+      <Value>$(TestProgDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="TestPerfProgDef">
+      <Value>$(TestPerfProgDef)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/win32/vs10/clutter-gen-srcs.props

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <CopyConfigH>copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h</CopyConfigH>
+    <CopyClutterConfigH>
+if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H
+
+if exist clutter.bld.GDK.win32 del clutter.bld.GDK.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
+    </CopyClutterConfigH>
+    <CopyClutterConfigGDKH>
+if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H
+
+if exist clutter.bld.win32.win32 del clutter.bld.win32.win32
+
+copy ..\..\..\clutter\clutter-config.h.win32_GDK clutter.bld.GDK.win32
+
+copy ..\..\..\clutter\clutter-config.h.win32_GDK ..\..\..\clutter\clutter-config.h
+
+
+:DONE_CLUTTER_CONFIG_H
+    </CopyClutterConfigGDKH>
+    <GenMarshalSrc>
+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --header ..\..\..\clutter\clutter-marshal.list &gt; ..\..\..\clutter\clutter-marshal.h
+
+
+echo #include "clutter-marshal.h" &gt; ..\..\..\clutter\clutter-marshal.c
+
+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --body ..\..\..\clutter\clutter-marshal.list &gt;&gt; ..\..\..\clutter\clutter-marshal.c
+    </GenMarshalSrc>
+    <EnumHeaders>..\..\..\clutter\clutter-action.h ..\..\..\clutter\clutter-actor-meta.h ..\..\..\clutter\clutter-actor.h ..\..\..\clutter\clutter-align-constraint.h ..\..\..\clutter\clutter-animatable.h ..\..\..\clutter\clutter-backend.h ..\..\..\clutter\clutter-bind-constraint.h ..\..\..\clutter\clutter-binding-pool.h ..\..\..\clutter\clutter-bin-layout.h ..\..\..\clutter\clutter-blur-effect.h ..\..\..\clutter\clutter-box-layout.h ..\..\..\clutter\clutter-brightness-contrast-effect.h ..\..\..\clutter\clutter-cairo.h ..\..\..\clutter\clutter-canvas.h ..\..\..\clutter\clutter-child-meta.h ..\..\..\clutter\clutter-click-action.h ..\..\..\clutter\clutter-cogl-compat.h ..\..\..\clutter\clutter-clone.h ..\..\..\clutter\clutter-color-static.h ..\..\..\clutter\clutter-color.h ..\..\..\clutter\clutter-colorize-effect.h ..\..\..\clutter\clutter-constraint.h ..\..\..\clutter\clutter-container.h ..\..\..\clutter\clutter-content.h ..\..\..\clutter\clutter-deform-effect.h ..\..\..\clutter\clutter-deprecated.h ..\..\..\clutter\clutter-desaturate-effect.h ..\..\..\clutter\clutter-device-manager.h ..\..\..\clutter\clutter-drag-action.h ..\..\..\clutter\clutter-drop-action.h ..\..\..\clutter\clutter-effect.h ..\..\..\clutter\clutter-enums.h ..\..\..\clutter\clutter-event.h ..\..\..\clutter\clutter-feature.h ..\..\..\clutter\clutter-fixed-layout.h ..\..\..\clutter\clutter-flow-layout.h ..\..\..\clutter\clutter-gesture-action.h ..\..\..\clutter\clutter-grid-layout.h ..\..\..\clutter\clutter-group.h ..\..\..\clutter\clutter-image.h ..\..\..\clutter\clutter-input-device.h ..\..\..\clutter\clutter-interval.h ..\..\..\clutter\clutter-keyframe-transition.h ..\..\..\clutter\clutter-keysyms.h ..\..\..\clutter\clutter-layout-manager.h ..\..\..\clutter\clutter-layout-meta.h ..\..\..\clutter\clutter-list-model.h ..\..\..\clutter\clutter-macros.h ..\..\..\clutter\clutter-main.h ..\..\..\clutter\clutter-model.h ..\..\..\clutter\clutter-offscreen-effect.h ..\..\..\clutter\clutter-page-turn-effect.h ..\..\..\clutter\clutter-paint-nodes.h ..\..\..\clutter\clutter-paint-node.h ..\..\..\clutter\clutter-pan-action.h ..\..\..\clutter\clutter-path-constraint.h ..\..\..\clutter\clutter-path.h ..\..\..\clutter\clutter-property-transition.h ..\..\..\clutter\clutter-rotate-action.h ..\..\..\clutter\clutter-script.h ..\..\..\clutter\clutter-scriptable.h ..\..\..\clutter\clutter-scroll-actor.h ..\..\..\clutter\clutter-settings.h ..\..\..\clutter\clutter-shader-effect.h ..\..\..\clutter\clutter-shader-types.h ..\..\..\clutter\clutter-swipe-action.h ..\..\..\clutter\clutter-snap-constraint.h ..\..\..\clutter\clutter-stage.h ..\..\..\clutter\clutter-stage-manager.h ..\..\..\clutter\clutter-tap-action.h ..\..\..\clutter\clutter-test-utils.h ..\..\..\clutter\clutter-texture.h ..\..\..\clutter\clutter-text.h ..\..\..\clutter\clutter-text-buffer.h ..\..\..\clutter\clutter-timeline.h ..\..\..\clutter\clutter-transition-group.h ..\..\..\clutter\clutter-transition.h ..\..\..\clutter\clutter-types.h ..\..\..\clutter\clutter-units.h ..\..\..\clutter\clutter-zoom-action.h ..\..\..\clutter\win32\clutter-win32.h</EnumHeaders>
+    <GdkEnumHeader>..\..\..\clutter\gdk\clutter-gdk.h</GdkEnumHeader>
+    <GenEnumsSrcH>perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) &gt; ..\..\..\clutter\clutter-enum-types.h</GenEnumsSrcH>
+    <GenEnumsSrcC>perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) &gt; ..\..\..\clutter\clutter-enum-types.c</GenEnumsSrcC>
+    <GenEnumsSrcGDKH>perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) $(GdkEnumHeader) &gt; ..\..\..\clutter\clutter-enum-types.h</GenEnumsSrcGDKH>
+    <GenEnumsSrcGDKC>perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) $(GdkEnumHeader) &gt; ..\..\..\clutter\clutter-enum-types.c</GenEnumsSrcGDKC>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>cluttergensrcsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="CopyConfigH">
+      <Value>$(CopyConfigH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyClutterConfigH">
+      <Value>$(CopyClutterConfigH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyClutterConfigGDKH">
+      <Value>$(CopyClutterConfigGDKH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenMarshalSrc">
+      <Value>$(GenMarshalSrc)</Value>
+    </BuildMacro>
+    <BuildMacro Include="EnumHeaders">
+      <Value>$(EnumHeaders)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkEnumHeader">
+      <Value>$(GdkEnumHeader)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenEnumsSrcH">
+      <Value>$(GenEnumsSrcC)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenEnumsSrcC">
+      <Value>$(GenEnumsSrcC)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenEnumsSrcGDKH">
+      <Value>$(GenEnumsSrcGDKH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenEnumsSrcGDKC">
+      <Value>$(GenEnumsSrcGDKC)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/win32/vs10/clutter-install.props

@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="clutter-build-defines.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
+    <InstalledDlls>$(BinDir)\$(ClutterDllPrefix)clutter(ClutterDllSuffix).dll</InstalledDlls>
+    <InstalledBins>$(BinDir)\cally-atkcomponent-example.exe;$(BinDir)\cally-atkeditabletext-example.exe;$(BinDir)\cally-atkevents-example.exe;$(BinDir)\cally-atktext-example.exe;$(BinDir)\cally-clone-example.exe;$(BinDir)\test-cogl-perf.exe;$(BinDir)\test-interactive-clutter.exe;$(BinDir)\test-picking-performance.exe;$(BinDir)\test-picking.exe;$(BinDir)\test-random-text.exe;$(BinDir)\test-state-hidden-performance.exe;$(BinDir)\test-state-interactive-performance.exe;$(BinDir)\test-state-mini-performance.exe;$(BinDir)\test-state-performance.exe;$(BinDir)\test-state-pick-performance.exe;$(BinDir)\test-text-perf-performance.exe;$(BinDir)\test-text-perf.exe;$(BinDir)\test-text.exe</InstalledBins>
+    <ClutterDoInstall>
+mkdir $(CopyDir)
+
+mkdir $(CopyDir)\bin
+
+mkdir $(CopyDir)\share\clutter-$(ApiVersion)\data
+
+copy $(BinDir)\*.dll $(CopyDir)\bin
+
+
+copy $(BinDir)\*.exe $(CopyDir)\bin
+
+copy ..\..\..\tests\interactive\*.png $(CopyDir)\share\clutter-$(ApiVersion)\data
+
+copy ..\..\..\tests\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ApiVersion)\data
+
+copy ..\..\..\tests\interactive\*.json $(CopyDir)\share\clutter-$(ApiVersion)\data
+
+
+
+mkdir $(CopyDir)\lib
+
+copy $(BinDir)\*-$(ApiVersion).lib $(CopyDir)\lib
+
+
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32
+
+if "$(Configuration)" == "Release" goto DO_INSTALL_COMMON_HEADERS
+if "$(Configuration)" == "Debug" goto DO_INSTALL_COMMON_HEADERS
+
+$(ClutterDoInstallGDK)
+
+:DO_INSTALL_COMMON_HEADERS
+
+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-keyframe-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-keysyms.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-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-tap-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter
+
+copy ..\..\..\clutter\clutter-test-utils.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
+
+
+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-table-layout.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
+
+
+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
+    </ClutterDoInstall>
+    <ClutterDoInstallGDK>
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk
+
+copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk
+    </ClutterDoInstallGDK>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>clutterinstallprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="BinDir">
+      <Value>$(BinDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledDlls">
+      <Value>$(InstalledDlls)</Value>
+    </BuildMacro>
+    <BuildMacro Include="InstalledBins">
+      <Value>$(InstalledBins)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterDoInstall">
+      <Value>$(ClutterDoInstall)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterDoInstallGDK">
+      <Value>$(ClutterDoInstallGDK)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/win32/vs10/clutter-version-paths.props

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <VSVer>10</VSVer>
+    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+    <ApiVersion>1.0</ApiVersion>
+    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+    <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
+    <ClutterLibtoolCompatibleDllPrefix>lib</ClutterLibtoolCompatibleDllPrefix>
+    <ClutterLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</ClutterLibtoolCompatibleDllSuffix>
+    <ClutterSeparateVSDllPrefix />
+    <ClutterSeparateVSDllSuffix>-1-vs$(VSVer)</ClutterSeparateVSDllSuffix>
+    <!-- Change the following 2 entries to ClutterLibtoolCompatibleDllPrefix
+         and ClutterLibtoolCompatibleDllSuffix if the use of LibTool-style
+         DLL names is desired -->
+    <ClutterDllPrefix>$(ClutterSeparateVSDllPrefix)</ClutterDllPrefix>
+    <ClutterDllSuffix>$(ClutterSeparateVSDllSuffix)</ClutterDllSuffix>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>clutterversionpathsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemGroup>
+    <BuildMacro Include="VSVer">
+      <Value>$(VSVer)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GlibEtcInstallRoot">
+      <Value>$(GlibEtcInstallRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyDir">
+      <Value>$(CopyDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="DefDir">
+      <Value>$(DefDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ApiVersion">
+      <Value>$(ApiVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterLibtoolCompatibleDllPrefix">
+      <Value>$(ClutterLibtoolCompatibleDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterLibtoolCompatibleDllSuffix">
+      <Value>$(ClutterLibtoolCompatibleDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterSeparateVSDllPrefix">
+      <Value>$(ClutterSeparateVSDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterSeparateVSDllSuffix">
+      <Value>$(ClutterSeparateVSDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterDllPrefix">
+      <Value>$(ClutterDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="ClutterDllSuffix">
+      <Value>$(ClutterDllSuffix)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/win32/vs10/clutter.props

@@ -1,531 +0,0 @@
-<?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>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
-    <BaseWinBuildDef>_WIN32_WINNT=0x0500</BaseWinBuildDef>
-    <BaseBuildDef>$(BaseWinBuildDef)</BaseBuildDef>
-    <LibBuildDefines>HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;COGL_HAS_WIN32_SUPPORT;CLUTTER_ENABLE_EXPERIMENTAL_API</LibBuildDefines>
-    <DebugLibBuildDefines>$(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG</DebugLibBuildDefines>
-    <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
-    <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>
-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 exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H
-
-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
-
-:DONE_CLUTTER_CONFIG_H
-    </PreBuildGDK>
-    <PreBuildCmd2>
-if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H
-
-cd ..\..\..\clutter
-
-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --header clutter-marshal.list &gt; clutter-marshal.h
-
-cd ..\build\win32\vs10
-
-:DONE_CLUTTER_MARSHAL_H
-
-
-if exist ..\..\..\clutter\clutter-marshal.c goto DONE_CLUTTER_MARSHAL_C
-
-cd ..\..\..\clutter
-
-echo #include "clutter-marshal.h" &gt; clutter-marshal.c
-
-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --body clutter-marshal.list &gt;&gt; clutter-marshal.c
-
-cd ..\build\win32\vs10
-
-:DONE_CLUTTER_MARSHAL_C
-
-
-cd ..
-
-gen-enums.bat $(GlibMkEnumsPath)
-
-cd .\vs10
-
-</PreBuildCmd2>
-<ClutterDoInstall>
-mkdir $(CopyDir)
-
-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
-
-copy ..\..\..\tests\data\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
-
-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
-
-
-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-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
-
-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-texture.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-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-keysyms.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-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-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
-
-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-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-script.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter
-
-copy ..\..\..\clutter\clutter-scriptable.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-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
-
-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-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\win32\clutter-win32.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32
-
-
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-actor.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-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-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-keysyms.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated
-
-copy ..\..\..\clutter\deprecated\clutter-main.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-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
-
-
-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
-
-
-</ClutterDoInstall>
-<ClutterDoInstallGDK>
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk
-
-copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk
-</ClutterDoInstallGDK>
-<ClutterDoInstallReleaseBin>
-mkdir $(CopyDir)\bin
-
-copy $(SolutionDir)Release\$(Platform)\bin\*.dll $(CopyDir)\bin
-
-copy $(SolutionDir)Release\$(Platform)\bin\*.exe $(CopyDir)\bin
-
-
-mkdir $(CopyDir)\lib
-
-copy $(SolutionDir)Release\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib
-</ClutterDoInstallReleaseBin>
-<ClutterDoInstallDebugBin>
-mkdir $(CopyDir)\bin
-
-copy $(SolutionDir)Debug\$(Platform)\bin\*.dll $(CopyDir)\bin
-
-copy $(SolutionDir)Debug\$(Platform)\bin\*.exe $(CopyDir)\bin
-
-
-mkdir $(CopyDir)\lib
-
-copy $(SolutionDir)Debug\$(Platform)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib
-</ClutterDoInstallDebugBin>
-    <GenerateClutterDef>
-         echo EXPORTS &gt; $(DefDir)\clutter.def
-
-         cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols &gt;&gt; $(DefDir)\clutter.def
-
-    </GenerateClutterDef>
-    <GenerateClutterGDKDef>
-         echo EXPORTS &gt; $(DefDir)\clutter.def
-
-         cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_WINDOWING_GDK -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols &gt;&gt; $(DefDir)\clutter.def
-
-    </GenerateClutterGDKDef>
-    <ClutterLibtoolCompatibleDllPrefix>lib</ClutterLibtoolCompatibleDllPrefix>
-    <ClutterLibtoolCompatibleDllSuffix>-$(ClutterApiVersion)-0</ClutterLibtoolCompatibleDllSuffix>
-    <ClutterSeparateVS10DllPrefix />
-    <ClutterSeparateVS10DllSuffix>-1-vs10</ClutterSeparateVS10DllSuffix>
-    <ClutterDllPrefix>$(ClutterSeparateVS10DllPrefix)</ClutterDllPrefix>
-    <ClutterDllSuffix>$(ClutterSeparateVS10DllSuffix)</ClutterDllSuffix>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>clutterprops</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;..\..\..\clutter;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>cogl-pango-1.0.lib;cogl-1.0.lib;glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <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>
-    <BuildMacro Include="BaseWinBuildDef">
-      <Value>$(BaseWinBuildDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="BaseBuildDef">
-      <Value>$(BaseBuildDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibBuildDefines">
-      <Value>$(LibBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="DebugLibBuildDefines">
-      <Value>$(DebugLibBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ReleaseLibBuildDefines">
-      <Value>$(ReleaseLibBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterBuildDefines">
-      <Value>$(ClutterBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CallyTestDefs">
-      <Value>$(CallyTestDefs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="TestProgDef">
-      <Value>$(TestProgDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDisableDeprecationWarnings">
-      <Value>$(ClutterDisableDeprecationWarnings)</Value>
-    </BuildMacro>
-    <BuildMacro Include="TestPerfProgDef">
-      <Value>$(TestPerfProgDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PreBuildGDK">
-      <Value>$(PreBuildGDK)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PreBuildWin">
-      <Value>$(PreBuildWin)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PreBuildCmd2">
-      <Value>$(PreBuildCmd2)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDoInstall">
-      <Value>$(ClutterDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDoInstallGDK">
-      <Value>$(ClutterDoInstallGDK)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDoInstallReleaseBin">
-      <Value>$(ClutterDoInstallReleaseBin)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDoInstallDebugBin">
-      <Value>$(ClutterDoInstallDebugBin)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateClutterDef">
-      <Value>$(GenerateClutterDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateClutterGDKDef">
-      <Value>$(GenerateClutterGDKDef)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterLibtoolCompatibleDllPrefix">
-      <Value>$(ClutterLibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterLibtoolCompatibleDllSuffix">
-      <Value>$(ClutterLibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterSeparateVS10DllPrefix">
-      <Value>$(ClutterSeparateVS10DllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterSeparateVS10DllSuffix">
-      <Value>$(ClutterSeparateVS10DllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDllPrefix">
-      <Value>$(ClutterDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ClutterDllSuffix">
-      <Value>$(ClutterDllSuffix)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>

build/win32/vs10/clutter.sln

@@ -37,8 +37,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkevents-example", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "cally-clone-example.vcxproj", "{E77D40D0-19D4-4865-BE20-B6DA05BA234D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-clutter", "test-conformance-clutter.vcxproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcxproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}"
@@ -343,22 +341,6 @@ Global
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|Win32.Build.0 = Release|Win32
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.ActiveCfg = Release|x64
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.Build.0 = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.Build.0 = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.Build.0 = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.ActiveCfg = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.Build.0 = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release|x64
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.Build.0 = Debug|Win32
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|x64.ActiveCfg = Debug|x64
@@ -375,18 +357,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.ActiveCfg = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug_GDK|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug_GDK|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.ActiveCfg = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release_GDK|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release_GDK|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

build/win32/vs10/clutter.vcxproj.filtersin

@@ -23,6 +23,14 @@
     <ClCompile Include="..\..\..\clutter\gdk\clutter-stage-gdk.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\clutter\cogl\clutter-stage-cogl.c"><Filter>Sources</Filter></ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\clutter\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-config.h.win32_GDK"><Filter>Resource Files</Filter></CustomBuild>
+    <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-enum-types.c.in"><Filter>Resource Files</Filter></CustomBuild>
+  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\clutter\win32\resources.rc">
       <Filter>Resource Files</Filter>

build/win32/vs10/clutter.vcxprojin

@@ -44,70 +44,78 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-gen-srcs.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" />
+    <Import Project="clutter-gen-srcs.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" />
+    <Import Project="clutter-gen-srcs.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" />
+    <Import Project="clutter-gen-srcs.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" />
+    <Import Project="clutter-gen-srcs.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" />
+    <Import Project="clutter-gen-srcs.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" />
+    <Import Project="clutter-gen-srcs.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" />
+    <Import Project="clutter-gen-srcs.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -126,11 +134,11 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,14 +148,10 @@
       <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)-$(ApiVersion).lib</ImportLibrary>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -155,11 +159,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">
     <PreBuildEvent>
-      <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -169,14 +173,10 @@
       <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)-$(ApiVersion).lib</ImportLibrary>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -184,11 +184,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -198,14 +198,10 @@
       <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)-$(ApiVersion).lib</ImportLibrary>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
@@ -213,11 +209,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">
     <PreBuildEvent>
-      <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -227,14 +223,10 @@
       <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)-$(ApiVersion).lib</ImportLibrary>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
@@ -242,12 +234,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>$(PreBuildWin)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -256,14 +248,10 @@
       <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)-$(ApiVersion).lib</ImportLibrary>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -273,12 +261,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">
     <PreBuildEvent>
-      <Command>$(PreBuildGDK)$(PreBuildCmd2)</Command>
+      <Command>$(DoConfigs)</Command>
     </PreBuildEvent>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -287,14 +275,10 @@
       <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)-$(ApiVersion).lib</ImportLibrary>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -304,10 +288,10 @@
   </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>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -315,14 +299,10 @@
       <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)-$(ApiVersion).lib</ImportLibrary>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -332,10 +312,10 @@
   </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>
+      <AdditionalIncludeDirectories>..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -343,14 +323,10 @@
       <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)-$(ApiVersion).lib</ImportLibrary>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -397,10 +373,144 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\clutter\config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying config.h from config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\clutter\config.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-config.h.win32_GDK">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">Copying clutter-config.h from clutter-config.h.win32_GDK...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(CopyClutterConfigGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">Copying clutter-config.h from clutter-config.h.win32_GDK...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(CopyClutterConfigGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">Copying clutter-config.h from clutter-config.h.win32_GDK...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(CopyClutterConfigGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">Copying clutter-config.h from clutter-config.h.win32_GDK...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(CopyClutterConfigGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying clutter-config.h from clutter-config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyClutterConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying clutter-config.h from clutter-config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyClutterConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying clutter-config.h from clutter-config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyClutterConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying clutter-config.h from clutter-config.h.win32...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyClutterConfigH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs)</Outputs>
+    </CustomBuild>
+    <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 Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(GenEnumsSrcGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenEnumsSrcH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">$(GenEnumsSrcGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenEnumsSrcH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">$(GenEnumsSrcGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenEnumsSrcH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">$(GenEnumsSrcGDKH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Enumeration Header...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenEnumsSrcH)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\clutter\clutter-enum-types.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\clutter\clutter-enum-types.c.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">$(GenEnumsSrcGDKC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|Win32'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenEnumsSrcC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\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'">$(GenEnumsSrcGDKC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_GDK|x64'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenEnumsSrcC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\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'">$(GenEnumsSrcGDKC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|Win32'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenEnumsSrcC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\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'">$(GenEnumsSrcGDKC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_GDK|x64'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Enumeration Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenEnumsSrcC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\clutter\clutter-enum-types.c;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\clutter\win32\resources.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

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>
@@ -43,128 +27,76 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <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>
+    <PlatformToolset>v100</PlatformToolset>
-  <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>
+    <PlatformToolset>v100</PlatformToolset>
-  <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>
+    <PlatformToolset>v100</PlatformToolset>
-  <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>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-install.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" />
+    <Import Project="clutter-install.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" />
+    <Import Project="clutter-install.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" />
+    <Import Project="clutter-install.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>
-    </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>
-    </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>
-    </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>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ClutterDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ClutterDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ClutterDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ClutterDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="cally-atkcomponent-example.vcxproj">
       <Project>{4b2c0ee0-f1bd-499c-acad-260cf14c352e}</Project>
@@ -194,10 +126,6 @@
       <Project>{0da94d83-b64e-40ac-8074-96c2416bbbe8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="test-conformance-clutter.vcxproj">
-      <Project>{0f08f253-de1a-40cb-a890-93ae3ca23ade}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="test-interactive-clutter.vcxproj">
       <Project>{75f9e5af-040c-448e-96be-c282efffe2d9}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -250,4 +178,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/test-cogl-perf.vcxproj

@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -71,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -89,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -113,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -131,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -163,4 +167,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/test-cogl-perf.vcxproj.filters

@@ -11,4 +11,4 @@
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-conformance-clutter.vcxproj.filtersin

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "testconformance.vs10.sourcefiles.filters"
-  </ItemGroup>
-</Project>

build/win32/vs10/test-conformance-clutter.vcxprojin

@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}</ProjectGuid>
-    <RootNamespace>testconformanceclutter</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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)'=='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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "testconformance.vs10.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

build/win32/vs10/test-interactive-clutter.vcxproj.filtersin

@@ -9,4 +9,4 @@
   <ItemGroup>
 #include "testinteractive.vs10.sourcefiles.filters"
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-interactive-clutter.vcxprojin

@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -169,4 +173,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/test-picking-performance.vcxproj

@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
+  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
+    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
+    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-  </ItemGroup>
+  </ItemGroup>
-  <PropertyGroup Label="Globals">
+  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2035D56A-E748-475F-B3D5-C123BF652143}</ProjectGuid>
+    <ProjectGuid>{2035D56A-E748-475F-B3D5-C123BF652143}</ProjectGuid>
-    <RootNamespace>testpickingperformance</RootNamespace>
+    <RootNamespace>testpickingperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
+    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  </PropertyGroup>
-    <ConfigurationType>Application</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <CharacterSet>MultiByte</CharacterSet>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
-    <CharacterSet>MultiByte</CharacterSet>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
-  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+    <ConfigurationType>Application</ConfigurationType>
-  <ImportGroup Label="ExtensionSettings">
+    <CharacterSet>MultiByte</CharacterSet>
-  </ImportGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+  </PropertyGroup>
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-    <Import Project="clutter.props" />
+  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-  <PropertyGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <Import Project="clutter-build-defines.props" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+  </ImportGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  <PropertyGroup Label="UserMacros" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  <PropertyGroup>
-  </PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <ClCompile>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-      <Optimization>Disabled</Optimization>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </PropertyGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <TargetMachine>MachineX86</TargetMachine>
+    </ClCompile>
-    </Link>
+    <Link>
-  </ItemDefinitionGroup>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      <SubSystem>Console</SubSystem>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <Optimization>Disabled</Optimization>
+    </Link>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </ItemDefinitionGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    <Link>
-      <DataExecutionPrevention>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      </DataExecutionPrevention>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
+      <SubSystem>Console</SubSystem>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </DataExecutionPrevention>
-    <ClCompile>
+      <TargetMachine>MachineX64</TargetMachine>
-      <Optimization>MaxSpeed</Optimization>
+    </Link>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+  </ItemDefinitionGroup>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
-      </PrecompiledHeader>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <OptimizeReferences>true</OptimizeReferences>
+    </ClCompile>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
+      <SubSystem>Console</SubSystem>
-  </ItemDefinitionGroup>
+      <OptimizeReferences>true</OptimizeReferences>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Link>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+  </ItemDefinitionGroup>
-      <PrecompiledHeader>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
+    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <OptimizeReferences>true</OptimizeReferences>
+    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <DataExecutionPrevention>
+      <SubSystem>Console</SubSystem>
-      </DataExecutionPrevention>
+      <OptimizeReferences>true</OptimizeReferences>
-      <TargetMachine>MachineX64</TargetMachine>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemGroup>
+      </DataExecutionPrevention>
-    <ClCompile Include="..\..\..\tests\performance\test-picking.c" />
+      <TargetMachine>MachineX64</TargetMachine>
-  </ItemGroup>
+    </Link>
-  <ItemGroup>
+  </ItemDefinitionGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  <ItemGroup>
-  </ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-picking.c" />
-  <ItemGroup>
+  </ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
+  <ItemGroup>
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+  </ItemGroup>
-    </ProjectReference>
+  <ItemGroup>
-  </ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-  <ImportGroup Label="ExtensionTargets">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-  </ImportGroup>
+    </ProjectReference>
-</Project>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/test-picking-performance.vcxproj.filters

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
+  <ItemGroup>
-    <Filter Include="Sources">
+    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Headers">
+    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
+    </Filter>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-picking.c">
+    <ClCompile Include="..\..\..\tests\performance\test-picking.c">
-      <Filter>Sources</Filter>
+      <Filter>Sources</Filter>
-    </ClCompile>
+    </ClCompile>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers</Filter>
-    </ClInclude>
+    </ClInclude>
-  </ItemGroup>
+  </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-picking.vcxproj

@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -71,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -90,7 +94,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -114,7 +118,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -132,7 +136,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -164,4 +168,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/test-picking.vcxproj.filters

@@ -11,4 +11,4 @@
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-random-text.vcxproj

@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -71,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -89,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -113,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -131,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -163,4 +167,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/test-random-text.vcxproj.filters

@@ -11,4 +11,4 @@
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-state-hidden-performance.vcxproj

@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
+  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
+    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
+    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-  </ItemGroup>
+  </ItemGroup>
-  <PropertyGroup Label="Globals">
+  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}</ProjectGuid>
+    <ProjectGuid>{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}</ProjectGuid>
-    <RootNamespace>teststatehiddenperformance</RootNamespace>
+    <RootNamespace>teststatehiddenperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
+    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  </PropertyGroup>
-    <ConfigurationType>Application</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <CharacterSet>MultiByte</CharacterSet>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
-    <CharacterSet>MultiByte</CharacterSet>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
-  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+    <ConfigurationType>Application</ConfigurationType>
-  <ImportGroup Label="ExtensionSettings">
+    <CharacterSet>MultiByte</CharacterSet>
-  </ImportGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+  </PropertyGroup>
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-    <Import Project="clutter.props" />
+  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-  <PropertyGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <Import Project="clutter-build-defines.props" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+  </ImportGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  <PropertyGroup Label="UserMacros" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  <PropertyGroup>
-  </PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <ClCompile>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-      <Optimization>Disabled</Optimization>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </PropertyGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <TargetMachine>MachineX86</TargetMachine>
+    </ClCompile>
-    </Link>
+    <Link>
-  </ItemDefinitionGroup>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      <SubSystem>Console</SubSystem>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <Optimization>Disabled</Optimization>
+    </Link>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </ItemDefinitionGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    <Link>
-      <DataExecutionPrevention>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      </DataExecutionPrevention>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
+      <SubSystem>Console</SubSystem>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </DataExecutionPrevention>
-    <ClCompile>
+      <TargetMachine>MachineX64</TargetMachine>
-      <Optimization>MaxSpeed</Optimization>
+    </Link>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+  </ItemDefinitionGroup>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
-      </PrecompiledHeader>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <OptimizeReferences>true</OptimizeReferences>
+    </ClCompile>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
+      <SubSystem>Console</SubSystem>
-  </ItemDefinitionGroup>
+      <OptimizeReferences>true</OptimizeReferences>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Link>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+  </ItemDefinitionGroup>
-      <PrecompiledHeader>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
+    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <OptimizeReferences>true</OptimizeReferences>
+    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <DataExecutionPrevention>
+      <SubSystem>Console</SubSystem>
-      </DataExecutionPrevention>
+      <OptimizeReferences>true</OptimizeReferences>
-      <TargetMachine>MachineX64</TargetMachine>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemGroup>
+      </DataExecutionPrevention>
-    <ClCompile Include="..\..\..\tests\performance\test-state-hidden.c" />
+      <TargetMachine>MachineX64</TargetMachine>
-  </ItemGroup>
+    </Link>
-  <ItemGroup>
+  </ItemDefinitionGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  <ItemGroup>
-  </ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-hidden.c" />
-  <ItemGroup>
+  </ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
+  <ItemGroup>
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+  </ItemGroup>
-    </ProjectReference>
+  <ItemGroup>
-  </ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-  <ImportGroup Label="ExtensionTargets">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-  </ImportGroup>
+    </ProjectReference>
-</Project>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/test-state-hidden-performance.vcxproj.filters

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
+  <ItemGroup>
-    <Filter Include="Sources">
+    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Headers">
+    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
+    </Filter>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-hidden.c">
+    <ClCompile Include="..\..\..\tests\performance\test-state-hidden.c">
-      <Filter>Sources</Filter>
+      <Filter>Sources</Filter>
-    </ClCompile>
+    </ClCompile>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers</Filter>
-    </ClInclude>
+    </ClInclude>
-  </ItemGroup>
+  </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-state-interactive-performance.vcxproj

@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
+  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
+    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
+    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-  </ItemGroup>
+  </ItemGroup>
-  <PropertyGroup Label="Globals">
+  <PropertyGroup Label="Globals">
-    <ProjectGuid>{011F9197-F986-44BD-A8F2-045C746B1B70}</ProjectGuid>
+    <ProjectGuid>{011F9197-F986-44BD-A8F2-045C746B1B70}</ProjectGuid>
-    <RootNamespace>teststateinteractiveperformance</RootNamespace>
+    <RootNamespace>teststateinteractiveperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
+    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  </PropertyGroup>
-    <ConfigurationType>Application</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <CharacterSet>MultiByte</CharacterSet>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
-    <CharacterSet>MultiByte</CharacterSet>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
-  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+    <ConfigurationType>Application</ConfigurationType>
-  <ImportGroup Label="ExtensionSettings">
+    <CharacterSet>MultiByte</CharacterSet>
-  </ImportGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+  </PropertyGroup>
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-    <Import Project="clutter.props" />
+  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-  <PropertyGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <Import Project="clutter-build-defines.props" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+  </ImportGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  <PropertyGroup Label="UserMacros" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  <PropertyGroup>
-  </PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <ClCompile>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-      <Optimization>Disabled</Optimization>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </PropertyGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <TargetMachine>MachineX86</TargetMachine>
+    </ClCompile>
-    </Link>
+    <Link>
-  </ItemDefinitionGroup>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      <SubSystem>Console</SubSystem>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <Optimization>Disabled</Optimization>
+    </Link>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </ItemDefinitionGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    <Link>
-      <DataExecutionPrevention>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      </DataExecutionPrevention>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
+      <SubSystem>Console</SubSystem>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </DataExecutionPrevention>
-    <ClCompile>
+      <TargetMachine>MachineX64</TargetMachine>
-      <Optimization>MaxSpeed</Optimization>
+    </Link>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+  </ItemDefinitionGroup>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
-      </PrecompiledHeader>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <OptimizeReferences>true</OptimizeReferences>
+    </ClCompile>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
+      <SubSystem>Console</SubSystem>
-  </ItemDefinitionGroup>
+      <OptimizeReferences>true</OptimizeReferences>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Link>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+  </ItemDefinitionGroup>
-      <PrecompiledHeader>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
+    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <OptimizeReferences>true</OptimizeReferences>
+    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <DataExecutionPrevention>
+      <SubSystem>Console</SubSystem>
-      </DataExecutionPrevention>
+      <OptimizeReferences>true</OptimizeReferences>
-      <TargetMachine>MachineX64</TargetMachine>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemGroup>
+      </DataExecutionPrevention>
-    <ClCompile Include="..\..\..\tests\performance\test-state-interactive.c" />
+      <TargetMachine>MachineX64</TargetMachine>
-  </ItemGroup>
+    </Link>
-  <ItemGroup>
+  </ItemDefinitionGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  <ItemGroup>
-  </ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-interactive.c" />
-  <ItemGroup>
+  </ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
+  <ItemGroup>
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+  </ItemGroup>
-    </ProjectReference>
+  <ItemGroup>
-  </ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-  <ImportGroup Label="ExtensionTargets">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-  </ImportGroup>
+    </ProjectReference>
-</Project>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/test-state-interactive-performance.vcxproj.filters

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
+  <ItemGroup>
-    <Filter Include="Sources">
+    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Headers">
+    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
+    </Filter>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-interactive.c">
+    <ClCompile Include="..\..\..\tests\performance\test-state-interactive.c">
-      <Filter>Sources</Filter>
+      <Filter>Sources</Filter>
-    </ClCompile>
+    </ClCompile>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers</Filter>
-    </ClInclude>
+    </ClInclude>
-  </ItemGroup>
+  </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-state-mini-performance.vcxproj

@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
+  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
+    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
+    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-  </ItemGroup>
+  </ItemGroup>
-  <PropertyGroup Label="Globals">
+  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}</ProjectGuid>
+    <ProjectGuid>{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}</ProjectGuid>
-    <RootNamespace>teststateminiperformance</RootNamespace>
+    <RootNamespace>teststateminiperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
+    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  </PropertyGroup>
-    <ConfigurationType>Application</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <CharacterSet>MultiByte</CharacterSet>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
-    <CharacterSet>MultiByte</CharacterSet>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
-  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+    <ConfigurationType>Application</ConfigurationType>
-  <ImportGroup Label="ExtensionSettings">
+    <CharacterSet>MultiByte</CharacterSet>
-  </ImportGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+  </PropertyGroup>
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-    <Import Project="clutter.props" />
+  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-  <PropertyGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <Import Project="clutter-build-defines.props" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+  </ImportGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  <PropertyGroup Label="UserMacros" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  <PropertyGroup>
-  </PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <ClCompile>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-      <Optimization>Disabled</Optimization>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </PropertyGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <TargetMachine>MachineX86</TargetMachine>
+    </ClCompile>
-    </Link>
+    <Link>
-  </ItemDefinitionGroup>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      <SubSystem>Console</SubSystem>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <Optimization>Disabled</Optimization>
+    </Link>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </ItemDefinitionGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    <Link>
-      <DataExecutionPrevention>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      </DataExecutionPrevention>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
+      <SubSystem>Console</SubSystem>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </DataExecutionPrevention>
-    <ClCompile>
+      <TargetMachine>MachineX64</TargetMachine>
-      <Optimization>MaxSpeed</Optimization>
+    </Link>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+  </ItemDefinitionGroup>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
-      </PrecompiledHeader>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <OptimizeReferences>true</OptimizeReferences>
+    </ClCompile>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
+      <SubSystem>Console</SubSystem>
-  </ItemDefinitionGroup>
+      <OptimizeReferences>true</OptimizeReferences>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Link>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+  </ItemDefinitionGroup>
-      <PrecompiledHeader>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
+    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <OptimizeReferences>true</OptimizeReferences>
+    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <DataExecutionPrevention>
+      <SubSystem>Console</SubSystem>
-      </DataExecutionPrevention>
+      <OptimizeReferences>true</OptimizeReferences>
-      <TargetMachine>MachineX64</TargetMachine>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemGroup>
+      </DataExecutionPrevention>
-    <ClCompile Include="..\..\..\tests\performance\test-state-mini.c" />
+      <TargetMachine>MachineX64</TargetMachine>
-  </ItemGroup>
+    </Link>
-  <ItemGroup>
+  </ItemDefinitionGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  <ItemGroup>
-  </ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-mini.c" />
-  <ItemGroup>
+  </ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
+  <ItemGroup>
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+  </ItemGroup>
-    </ProjectReference>
+  <ItemGroup>
-  </ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-  <ImportGroup Label="ExtensionTargets">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-  </ImportGroup>
+    </ProjectReference>
-</Project>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/test-state-mini-performance.vcxproj.filters

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
+  <ItemGroup>
-    <Filter Include="Sources">
+    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Headers">
+    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
+    </Filter>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-mini.c">
+    <ClCompile Include="..\..\..\tests\performance\test-state-mini.c">
-      <Filter>Sources</Filter>
+      <Filter>Sources</Filter>
-    </ClCompile>
+    </ClCompile>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers</Filter>
-    </ClInclude>
+    </ClInclude>
-  </ItemGroup>
+  </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-state-performance.vcxproj

@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
+  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
+    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
+    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-  </ItemGroup>
+  </ItemGroup>
-  <PropertyGroup Label="Globals">
+  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}</ProjectGuid>
+    <ProjectGuid>{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}</ProjectGuid>
-    <RootNamespace>teststateperformance</RootNamespace>
+    <RootNamespace>teststateperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
+    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  </PropertyGroup>
-    <ConfigurationType>Application</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <CharacterSet>MultiByte</CharacterSet>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
-    <CharacterSet>MultiByte</CharacterSet>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
-  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+    <ConfigurationType>Application</ConfigurationType>
-  <ImportGroup Label="ExtensionSettings">
+    <CharacterSet>MultiByte</CharacterSet>
-  </ImportGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+  </PropertyGroup>
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-    <Import Project="clutter.props" />
+  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-  <PropertyGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <Import Project="clutter-build-defines.props" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+  </ImportGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  <PropertyGroup Label="UserMacros" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  <PropertyGroup>
-  </PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <ClCompile>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-      <Optimization>Disabled</Optimization>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </PropertyGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <TargetMachine>MachineX86</TargetMachine>
+    </ClCompile>
-    </Link>
+    <Link>
-  </ItemDefinitionGroup>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      <SubSystem>Console</SubSystem>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <Optimization>Disabled</Optimization>
+    </Link>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </ItemDefinitionGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    <Link>
-      <DataExecutionPrevention>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      </DataExecutionPrevention>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
+      <SubSystem>Console</SubSystem>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </DataExecutionPrevention>
-    <ClCompile>
+      <TargetMachine>MachineX64</TargetMachine>
-      <Optimization>MaxSpeed</Optimization>
+    </Link>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+  </ItemDefinitionGroup>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
-      </PrecompiledHeader>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <OptimizeReferences>true</OptimizeReferences>
+    </ClCompile>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
+      <SubSystem>Console</SubSystem>
-  </ItemDefinitionGroup>
+      <OptimizeReferences>true</OptimizeReferences>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Link>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+  </ItemDefinitionGroup>
-      <PrecompiledHeader>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
+    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <OptimizeReferences>true</OptimizeReferences>
+    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <DataExecutionPrevention>
+      <SubSystem>Console</SubSystem>
-      </DataExecutionPrevention>
+      <OptimizeReferences>true</OptimizeReferences>
-      <TargetMachine>MachineX64</TargetMachine>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemGroup>
+      </DataExecutionPrevention>
-    <ClCompile Include="..\..\..\tests\performance\test-state.c" />
+      <TargetMachine>MachineX64</TargetMachine>
-  </ItemGroup>
+    </Link>
-  <ItemGroup>
+  </ItemDefinitionGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  <ItemGroup>
-  </ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state.c" />
-  <ItemGroup>
+  </ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
+  <ItemGroup>
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+  </ItemGroup>
-    </ProjectReference>
+  <ItemGroup>
-  </ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-  <ImportGroup Label="ExtensionTargets">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-  </ImportGroup>
+    </ProjectReference>
-</Project>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/test-state-performance.vcxproj.filters

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
+  <ItemGroup>
-    <Filter Include="Sources">
+    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Headers">
+    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
+    </Filter>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state.c">
+    <ClCompile Include="..\..\..\tests\performance\test-state.c">
-      <Filter>Sources</Filter>
+      <Filter>Sources</Filter>
-    </ClCompile>
+    </ClCompile>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers</Filter>
-    </ClInclude>
+    </ClInclude>
-  </ItemGroup>
+  </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-state-pick-performance.vcxproj

@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
+  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
+    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
+    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-  </ItemGroup>
+  </ItemGroup>
-  <PropertyGroup Label="Globals">
+  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0C1E8E6C-1563-4F95-A994-6366EE992CB3}</ProjectGuid>
+    <ProjectGuid>{0C1E8E6C-1563-4F95-A994-6366EE992CB3}</ProjectGuid>
-    <RootNamespace>teststatepickperformance</RootNamespace>
+    <RootNamespace>teststatepickperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
+    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  </PropertyGroup>
-    <ConfigurationType>Application</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <CharacterSet>MultiByte</CharacterSet>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
-    <CharacterSet>MultiByte</CharacterSet>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
-  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+    <ConfigurationType>Application</ConfigurationType>
-  <ImportGroup Label="ExtensionSettings">
+    <CharacterSet>MultiByte</CharacterSet>
-  </ImportGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+  </PropertyGroup>
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-    <Import Project="clutter.props" />
+  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-  <PropertyGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <Import Project="clutter-build-defines.props" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+  </ImportGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  <PropertyGroup Label="UserMacros" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  <PropertyGroup>
-  </PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <ClCompile>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-      <Optimization>Disabled</Optimization>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </PropertyGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <TargetMachine>MachineX86</TargetMachine>
+    </ClCompile>
-    </Link>
+    <Link>
-  </ItemDefinitionGroup>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      <SubSystem>Console</SubSystem>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <Optimization>Disabled</Optimization>
+    </Link>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </ItemDefinitionGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    <Link>
-      <DataExecutionPrevention>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      </DataExecutionPrevention>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
+      <SubSystem>Console</SubSystem>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </DataExecutionPrevention>
-    <ClCompile>
+      <TargetMachine>MachineX64</TargetMachine>
-      <Optimization>MaxSpeed</Optimization>
+    </Link>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+  </ItemDefinitionGroup>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
-      </PrecompiledHeader>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <OptimizeReferences>true</OptimizeReferences>
+    </ClCompile>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
+      <SubSystem>Console</SubSystem>
-  </ItemDefinitionGroup>
+      <OptimizeReferences>true</OptimizeReferences>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Link>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+  </ItemDefinitionGroup>
-      <PrecompiledHeader>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
+    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <OptimizeReferences>true</OptimizeReferences>
+    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <DataExecutionPrevention>
+      <SubSystem>Console</SubSystem>
-      </DataExecutionPrevention>
+      <OptimizeReferences>true</OptimizeReferences>
-      <TargetMachine>MachineX64</TargetMachine>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemGroup>
+      </DataExecutionPrevention>
-    <ClCompile Include="..\..\..\tests\performance\test-state-pick.c" />
+      <TargetMachine>MachineX64</TargetMachine>
-  </ItemGroup>
+    </Link>
-  <ItemGroup>
+  </ItemDefinitionGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  <ItemGroup>
-  </ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-state-pick.c" />
-  <ItemGroup>
+  </ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
+  <ItemGroup>
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+  </ItemGroup>
-    </ProjectReference>
+  <ItemGroup>
-  </ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-  <ImportGroup Label="ExtensionTargets">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-  </ImportGroup>
+    </ProjectReference>
-</Project>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/test-state-pick-performance.vcxproj.filters

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
+  <ItemGroup>
-    <Filter Include="Sources">
+    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Headers">
+    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
+    </Filter>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-state-pick.c">
+    <ClCompile Include="..\..\..\tests\performance\test-state-pick.c">
-      <Filter>Sources</Filter>
+      <Filter>Sources</Filter>
-    </ClCompile>
+    </ClCompile>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers</Filter>
-    </ClInclude>
+    </ClInclude>
-  </ItemGroup>
+  </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-text-perf-performance.vcxproj

@@ -1,169 +1,173 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
+  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
+    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
+    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
+    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
+      <Platform>Win32</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
+    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
+      <Platform>x64</Platform>
-    </ProjectConfiguration>
+    </ProjectConfiguration>
-  </ItemGroup>
+  </ItemGroup>
-  <PropertyGroup Label="Globals">
+  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8AF1EA8E-305B-42C0-919D-12B1843B21A4}</ProjectGuid>
+    <ProjectGuid>{8AF1EA8E-305B-42C0-919D-12B1843B21A4}</ProjectGuid>
-    <RootNamespace>testtextperfperformance</RootNamespace>
+    <RootNamespace>testtextperfperformance</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
+    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
+  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  </PropertyGroup>
-    <ConfigurationType>Application</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <CharacterSet>MultiByte</CharacterSet>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
-    <CharacterSet>MultiByte</CharacterSet>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
+    <CharacterSet>MultiByte</CharacterSet>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
-  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+    <ConfigurationType>Application</ConfigurationType>
-  <ImportGroup Label="ExtensionSettings">
+    <CharacterSet>MultiByte</CharacterSet>
-  </ImportGroup>
+    <PlatformToolset>v100</PlatformToolset>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+  </PropertyGroup>
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-    <Import Project="clutter.props" />
+  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <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="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="clutter.props" />
+    <Import Project="clutter-build-defines.props" />
-  </ImportGroup>
+  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-  <PropertyGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <Import Project="clutter-build-defines.props" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+  </ImportGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  <PropertyGroup Label="UserMacros" />
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  <PropertyGroup>
-  </PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <ClCompile>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-      <Optimization>Disabled</Optimization>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </PropertyGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <TargetMachine>MachineX86</TargetMachine>
+    </ClCompile>
-    </Link>
+    <Link>
-  </ItemDefinitionGroup>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      <SubSystem>Console</SubSystem>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <Optimization>Disabled</Optimization>
+    </Link>
-      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  </ItemDefinitionGroup>
-      <MinimalRebuild>true</MinimalRebuild>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>
+      <PreprocessorDefinitions>_DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      </PrecompiledHeader>
+      <MinimalRebuild>true</MinimalRebuild>
-      <WarningLevel>Level3</WarningLevel>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+    <Link>
-      <DataExecutionPrevention>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      </DataExecutionPrevention>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
+      <SubSystem>Console</SubSystem>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </DataExecutionPrevention>
-    <ClCompile>
+      <TargetMachine>MachineX64</TargetMachine>
-      <Optimization>MaxSpeed</Optimization>
+    </Link>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+  </ItemDefinitionGroup>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>MaxSpeed</Optimization>
-      <PrecompiledHeader>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
-      </PrecompiledHeader>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
+      <PrecompiledHeader>
-    <Link>
+      </PrecompiledHeader>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <WarningLevel>Level3</WarningLevel>
-      <SubSystem>Console</SubSystem>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <OptimizeReferences>true</OptimizeReferences>
+    </ClCompile>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
+      <SubSystem>Console</SubSystem>
-  </ItemDefinitionGroup>
+      <OptimizeReferences>true</OptimizeReferences>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    <ClCompile>
+      <TargetMachine>MachineX86</TargetMachine>
-      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Link>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+  </ItemDefinitionGroup>
-      <PrecompiledHeader>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
+    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
+      <PreprocessorDefinitions>$(TestPerfProgDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <CompileAs>CompileAsC</CompileAs>
+      <PrecompiledHeader>
-    </ClCompile>
+      </PrecompiledHeader>
-    <Link>
+      <WarningLevel>Level3</WarningLevel>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <CompileAs>CompileAsC</CompileAs>
-      <SubSystem>Console</SubSystem>
+    </ClCompile>
-      <OptimizeReferences>true</OptimizeReferences>
+    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <DataExecutionPrevention>
+      <SubSystem>Console</SubSystem>
-      </DataExecutionPrevention>
+      <OptimizeReferences>true</OptimizeReferences>
-      <TargetMachine>MachineX64</TargetMachine>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-  </ItemDefinitionGroup>
+      <DataExecutionPrevention>
-  <ItemGroup>
+      </DataExecutionPrevention>
-    <ClCompile Include="..\..\..\tests\performance\test-text-perf.c" />
+      <TargetMachine>MachineX64</TargetMachine>
-  </ItemGroup>
+    </Link>
-  <ItemGroup>
+  </ItemDefinitionGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
+  <ItemGroup>
-  </ItemGroup>
+    <ClCompile Include="..\..\..\tests\performance\test-text-perf.c" />
-  <ItemGroup>
+  </ItemGroup>
-    <ProjectReference Include="clutter.vcxproj">
+  <ItemGroup>
-      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
+    <ClInclude Include="..\..\..\tests\performance\test-common.h" />
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+  </ItemGroup>
-    </ProjectReference>
+  <ItemGroup>
-  </ItemGroup>
+    <ProjectReference Include="clutter.vcxproj">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+      <Project>{ea036190-0950-4640-84f9-d459a33b33a8}</Project>
-  <ImportGroup Label="ExtensionTargets">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-  </ImportGroup>
+    </ProjectReference>
-</Project>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/test-text-perf-performance.vcxproj.filters

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
+  <ItemGroup>
-    <Filter Include="Sources">
+    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Headers">
+    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
+    </Filter>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClCompile Include="..\..\..\tests\performance\test-text-perf.c">
+    <ClCompile Include="..\..\..\tests\performance\test-text-perf.c">
-      <Filter>Sources</Filter>
+      <Filter>Sources</Filter>
-    </ClCompile>
+    </ClCompile>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClInclude Include="..\..\..\tests\performance\test-common.h">
+    <ClInclude Include="..\..\..\tests\performance\test-common.h">
-      <Filter>Headers</Filter>
+      <Filter>Headers</Filter>
-    </ClInclude>
+    </ClInclude>
-  </ItemGroup>
+  </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-text-perf.vcxproj

@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -71,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -89,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -113,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -131,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -163,4 +167,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/test-text-perf.vcxproj.filters

@@ -11,4 +11,4 @@
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/test-text.vcxproj

@@ -28,38 +28,42 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.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" />
+    <Import Project="clutter-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -71,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -89,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -113,7 +117,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -131,7 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -163,4 +167,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs10/test-text.vcxproj.filters

@@ -11,4 +11,4 @@
       <Filter>Sources</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs9/Makefile.am

@@ -7,11 +7,12 @@ EXTRA_DIST = \
 	clutter.sln			\
 	clutter.vcproj		\
 	clutter.vcprojin	\
-	clutter.vsprops		\
+	clutter-build-defines.vsprops	\
+	clutter-gen-srcs.vsprops	\
+	clutter-install.vsprops	\
+	clutter-version-paths.vsprops	\
 	install.vcproj	\
 	test-cogl-perf.vcproj		\
-	test-conformance-clutter.vcproj		\
-	test-conformance-clutter.vcprojin	\
 	test-interactive-clutter.vcproj		\
 	test-interactive-clutter.vcprojin	\
 	test-picking.vcproj		\

build/win32/vs9/cally-atkcomponent-example.vcproj

@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -82,7 +82,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>

build/win32/vs9/cally-atkeditabletext-example.vcproj

@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -82,7 +82,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>

build/win32/vs9/cally-atkevents-example.vcproj

@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -52,7 +52,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -84,7 +84,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -118,7 +118,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>

build/win32/vs9/cally-atktext-example.vcproj

@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -82,7 +82,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>

build/win32/vs9/cally-clone-example.vcproj

@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -82,7 +82,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -115,7 +115,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>

build/win32/vs9/clutter-build-defines.vsprops

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="clutterbuilddefinesprops"
+	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+	InheritedPropertySheets=".\clutter-version-paths.vsprops"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="..\..\..;..\..\..\clutter;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include"
+		PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES"
+		ForcedIncludeFiles="msvc_recommended_pragmas.h"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="cogl-pango-1.0.lib cogl-path-1.0.lib cogl-1.0.lib glib-2.0.lib gobject-2.0.lib"
+		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
+	/>
+	<UserMacro
+		Name="BaseWinBuildDef"
+		Value="_WIN32_WINNT=0x0501"
+	/>
+	<UserMacro
+		Name="ClutterBuildDefines"
+		Value="$(BaseWinBuildDef);G_LOG_DOMAIN=\&quot;Clutter\&quot;;CLUTTER_LOCALEDIR=\&quot;../share/locale\&quot;;CLUTTER_SYSCONFDIR=\&quot;../etc\&quot;;COGL_DISABLE_DEPRECATION_WARNINGS"
+	/>
+	<UserMacro
+		Name="ClutterDisableDeprecationWarnings"
+		Value="CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS"
+	/>
+	<UserMacro
+		Name="AvoidSDLMain"
+		Value="SDL_MAIN_HANDLED"
+	/>
+	<UserMacro
+		Name="CallyTestDefs"
+		Value="$(BaseWinBuildDef);PREFIXDIR=\&quot;/some/dummy/dir\&quot;;$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
+	/>
+	<UserMacro
+		Name="TestProgDef"
+		Value="$(BaseWinBuildDef);TESTS_DATADIR=\&quot;../share/clutter-$(ApiVersion)/data\&quot;;TESTS_DATA_DIR=\&quot;../share/clutter-$(ApiVersion)/data\&quot;;$(AvoidSDLMain)"
+	/>
+	<UserMacro
+		Name="TestPerfProgDef"
+		Value="$(TestProgDef);$(ClutterDisableDeprecationWarnings)"
+	/>
+	<UserMacro
+		Name="LibBuildDefines"
+		Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;DLL_EXPORT"
+	/>
+	<UserMacro
+		Name="DebugLibBuildDefines"
+		Value="$(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG"
+	/>
+	<UserMacro
+		Name="ReleaseLibBuildDefines"
+		Value="$(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS"
+	/>
+</VisualStudioPropertySheet>

build/win32/vs9/clutter-gen-srcs.vsprops

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="cluttergensrcsprops"
+	InheritedPropertySheets=".\clutter-build-defines.vsprops"
+	>
+	<UserMacro
+		Name="CopyConfigH"
+		Value="copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h"
+	/>
+	<UserMacro
+		Name="CopyClutterConfigH"
+		Value="
+if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
+if exist clutter.bld.GDK.win32 del clutter.bld.GDK.win32&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-config.h.win32 clutter.bld.win32.win32&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h&#x0D;&#x0A;
+
+:DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
+		      "
+	/>
+	<UserMacro
+		Name="CopyClutterConfigGDKH"
+		Value="
+if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
+if exist clutter.bld.win32.win32 del clutter.bld.win32.win32&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-config.h.win32_GDK clutter.bld.GDK.win32&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-config.h.win32_GDK ..\..\..\clutter\clutter-config.h&#x0D;&#x0A;
+
+:DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
+			  "
+	/>
+	<UserMacro
+		Name="GenMarshalSrc"
+		Value="
+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --header ..\..\..\clutter\clutter-marshal.list &gt; ..\..\..\clutter\clutter-marshal.h&#x0D;&#x0A;
+
+echo #include &quot;clutter-marshal.h&quot; &gt; ..\..\..\clutter\clutter-marshal.c&#x0D;&#x0A;
+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --body ..\..\..\clutter\clutter-marshal.list &gt;&gt; ..\..\..\clutter\clutter-marshal.c&#x0D;&#x0A;
+		       "
+	/>
+	<UserMacro
+		Name="EnumHeaders"
+		Value="..\..\..\clutter\clutter-action.h ..\..\..\clutter\clutter-actor-meta.h ..\..\..\clutter\clutter-actor.h ..\..\..\clutter\clutter-align-constraint.h ..\..\..\clutter\clutter-animatable.h ..\..\..\clutter\clutter-backend.h ..\..\..\clutter\clutter-bind-constraint.h ..\..\..\clutter\clutter-binding-pool.h ..\..\..\clutter\clutter-bin-layout.h ..\..\..\clutter\clutter-blur-effect.h ..\..\..\clutter\clutter-box-layout.h ..\..\..\clutter\clutter-brightness-contrast-effect.h ..\..\..\clutter\clutter-cairo.h ..\..\..\clutter\clutter-canvas.h ..\..\..\clutter\clutter-child-meta.h ..\..\..\clutter\clutter-click-action.h ..\..\..\clutter\clutter-cogl-compat.h ..\..\..\clutter\clutter-clone.h ..\..\..\clutter\clutter-color-static.h ..\..\..\clutter\clutter-color.h ..\..\..\clutter\clutter-colorize-effect.h ..\..\..\clutter\clutter-constraint.h ..\..\..\clutter\clutter-container.h ..\..\..\clutter\clutter-content.h ..\..\..\clutter\clutter-deform-effect.h ..\..\..\clutter\clutter-deprecated.h ..\..\..\clutter\clutter-desaturate-effect.h ..\..\..\clutter\clutter-device-manager.h ..\..\..\clutter\clutter-drag-action.h ..\..\..\clutter\clutter-drop-action.h ..\..\..\clutter\clutter-effect.h ..\..\..\clutter\clutter-enums.h ..\..\..\clutter\clutter-event.h ..\..\..\clutter\clutter-feature.h ..\..\..\clutter\clutter-fixed-layout.h ..\..\..\clutter\clutter-flow-layout.h ..\..\..\clutter\clutter-gesture-action.h ..\..\..\clutter\clutter-grid-layout.h ..\..\..\clutter\clutter-group.h ..\..\..\clutter\clutter-image.h ..\..\..\clutter\clutter-input-device.h ..\..\..\clutter\clutter-interval.h ..\..\..\clutter\clutter-keyframe-transition.h ..\..\..\clutter\clutter-keysyms.h ..\..\..\clutter\clutter-layout-manager.h ..\..\..\clutter\clutter-layout-meta.h ..\..\..\clutter\clutter-list-model.h ..\..\..\clutter\clutter-macros.h ..\..\..\clutter\clutter-main.h ..\..\..\clutter\clutter-model.h ..\..\..\clutter\clutter-offscreen-effect.h ..\..\..\clutter\clutter-page-turn-effect.h ..\..\..\clutter\clutter-paint-nodes.h ..\..\..\clutter\clutter-paint-node.h ..\..\..\clutter\clutter-pan-action.h ..\..\..\clutter\clutter-path-constraint.h ..\..\..\clutter\clutter-path.h ..\..\..\clutter\clutter-property-transition.h ..\..\..\clutter\clutter-rotate-action.h ..\..\..\clutter\clutter-script.h ..\..\..\clutter\clutter-scriptable.h ..\..\..\clutter\clutter-scroll-actor.h ..\..\..\clutter\clutter-settings.h ..\..\..\clutter\clutter-shader-effect.h ..\..\..\clutter\clutter-shader-types.h ..\..\..\clutter\clutter-swipe-action.h ..\..\..\clutter\clutter-snap-constraint.h ..\..\..\clutter\clutter-stage.h ..\..\..\clutter\clutter-stage-manager.h ..\..\..\clutter\clutter-tap-action.h ..\..\..\clutter\clutter-test-utils.h ..\..\..\clutter\clutter-texture.h ..\..\..\clutter\clutter-text.h ..\..\..\clutter\clutter-text-buffer.h ..\..\..\clutter\clutter-timeline.h ..\..\..\clutter\clutter-transition-group.h ..\..\..\clutter\clutter-transition.h ..\..\..\clutter\clutter-types.h ..\..\..\clutter\clutter-units.h ..\..\..\clutter\clutter-zoom-action.h ..\..\..\clutter\win32\clutter-win32.h"
+	/>
+	<UserMacro
+		Name="GdkEnumHeader"
+		Value="..\..\..\clutter\gdk\clutter-gdk.h"
+	/>
+	<UserMacro
+		Name="GenEnumsSrcH"
+		Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) &gt; ..\..\..\clutter\clutter-enum-types.h"
+	/>
+	<UserMacro
+		Name="GenEnumsSrcC"
+		Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) &gt; ..\..\..\clutter\clutter-enum-types.c"
+	/>
+	<UserMacro
+		Name="GenEnumsSrcGDKH"
+		Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) $(GdkEnumHeader) &gt; ..\..\..\clutter\clutter-enum-types.h"
+	/>
+	<UserMacro
+		Name="GenEnumsSrcGDKC"
+		Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) $(GdkEnumHeader) &gt; ..\..\..\clutter\clutter-enum-types.c"
+	/>
+</VisualStudioPropertySheet>

build/win32/vs9/clutter-install.vsprops

@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="clutterinstallprops"
+	InheritedPropertySheets=".\clutter-build-defines.vsprops"
+	>
+	<UserMacro
+		Name="ClutterDoInstall"
+		Value="
+mkdir $(CopyDir)&#x0D;&#x0A;
+mkdir $(CopyDir)\bin&#x0D;&#x0A;
+mkdir $(CopyDir)\share\clutter-$(ApiVersion)\data&#x0D;&#x0A;
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
+
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
+copy ..\..\..\tests\interactive\*.png $(CopyDir)\share\clutter-$(ApiVersion)\data&#x0D;&#x0A;
+copy ..\..\..\tests\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ApiVersion)\data&#x0D;&#x0A;
+copy ..\..\..\tests\interactive\*.json $(CopyDir)\share\clutter-$(ApiVersion)\data&#x0D;&#x0A;
+
+mkdir $(CopyDir)\lib&#x0D;&#x0A;
+copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+
+if &quot;$(ConfigurationName)&quot; == &quot;Release&quot; goto DO_INSTALL_COMMON_HEADERS&#x0D;&#x0A;
+if &quot;$(ConfigurationName)&quot; == &quot;Debug&quot; goto DO_INSTALL_COMMON_HEADERS&#x0D;&#x0A;
+
+$(ClutterDoInstallGDK)
+
+:DO_INSTALL_COMMON_HEADERS&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32&#x0D;&#x0A;
+
+copy ..\..\..\clutter\clutter.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-actor-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-align-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-animatable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-backend.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-bind-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-binding-pool.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-blur-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-box-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-brightness-contrast-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-cairo.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-canvas.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-child-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-click-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-cogl-compat.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-color-static.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-color.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-colorize-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-config.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-content.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-container.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-deform-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-deprecated.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-desaturate-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-device-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-drag-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-drop-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-enums.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-enum-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-event.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-feature.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-fixed-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-flow-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-gesture-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-grid-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-image.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-input-device.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-interval.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-layout-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-layout-meta.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-list-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-keyframe-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-keysyms.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-macros.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-model.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-offscreen-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-page-turn-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-paint-node.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-paint-nodes.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-pan-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-path-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-property-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-rotate-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-script.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-scriptable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-scroll-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-settings.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-shader-effect.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-shader-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-snap-constraint.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-swipe-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-tap-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-test-utils.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-text.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-text-buffer.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-transition.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-transition-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-types.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-units.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-version.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\clutter-zoom-action.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter&#x0D;&#x0A;
+copy ..\..\..\clutter\win32\clutter-win32.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-alpha.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-animatable.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-animation.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-animator.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-backend.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-depth.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-ellipse.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-opacity.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-path.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-behaviour-scale.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-box.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-cairo-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-container.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-fixed.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-frame-source.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-group.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-input-device.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-keysyms.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-main.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-media.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-rectangle.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-score.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-shader.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-state.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-table-layout.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-timeline.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-timeout-pool.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+copy ..\..\..\clutter\deprecated\clutter-util.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\deprecated&#x0D;&#x0A;
+
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-actor.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-clone.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-factory.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-group.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-main.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-rectangle.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-root.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ApiVersion)\cally&#x0D;&#x0A;
+
+"
+	/>
+	<UserMacro
+		Name="ClutterDoInstallGDK"
+		Value="
+mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk&#x0D;&#x0A;
+
+copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk&#x0D;&#x0A;
+			  "
+	/>
+</VisualStudioPropertySheet>

build/win32/vs9/clutter-version-paths.vsprops

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="clutterversionpathsprops"
+	>
+	<UserMacro
+		Name="VSVer"
+		Value="9"
+	/>
+	<UserMacro
+		Name="GlibEtcInstallRoot"
+		Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
+	/>
+	<UserMacro
+		Name="CopyDir"
+		Value="$(GlibEtcInstallRoot)"
+	/>
+	<UserMacro
+		Name="DefDir"
+		Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+	/>
+	<UserMacro
+		Name="ApiVersion"
+		Value="1.0"
+	/>
+	<UserMacro
+		Name="ClutterLibtoolCompatibleDllPrefix"
+		Value="lib"
+	/>
+	<UserMacro
+		Name="ClutterLibtoolCompatibleDllSuffix"
+		Value="-$(ApiVersion)-0"
+	/>
+	<UserMacro
+		Name="ClutterSeparateVSDllPrefix"
+		Value=""
+	/>
+	<UserMacro
+		Name="ClutterSeparateVSDllSuffix"
+		Value="-1-vs$(VSVer)"
+	/>
+	<!-- Change these two to ClutterLibtoolCompatibleDllPrefix and
+	ClutterLibtoolCompatibleDllSuffix if using LibTool-style DLL names
+	is desired -->
+	<UserMacro
+		Name="ClutterDllPrefix"
+		Value="$(ClutterSeparateVSDllPrefix)"
+	/>
+	<UserMacro
+		Name="ClutterDllSuffix"
+		Value="$(ClutterSeparateVSDllSuffix)"
+	/>
+</VisualStudioPropertySheet>

build/win32/vs9/clutter.sln

@@ -88,11 +88,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "call
 		{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-clutter", "test-conformance-clutter.vcproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
@@ -118,7 +113,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D} = {E77D40D0-19D4-4865-BE20-B6DA05BA234D}
 		{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E} = {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}
 		{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4} = {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE} = {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9} = {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}
 	EndProjectSection
 EndProject
@@ -422,22 +416,6 @@ Global
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|x64.Build.0 = Debug|x64
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.ActiveCfg = Release|x64
 		{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.Build.0 = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.Build.0 = Release|Win32
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.Build.0 = Debug|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.ActiveCfg = Release|x64
-		{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.Build.0 = Release|x64
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.Build.0 = Debug|Win32
 		{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|Win32.ActiveCfg = Release|Win32
@@ -462,14 +440,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.ActiveCfg = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug_GDK|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|Win32.Build.0 = Debug|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release_GDK|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.ActiveCfg = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release_GDK|Win32
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|Win32.Build.0 = Release|Win32
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.ActiveCfg = Debug|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_GDK|x64.Build.0 = Debug|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.ActiveCfg = Release|x64
-		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release_GDK|x64
+		{35B2A4AC-7235-4FC7-995D-469D59195041}.Release_GDK|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs9/clutter.vcprojin

@@ -21,18 +21,18 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir)"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -41,17 +41,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				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"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -59,19 +54,19 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_GDK|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir)"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -80,17 +75,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterGDKDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				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"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -98,18 +88,18 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir)"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -118,17 +108,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				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"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="17"
@@ -136,19 +121,19 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_GDK|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir)"
 				PreprocessorDefinitions="$(DebugLibBuildDefines);$(ClutterBuildDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -157,17 +142,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterGDKDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				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"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="17"
@@ -175,20 +155,20 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir)"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -196,17 +176,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				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"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -216,7 +191,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release_GDK|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
@@ -224,13 +199,13 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir)"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -238,17 +213,12 @@
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterGDKDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				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"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -258,34 +228,29 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildWin)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir)"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				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"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -295,35 +260,30 @@
 		</Configuration>
 		<Configuration
 			Name="Release_GDK|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
 			OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildGDK)$(PreBuildCmd2)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+				AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(SolutionDir)"
 				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="$(GenerateClutterGDKDef)"
-			/>
 			<Tool
 				Name="VCLinkerTool"
 				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"
 				OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\clutter.def"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ClutterApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -386,6 +346,338 @@
 			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\config.h.win32">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying config.h from config.h.win32..."
+						CommandLine="$(CopyConfigH)"
+						Outputs="..\..\..\clutter\config.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\clutter\clutter-config.h.win32_GDK">
+				<FileConfiguration Name="Debug_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32_GDK..."
+						CommandLine="$(CopyClutterConfigGDKH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32_GDK..."
+						CommandLine="$(CopyClutterConfigGDKH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32_GDK..."
+						CommandLine="$(CopyClutterConfigGDKH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32_GDK..."
+						CommandLine="$(CopyClutterConfigGDKH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\clutter\clutter-config.h.win32">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32..."
+						CommandLine="$(CopyClutterConfigH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32..."
+						CommandLine="$(CopyClutterConfigH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32..."
+						CommandLine="$(CopyClutterConfigH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Copying clutter-config.h from clutter-config.h.win32..."
+						CommandLine="$(CopyClutterConfigH)"
+						Outputs="..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\clutter\clutter-enum-types.h.in">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcGDKH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcGDKH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcGDKH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Header..."
+						CommandLine="$(GenEnumsSrcGDKH)"
+						Outputs="..\..\..\clutter\clutter-enum-types.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\clutter\clutter-enum-types.c.in">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcGDKC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcGDKC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcGDKC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcC)"
+						Outputs="..\..\..\clutter\clutter-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release_GDK|x64">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating Enumeration Sources..."
+						CommandLine="$(GenEnumsSrcGDKC)"
+						Outputs="..\..\..\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\win32\resources.rc" />
 		</Filter>
 	</Files>

build/win32/vs9/clutter.vsprops

@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="clutterprops"
-	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;..\..\..\clutter;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
-		PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES"
-		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="cogl-pango-1.0.lib cogl-1.0.lib glib-2.0.lib gobject-2.0.lib"
-		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="..\..\..\..\vs9\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="CopyDir"
-		Value="$(GlibEtcInstallRoot)"
-	/>
-	<UserMacro
-		Name="DefDir"
-		Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
-	/>
-	<UserMacro
-		Name="GlibMkEnumsPath"
-		Value="..\..\..\vs9\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="GlibGenMarshalPath"
-		Value="..\..\vs9\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="ClutterApiVersion"
-		Value="1.0"
-	/>
-	<UserMacro
-		Name="BaseWinBuildDef"
-		Value="_WIN32_WINNT=0x0500"
-	/>
-	<UserMacro
-		Name="BaseBuildDef"
-		Value="$(BaseWinBuildDef)"
-	/>
-	<UserMacro
-		Name="LibBuildDefines"
-		Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;COGL_HAS_WIN32_SUPPORT;CLUTTER_ENABLE_EXPERIMENTAL_API"
-	/>
-	<UserMacro
-		Name="DebugLibBuildDefines"
-		Value="$(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG"
-	/>
-	<UserMacro
-		Name="ReleaseLibBuildDefines"
-		Value="$(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS"
-	/>
-	<UserMacro
-		Name="ClutterBuildDefines"
-		Value="$(BaseBuildDef);G_LOG_DOMAIN=\&quot;Clutter\&quot;;CLUTTER_LOCALEDIR=\&quot;../share/locale\&quot;;CLUTTER_SYSCONFDIR=\&quot;../etc\&quot;"
-	/>
-	<UserMacro
-		Name="ClutterDisableDeprecationWarnings"
-		Value="CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS"
-	/>
-	<UserMacro
-		Name="CallyTestDefs"
-		Value="$(BaseWinBuildDef);PREFIXDIR=\&quot;/some/dummy/dir\&quot;;$(ClutterDisableDeprecationWarnings)"
-	/>
-	<UserMacro
-		Name="TestProgDef"
-		Value="$(BaseBuildDef);TESTS_DATADIR=\&quot;../share/clutter-$(ClutterApiVersion)/data\&quot;"
-	/>
-	<UserMacro
-		Name="TestPerfProgDef"
-		Value="$(BaseBuildDef);TESTS_DATA_DIR=\&quot;../share/clutter-$(ClutterApiVersion)/data\&quot;;$(ClutterDisableDeprecationWarnings)"
-	/>
-	<UserMacro
-		Name="PreBuildWin"
-		Value="
-if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
-copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h&#x0D;&#x0A;
-:DONE_CONFIG_H&#x0D;&#x0A;
-if exist ..\..\..\clutter\clutter.bld.win32.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
-del clutter.bld.*.win32&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-config.h.win32 clutter.bld.win32.win32&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-config.h.win32 ..\..\..\clutter\clutter-config.h&#x0D;&#x0A;
-:DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="PreBuildGDK"
-		Value="
-if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
-copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h&#x0D;&#x0A;
-:DONE_CONFIG_H&#x0D;&#x0A;
-if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
-del clutter.bld.*.win32&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-config.h.win32_GDK clutter.bld.GDK.win32&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-config.h.win32_GDK ..\..\..\clutter\clutter-config.h&#x0D;&#x0A;
-:DONE_CLUTTER_CONFIG_H&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="PreBuildCmd2"
-		Value="
-if exist ..\..\..\clutter\clutter-marshal.h goto DONE_CLUTTER_MARSHAL_H&#x0D;&#x0A;
-cd ..\..\..\clutter&#x0D;&#x0A;
-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --header clutter-marshal.list &gt; clutter-marshal.h&#x0D;&#x0A;
-cd ..\build\win32\vs9&#x0D;&#x0A;
-:DONE_CLUTTER_MARSHAL_H&#x0D;&#x0A;
-
-if exist ..\..\..\clutter\clutter-marshal.c goto DONE_CLUTTER_MARSHAL_C&#x0D;&#x0A;
-cd ..\..\..\clutter&#x0D;&#x0A;
-echo #include &quot;clutter-marshal.h&quot; &gt; clutter-marshal.c&#x0D;&#x0A;
-$(GlibGenMarshalPath)\bin\glib-genmarshal --prefix=_clutter_marshal --body clutter-marshal.list &gt;&gt; clutter-marshal.c&#x0D;&#x0A;
-cd ..\build\win32\vs9&#x0D;&#x0A;
-:DONE_CLUTTER_MARSHAL_C&#x0D;&#x0A;
-
-cd ..&#x0D;&#x0A;
-gen-enums.bat $(GlibMkEnumsPath)&#x0D;&#x0A;
-cd .\vs9&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="ClutterDoInstall"
-		Value="
-mkdir $(CopyDir)&#x0D;&#x0A;
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-mkdir $(CopyDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
-
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\*.bat $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\..\..\tests\data\*.png $(CopyDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
-copy ..\..\..\tests\data\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
-copy ..\..\..\tests\data\*.json $(CopyDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32&#x0D;&#x0A;
-
-copy ..\..\..\clutter\clutter.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-actor-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-align-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-alpha.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-animatable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-animation.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-animator.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-backend.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-bind-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-binding-pool.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-bin-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-blur-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-box-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-brightness-contrast-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-cairo-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-canvas.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-child-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-click-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-clone.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-cogl-compat.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-color-static.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-color.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-colorize-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-config.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-content.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-container.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-deform-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-deprecated.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-desaturate-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-device-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-drag-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-drop-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-enums.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-enum-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-event.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-feature.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-fixed-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-flow-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-gesture-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-image.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-input-device.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-interval.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-layout-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-layout-meta.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-list-model.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-keysyms.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-macros.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-marshal.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-media.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-model.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-offscreen-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-page-turn-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-paint-node.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-paint-nodes.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-path-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-path.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-property-transition.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-script.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-scriptable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-settings.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-shader-effect.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-shader-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-snap-constraint.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-state.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-swipe-action.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-table-layout.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-text.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-text-buffer.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-timeline.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-transition.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-types.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-units.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\clutter-version.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter&#x0D;&#x0A;
-copy ..\..\..\clutter\win32\clutter-win32.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\win32&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-animatable.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-animation.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-backend.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-depth.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-ellipse.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-opacity.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-path.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-rotate.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-behaviour-scale.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-box.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-cairo-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-container.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-fixed.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-frame-source.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-keysyms.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-rectangle.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-score.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-shader.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-timeline.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-timeout-pool.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-copy ..\..\..\clutter\deprecated\clutter-util.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\deprecated&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-actor.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-clone.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-factory.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-group.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-main.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-rectangle.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-root.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-stage.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
-
-"
-	/>
-	<UserMacro
-		Name="ClutterDoInstallGDK"
-		Value="
-mkdir $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk&#x0D;&#x0A;
-
-copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\clutter\gdk&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="ClutterDoInstallReleaseBin"
-		Value="
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)Release\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
-
-copy $(SolutionDir)Release\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)Release\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-			  "
-	/>
-		<UserMacro
-		Name="ClutterDoInstallDebugBin"
-		Value="
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)Debug\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
-
-copy $(SolutionDir)Debug\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)Debug\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="GenerateClutterDef"
-		Value="
-		       echo EXPORTS &gt; $(DefDir)\clutter.def&#x0D;&#x0A;
-			   cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols &gt;&gt; $(DefDir)\clutter.def&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="GenerateClutterGDKDef"
-		Value="
-		       echo EXPORTS &gt; $(DefDir)\clutter.def&#x0D;&#x0A;
-			   cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_WINDOWING_GDK -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols &gt;&gt; $(DefDir)\clutter.def&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="ClutterLibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="ClutterLibtoolCompatibleDllSuffix"
-		Value="-$(ClutterApiVersion)-0"
-	/>
-	<UserMacro
-		Name="ClutterSeparateVS9DllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="ClutterSeparateVS9DllSuffix"
-		Value="-1-vs9"
-	/>
-	<!-- Change these two to GlibLibtoolCompatibleDllPrefix and
-	GlibLibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="ClutterDllPrefix"
-		Value="$(ClutterSeparateVS9DllPrefix)"
-	/>
-	<UserMacro
-		Name="ClutterDllSuffix"
-		Value="$(ClutterSeparateVS9DllSuffix)"
-	/>
-</VisualStudioPropertySheet>

build/win32/vs9/install.vcproj

@@ -20,31 +20,19 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall)"
+				CommandLine="$(ClutterDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_GDK|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
@@ -52,25 +40,12 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall)"
+				CommandLine="$(ClutterDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_GDK|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(ClutterDoInstallDebugBin) $(ClutterDoInstall) $(ClutterDoInstallGDK)"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
@@ -78,25 +53,12 @@
 			>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)"
+				CommandLine="$(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)"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-install.vsprops"
 			OutputDirectory="$(GlibEtcInstallRoot)"
 			ConfigurationType="10"
 			CharacterSet="2"
@@ -105,21 +67,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(ClutterDoInstallReleaseBin) $(ClutterDoInstall)"
+				CommandLine="$(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)"
 			/>
 		</Configuration>
 	</Configurations>

build/win32/vs9/test-cogl-perf.vcproj

@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -50,7 +50,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -59,7 +59,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -81,7 +81,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -93,7 +93,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -113,7 +113,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

build/win32/vs9/test-conformance-clutter.vcprojin

@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test-conformance-clutter"
-	ProjectGUID="{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
-	RootNamespace="testconformanceclutter"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				AdditionalDependencies="pango-1.0.lib cairo.lib atk-1.0.lib OpenGL32.lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pango-1.0.lib cairo.lib atk-1.0.lib OpenGL32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				AdditionalDependencies="pango-1.0.lib cairo.lib atk-1.0.lib OpenGL32.lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="pango-1.0.lib cairo.lib atk-1.0.lib OpenGL32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "testconformance.sourcefiles"
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/win32/vs9/test-interactive-clutter.vcprojin

@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\test-interactive"
 			ConfigurationType="1"
 			CharacterSet="2"
@@ -53,7 +53,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\test-interactive"
 			CharacterSet="2"
 			>
@@ -86,7 +86,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\test-interactive"
 			ConfigurationType="1"
 			CharacterSet="2"
@@ -121,7 +121,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\test-interactive"
 			CharacterSet="2"
 			WholeProgramOptimization="1"

build/win32/vs9/test-picking-performance.vcproj

@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
+<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9.00"
-	Name="test-picking-performance"
+	Name="test-picking-performance"
-	ProjectGUID="{2035D56A-E748-475F-B3D5-C123BF652143}"
+	ProjectGUID="{2035D56A-E748-475F-B3D5-C123BF652143}"
-	RootNamespace="testpickingperformance"
+	RootNamespace="testpickingperformance"
-	Keyword="Win32Proj"
+	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
+	TargetFrameworkVersion="196613"
-	>
+	>
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"
+			Name="Win32"
-		/>
+		/>
-		<Platform
+		<Platform
-			Name="x64"
+			Name="x64"
-		/>
+		/>
-	</Platforms>
+	</Platforms>
-	<ToolFiles>
+	<ToolFiles>
-	</ToolFiles>
+	</ToolFiles>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="4"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="2"
-				EnableIntrinsicFunctions="true"
+				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Sources"
+			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-picking.c" />
+			<File RelativePath="..\..\..\tests\performance\test-picking.c" />
-		</Filter>
+		</Filter>
-		<Filter
+		<Filter
-			Name="Headers"
+			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

build/win32/vs9/test-picking.vcproj

@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -51,7 +51,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -60,7 +60,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -82,7 +82,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -94,7 +94,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -114,7 +114,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -123,7 +123,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

build/win32/vs9/test-random-text.vcproj

@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -50,7 +50,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -59,7 +59,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -81,7 +81,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -93,7 +93,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -113,7 +113,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

build/win32/vs9/test-state-hidden-performance.vcproj

@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
+<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9.00"
-	Name="test-state-hidden-performance"
+	Name="test-state-hidden-performance"
-	ProjectGUID="{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}"
+	ProjectGUID="{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}"
-	RootNamespace="teststatehiddenperformance"
+	RootNamespace="teststatehiddenperformance"
-	Keyword="Win32Proj"
+	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
+	TargetFrameworkVersion="196613"
-	>
+	>
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"
+			Name="Win32"
-		/>
+		/>
-		<Platform
+		<Platform
-			Name="x64"
+			Name="x64"
-		/>
+		/>
-	</Platforms>
+	</Platforms>
-	<ToolFiles>
+	<ToolFiles>
-	</ToolFiles>
+	</ToolFiles>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="4"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="2"
-				EnableIntrinsicFunctions="true"
+				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Sources"
+			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-state-hidden.c" />
+			<File RelativePath="..\..\..\tests\performance\test-state-hidden.c" />
-		</Filter>
+		</Filter>
-		<Filter
+		<Filter
-			Name="Headers"
+			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

build/win32/vs9/test-state-interactive-performance.vcproj

@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
+<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9.00"
-	Name="test-state-interactive-performance"
+	Name="test-state-interactive-performance"
-	ProjectGUID="{011F9197-F986-44BD-A8F2-045C746B1B70}"
+	ProjectGUID="{011F9197-F986-44BD-A8F2-045C746B1B70}"
-	RootNamespace="teststateinteractiveperformance"
+	RootNamespace="teststateinteractiveperformance"
-	Keyword="Win32Proj"
+	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
+	TargetFrameworkVersion="196613"
-	>
+	>
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"
+			Name="Win32"
-		/>
+		/>
-		<Platform
+		<Platform
-			Name="x64"
+			Name="x64"
-		/>
+		/>
-	</Platforms>
+	</Platforms>
-	<ToolFiles>
+	<ToolFiles>
-	</ToolFiles>
+	</ToolFiles>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="4"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="2"
-				EnableIntrinsicFunctions="true"
+				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Sources"
+			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-state-interactive.c" />
+			<File RelativePath="..\..\..\tests\performance\test-state-interactive.c" />
-		</Filter>
+		</Filter>
-		<Filter
+		<Filter
-			Name="Headers"
+			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

build/win32/vs9/test-state-mini-performance.vcproj

@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
+<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9.00"
-	Name="test-state-mini-performance"
+	Name="test-state-mini-performance"
-	ProjectGUID="{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}"
+	ProjectGUID="{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}"
-	RootNamespace="teststateminiperformance"
+	RootNamespace="teststateminiperformance"
-	Keyword="Win32Proj"
+	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
+	TargetFrameworkVersion="196613"
-	>
+	>
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"
+			Name="Win32"
-		/>
+		/>
-		<Platform
+		<Platform
-			Name="x64"
+			Name="x64"
-		/>
+		/>
-	</Platforms>
+	</Platforms>
-	<ToolFiles>
+	<ToolFiles>
-	</ToolFiles>
+	</ToolFiles>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="4"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="2"
-				EnableIntrinsicFunctions="true"
+				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Sources"
+			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-state-mini.c" />
+			<File RelativePath="..\..\..\tests\performance\test-state-mini.c" />
-		</Filter>
+		</Filter>
-		<Filter
+		<Filter
-			Name="Headers"
+			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

build/win32/vs9/test-state-performance.vcproj

@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
+<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9.00"
-	Name="test-state-performance"
+	Name="test-state-performance"
-	ProjectGUID="{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}"
+	ProjectGUID="{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}"
-	RootNamespace="teststateperformance"
+	RootNamespace="teststateperformance"
-	Keyword="Win32Proj"
+	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
+	TargetFrameworkVersion="196613"
-	>
+	>
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"
+			Name="Win32"
-		/>
+		/>
-		<Platform
+		<Platform
-			Name="x64"
+			Name="x64"
-		/>
+		/>
-	</Platforms>
+	</Platforms>
-	<ToolFiles>
+	<ToolFiles>
-	</ToolFiles>
+	</ToolFiles>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="4"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="2"
-				EnableIntrinsicFunctions="true"
+				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Sources"
+			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-state.c" />
+			<File RelativePath="..\..\..\tests\performance\test-state.c" />
-		</Filter>
+		</Filter>
-		<Filter
+		<Filter
-			Name="Headers"
+			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

build/win32/vs9/test-state-pick-performance.vcproj

@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
+<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9.00"
-	Name="test-state-pick-performance"
+	Name="test-state-pick-performance"
-	ProjectGUID="{0C1E8E6C-1563-4F95-A994-6366EE992CB3}"
+	ProjectGUID="{0C1E8E6C-1563-4F95-A994-6366EE992CB3}"
-	RootNamespace="teststatepickperformance"
+	RootNamespace="teststatepickperformance"
-	Keyword="Win32Proj"
+	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
+	TargetFrameworkVersion="196613"
-	>
+	>
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"
+			Name="Win32"
-		/>
+		/>
-		<Platform
+		<Platform
-			Name="x64"
+			Name="x64"
-		/>
+		/>
-	</Platforms>
+	</Platforms>
-	<ToolFiles>
+	<ToolFiles>
-	</ToolFiles>
+	</ToolFiles>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="4"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="2"
-				EnableIntrinsicFunctions="true"
+				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Sources"
+			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-state-pick.c" />
+			<File RelativePath="..\..\..\tests\performance\test-state-pick.c" />
-		</Filter>
+		</Filter>
-		<Filter
+		<Filter
-			Name="Headers"
+			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

build/win32/vs9/test-text-perf-performance.vcproj

@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
+<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
+<VisualStudioProject
-	ProjectType="Visual C++"
+	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9.00"
-	Name="test-text-perf-performance"
+	Name="test-text-perf-performance"
-	ProjectGUID="{8AF1EA8E-305B-42C0-919D-12B1843B21A4}"
+	ProjectGUID="{8AF1EA8E-305B-42C0-919D-12B1843B21A4}"
-	RootNamespace="testtextperfperformance"
+	RootNamespace="testtextperfperformance"
-	Keyword="Win32Proj"
+	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
+	TargetFrameworkVersion="196613"
-	>
+	>
-	<Platforms>
+	<Platforms>
-		<Platform
+		<Platform
-			Name="Win32"
+			Name="Win32"
-		/>
+		/>
-		<Platform
+		<Platform
-			Name="x64"
+			Name="x64"
-		/>
+		/>
-	</Platforms>
+	</Platforms>
-	<ToolFiles>
+	<ToolFiles>
-	</ToolFiles>
+	</ToolFiles>
-	<Configurations>
+	<Configurations>
-		<Configuration
+		<Configuration
-			Name="Debug|Win32"
+			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="4"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Debug|x64"
+			Name="Debug|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+				PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
-				MinimalRebuild="true"
+				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
+				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="2"
+				LinkIncremental="2"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|Win32"
+			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="2"
-				EnableIntrinsicFunctions="true"
+				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="1"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-		<Configuration
+		<Configuration
-			Name="Release|x64"
+			Name="Release|x64"
-			ConfigurationType="1"
+			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
-			CharacterSet="2"
+			CharacterSet="2"
-			WholeProgramOptimization="1"
+			WholeProgramOptimization="1"
-			>
+			>
-			<Tool
+			<Tool
-				Name="VCPreBuildEventTool"
+				Name="VCPreBuildEventTool"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCCLCompilerTool"
+				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(TestPerfProgDef)"
+				PreprocessorDefinitions="$(TestPerfProgDef)"
-				RuntimeLibrary="2"
+				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="3"
-				DebugInformationFormat="3"
+				DebugInformationFormat="3"
-				CompileAs="1"
+				CompileAs="1"
-			/>
+			/>
-			<Tool
+			<Tool
-				Name="VCLinkerTool"
+				Name="VCLinkerTool"
-				AdditionalDependencies=""
+				AdditionalDependencies=""
-				LinkIncremental="1"
+				LinkIncremental="1"
-				GenerateDebugInformation="true"
+				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="1"
-				OptimizeReferences="2"
+				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
+				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
+				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="17"
-			/>
+			/>
-		</Configuration>
+		</Configuration>
-	</Configurations>
+	</Configurations>
-	<References>
+	<References>
-	</References>
+	</References>
-	<Files>
+	<Files>
-		<Filter
+		<Filter
-			Name="Sources"
+			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-text-perf.c" />
+			<File RelativePath="..\..\..\tests\performance\test-text-perf.c" />
-		</Filter>
+		</Filter>
-		<Filter
+		<Filter
-			Name="Headers"
+			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
+			>
-			<File RelativePath="..\..\..\tests\performance\test-common.h" />
+			<File RelativePath="..\..\..\tests\performance\test-common.h" />
-		</Filter>
+		</Filter>
-	</Files>
+	</Files>
-	<Globals>
+	<Globals>
-	</Globals>
+	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>

build/win32/vs9/test-text-perf.vcproj

@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -50,7 +50,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -59,7 +59,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -81,7 +81,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -93,7 +93,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -113,7 +113,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

build/win32/vs9/test-text.vcproj

@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -50,7 +50,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -59,7 +59,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="_DEBUG;$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -81,7 +81,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -93,7 +93,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -113,7 +113,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\clutter.vsprops"
+			InheritedPropertySheets=".\clutter-build-defines.vsprops"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings)"
+				PreprocessorDefinitions="$(BaseWinBuildDef);$(ClutterDisableDeprecationWarnings);$(AvoidSDLMain)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

clutter.doap

@@ -7,6 +7,7 @@
 
   <name>Clutter</name>
   <shortname>clutter</shortname>
+  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
 
   <shortdesc xml:lang="en">A toolkit for creating fast, portable, compelling dynamic UIs</shortdesc>
 

clutter/abicheck.sh

@@ -1,30 +0,0 @@
-#! /bin/sh
-
-has_x11_backend=no
-has_gdk_backend=no
-has_wayland_backend=no
-for backend in ${CLUTTER_BACKENDS}; do
-        case "$backend" in
-                x11) has_x11_backend=yes ;;
-                gdk) has_gdk_backend=yes ;;
-                wayland) has_wayland_backend=yes ;;
-        esac
-done
-
-cppargs="-DG_OS_UNIX"
-if [ $has_x11_backend = "yes" ]; then
-        cppargs="$cppargs -DCLUTTER_WINDOWING_X11 -DCLUTTER_WINDOWING_GLX"
-fi
-
-if [ $has_gdk_backend = "yes" ]; then
-        cppargs="$cppargs -DCLUTTER_WINDOWING_GDK"
-fi
-
-if [ $has_wayland_backend = "yes" ]; then
-        cppargs="$cppargs -DCLUTTER_WINDOWING_WAYLAND"
-fi
-
-cpp -P ${cppargs} ${srcdir:-.}/clutter.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' -e 's/ DATA//' | sort > expected-abi
-
-nm -D -g --defined-only .libs/libclutter-1.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
-diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

clutter/cally/cally-actor.c

@@ -173,18 +173,6 @@ static void cally_actor_notify_clutter          (GObject    *obj,
 static void cally_actor_real_notify_clutter     (GObject    *obj,
                                                  GParamSpec *pspec);
 
-G_DEFINE_TYPE_WITH_CODE (CallyActor,
-                         cally_actor,
-                         ATK_TYPE_GOBJECT_ACCESSIBLE,
-                         G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT,
-                                                cally_actor_component_interface_init)
-                         G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION,
-                                                cally_actor_action_interface_init));
-
-#define CALLY_ACTOR_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CALLY_TYPE_ACTOR, CallyActorPrivate))
-
-
 struct _CallyActorPrivate
 {
   GQueue *action_queue;
@@ -194,6 +182,15 @@ struct _CallyActorPrivate
   GList *children;
 };
 
+G_DEFINE_TYPE_WITH_CODE (CallyActor,
+                         cally_actor,
+                         ATK_TYPE_GOBJECT_ACCESSIBLE,
+                         G_ADD_PRIVATE (CallyActor)
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT,
+                                                cally_actor_component_interface_init)
+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION,
+                                                cally_actor_action_interface_init));
+
 /**
  * cally_actor_new:
  * @actor: a #ClutterActor
@@ -287,18 +284,16 @@ cally_actor_class_init (CallyActorClass *klass)
   class->get_n_children      = cally_actor_get_n_children;
   class->ref_child           = cally_actor_ref_child;
   class->get_attributes      = cally_actor_get_attributes;
-
-  g_type_class_add_private (gobject_class, sizeof (CallyActorPrivate));
 }
 
 static void
 cally_actor_init (CallyActor *cally_actor)
 {
-  CallyActorPrivate *priv = CALLY_ACTOR_GET_PRIVATE (cally_actor);
+  CallyActorPrivate *priv = cally_actor_get_instance_private (cally_actor);
 
   cally_actor->priv = priv;
 
-  priv->action_queue        = NULL;
+  priv->action_queue = NULL;
   priv->action_idle_handler = 0;
 
   priv->action_list = NULL;
@@ -306,7 +301,6 @@ cally_actor_init (CallyActor *cally_actor)
   priv->children = NULL;
 }
 
-
 static void
 cally_actor_finalize (GObject *obj)
 {
@@ -1105,7 +1099,7 @@ cally_actor_add_action (CallyActor      *cally_actor,
 }
 
 /**
- * cally_actor_add_action_full:
+ * cally_actor_add_action_full: (rename-to cally_actor_add_action)
  * @cally_actor: a #CallyActor
  * @action_name: the action name
  * @action_description: the action description
@@ -1118,8 +1112,6 @@ cally_actor_add_action (CallyActor      *cally_actor,
  *
  * Return value: added action id, or -1 if failure
  *
- * Rename to: cally_actor_add_action
- *
  * Since: 1.6
  */
 guint

clutter/cally/cally-actor.h

@@ -22,13 +22,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_ACTOR_H__
+#define __CALLY_ACTOR_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_ACTOR_H__
-#define __CALLY_ACTOR_H__
-
 #include <atk/atk.h>
 #include <clutter/clutter.h>
 
@@ -126,16 +126,19 @@ struct _CallyActorClass
   gpointer _padding_dummy[32];
 };
 
-
+CLUTTER_AVAILABLE_IN_1_4
 GType      cally_actor_get_type              (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_4
 AtkObject* cally_actor_new                   (ClutterActor        *actor);
 
+CLUTTER_AVAILABLE_IN_1_4
 guint      cally_actor_add_action            (CallyActor          *cally_actor,
                                               const gchar         *action_name,
                                               const gchar         *action_description,
                                               const gchar         *action_keybinding,
                                               CallyActionFunc      action_func);
+CLUTTER_AVAILABLE_IN_1_6
 guint      cally_actor_add_action_full       (CallyActor          *cally_actor,
                                               const gchar         *action_name,
                                               const gchar         *action_description,
@@ -144,9 +147,11 @@ guint      cally_actor_add_action_full       (CallyActor          *cally_actor,
                                               gpointer             user_data,
                                               GDestroyNotify       notify);
 
+CLUTTER_AVAILABLE_IN_1_4
 gboolean   cally_actor_remove_action         (CallyActor          *cally_actor,
                                               gint                 action_id);
 
+CLUTTER_AVAILABLE_IN_1_4
 gboolean   cally_actor_remove_action_by_name (CallyActor          *cally_actor,
                                               const gchar         *action_name);
 

clutter/cally/cally-clone.c

@@ -69,6 +69,7 @@
  * a11y POV should still be managed as a image (with the proper properties,
  * position, size, etc.).
  */
+#include "config.h"
 
 #include "cally-clone.h"
 #include "cally-actor-private.h"

clutter/cally/cally-clone.h

@@ -18,15 +18,15 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CALLY_CLONE_H__
+#define __CALLY_CLONE_H__
+
 #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <cally/cally.h> can be included directly."
 #endif
 
-#ifndef __CALLY_CLONE_H__
-#define __CALLY_CLONE_H__
-
-#include <cally/cally-actor.h>
 #include <clutter/clutter.h>
+#include <cally/cally-actor.h>
 
 G_BEGIN_DECLS
 
@@ -74,7 +74,9 @@ struct _CallyCloneClass
   gpointer _padding_dummy[8];
 };
 
+CLUTTER_AVAILABLE_IN_1_4
 GType      cally_clone_get_type (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_4
 AtkObject *cally_clone_new      (ClutterActor *actor);
 
 G_END_DECLS

clutter/cally/cally-group.c

@@ -30,14 +30,12 @@
  * @see_also: #ClutterGroup
  *
  * #CallyGroup implements the required ATK interfaces of #ClutterGroup
- * In particular it exposes:
+ * In particular it exposes each of the Clutter actors contained in the
- *
+ * group.
- * <itemizedlist>
- *   <listitem><simpara>Each of the Clutter actors contained in the
- *   Group.</simpara></listitem>
- * </itemizedlist>
  */
 
+#include "config.h"
+
 #include "cally-group.h"
 #include "cally-actor-private.h"