[clutter/clutter-1.18] Overhaul the Visual Studio 2008 Projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.18] Overhaul the Visual Studio 2008 Projects
- Date: Wed, 5 Mar 2014 10:41:54 +0000 (UTC)
commit 3c344fe5eda34e1221da23818a2ce297d0f22125
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Mar 5 18:41:45 2014 +0800
Overhaul the Visual Studio 2008 Projects
Split up the property sheets, so that they are easier to maintain, and
clean up the projects and property sheets, especially on items that are
being repeated, and therefore silence many build warnings. Update the
project files correspondingly, and make all project files use Unix line
endings, for easier application of patches (the .sln and README.txt files
still has to have Windows line endings in order to work properly).
Also make the copying of config.h.win32 and clutter-config.h.win32(_GDK)
custom build rules, so that they may also be cleaned during the cleaning
of the build, which makes it easier for one to do a rebuild.
Similar updates to the Visual Studio 2010 project files will follow.
build/win32/vs9/Makefile.am | 5 +-
build/win32/vs9/cally-atkcomponent-example.vcproj | 8 +-
.../win32/vs9/cally-atkeditabletext-example.vcproj | 8 +-
build/win32/vs9/cally-atkevents-example.vcproj | 8 +-
build/win32/vs9/cally-atktext-example.vcproj | 8 +-
build/win32/vs9/cally-clone-example.vcproj | 8 +-
build/win32/vs9/clutter-build-defines.vsprops | 57 ++++
build/win32/vs9/clutter-gen-srcs.vsprops | 81 +++++
.../{clutter.vsprops => clutter-install.vsprops} | 182 +----------
build/win32/vs9/clutter-version-paths.vsprops | 54 ++++
build/win32/vs9/clutter.vcprojin | 328 +++++++++++++++-----
build/win32/vs9/install.vcproj | 8 +-
build/win32/vs9/test-cogl-perf.vcproj | 8 +-
build/win32/vs9/test-interactive-clutter.vcprojin | 8 +-
build/win32/vs9/test-picking-performance.vcproj | 332 ++++++++++----------
build/win32/vs9/test-picking.vcproj | 8 +-
build/win32/vs9/test-random-text.vcproj | 8 +-
.../win32/vs9/test-state-hidden-performance.vcproj | 332 ++++++++++----------
.../vs9/test-state-interactive-performance.vcproj | 332 ++++++++++----------
build/win32/vs9/test-state-mini-performance.vcproj | 332 ++++++++++----------
build/win32/vs9/test-state-performance.vcproj | 332 ++++++++++----------
build/win32/vs9/test-state-pick-performance.vcproj | 332 ++++++++++----------
build/win32/vs9/test-text-perf-performance.vcproj | 332 ++++++++++----------
build/win32/vs9/test-text-perf.vcproj | 8 +-
build/win32/vs9/test-text.vcproj | 8 +-
25 files changed, 1664 insertions(+), 1463 deletions(-)
---
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 8723fe2..b78f076 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -7,7 +7,10 @@ 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-interactive-clutter.vcproj \
diff --git a/build/win32/vs9/cally-atkcomponent-example.vcproj
b/build/win32/vs9/cally-atkcomponent-example.vcproj
index 6eccb4b..0e170cb 100644
--- a/build/win32/vs9/cally-atkcomponent-example.vcproj
+++ b/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"
>
diff --git a/build/win32/vs9/cally-atkeditabletext-example.vcproj
b/build/win32/vs9/cally-atkeditabletext-example.vcproj
index 1aa1a9c..a151ce2 100644
--- a/build/win32/vs9/cally-atkeditabletext-example.vcproj
+++ b/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"
>
diff --git a/build/win32/vs9/cally-atkevents-example.vcproj b/build/win32/vs9/cally-atkevents-example.vcproj
index 2ea075e..e00954e 100644
--- a/build/win32/vs9/cally-atkevents-example.vcproj
+++ b/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"
>
diff --git a/build/win32/vs9/cally-atktext-example.vcproj b/build/win32/vs9/cally-atktext-example.vcproj
index 0e656d0..d4d4bae 100644
--- a/build/win32/vs9/cally-atktext-example.vcproj
+++ b/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"
>
diff --git a/build/win32/vs9/cally-clone-example.vcproj b/build/win32/vs9/cally-clone-example.vcproj
index 11dfc36..ef0f12a 100644
--- a/build/win32/vs9/cally-clone-example.vcproj
+++ b/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"
>
diff --git a/build/win32/vs9/clutter-build-defines.vsprops b/build/win32/vs9/clutter-build-defines.vsprops
new file mode 100644
index 0000000..f147c98
--- /dev/null
+++ b/build/win32/vs9/clutter-build-defines.vsprops
@@ -0,0 +1,57 @@
+<?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=\"Clutter\";CLUTTER_LOCALEDIR=\"../share/locale\";CLUTTER_SYSCONFDIR=\"../etc\";COGL_DISABLE_DEPRECATION_WARNINGS"
+ />
+ <UserMacro
+ Name="ClutterDisableDeprecationWarnings"
+ Value="CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS"
+ />
+ <UserMacro
+ Name="CallyTestDefs"
+
Value="$(BaseWinBuildDef);PREFIXDIR=\"/some/dummy/dir\";$(ClutterDisableDeprecationWarnings)"
+ />
+ <UserMacro
+ Name="TestProgDef"
+
Value="$(BaseWinBuildDef);TESTS_DATADIR=\"../share/clutter-$(ApiVersion)/data\";TESTS_DATA_DIR=\"../share/clutter-$(ApiVersion)/data\""
+ />
+ <UserMacro
+ Name="TestPerfProgDef"
+ Value="$(TestProgDef);$(ClutterDisableDeprecationWarnings)"
+ />
+ <UserMacro
+ Name="LibBuildDefines"
+ Value="HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_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"
+ />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/clutter-gen-srcs.vsprops b/build/win32/vs9/clutter-gen-srcs.vsprops
new file mode 100644
index 0000000..78ac858
--- /dev/null
+++ b/build/win32/vs9/clutter-gen-srcs.vsprops
@@ -0,0 +1,81 @@
+<?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

+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

+ "
+ />
+ <UserMacro
+ Name="CopyClutterConfigGDKH"
+ Value="
+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

+ "
+ />
+ <UserMacro
+ Name="GenMarshalSrc"
+ Value="
+$(GlibEtcInstallRoot)\bin\glib-genmarshal --prefix=_clutter_marshal --header
..\..\..\clutter\clutter-marshal.list > ..\..\..\clutter\clutter-marshal.h

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

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

+ "
+ />
+ <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\clutt
er-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-pa
ge-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) > ..\..\..\clutter\clutter-enum-types.h"
+ />
+ <UserMacro
+ Name="GenEnumsSrcC"
+ Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template
..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) > ..\..\..\clutter\clutter-enum-types.c"
+ />
+ <UserMacro
+ Name="GenEnumsSrcGDKH"
+ Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template
..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) $(GdkEnumHeader) >
..\..\..\clutter\clutter-enum-types.h"
+ />
+ <UserMacro
+ Name="GenEnumsSrcGDKC"
+ Value="perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template
..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) $(GdkEnumHeader) >
..\..\..\clutter\clutter-enum-types.c"
+ />
+ <UserMacro
+ Name="GenerateClutterDef"
+ Value="
+echo EXPORTS > $(DefDir)\clutter.def

+cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_ENABLE_EXPERIMENTAL_API
..\..\..\clutter\clutter.symbols >> $(DefDir)\clutter.def

+ "
+ />
+ <UserMacro
+ Name="GenerateClutterGDKDef"
+ Value="
+echo EXPORTS > $(DefDir)\clutter.def

+cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_WINDOWING_GDK -DCLUTTER_ENABLE_EXPERIMENTAL_API
..\..\..\clutter\clutter.symbols >> $(DefDir)\clutter.def

+ "
+ />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter-install.vsprops
similarity index 70%
rename from build/win32/vs9/clutter.vsprops
rename to build/win32/vs9/clutter-install.vsprops
index 4b5754f..e1362d1 100644
--- a/build/win32/vs9/clutter.vsprops
+++ b/build/win32/vs9/clutter-install.vsprops
@@ -2,131 +2,9 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="clutterprops"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
+ Name="clutterinstallprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
>
- <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="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="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=\"Clutter\";CLUTTER_LOCALEDIR=\"../share/locale\";CLUTTER_SYSCONFDIR=\"../etc\";COGL_DISABLE_DEPRECATION_WARNINGS"
- />
- <UserMacro
- Name="ClutterDisableDeprecationWarnings"
- Value="CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS"
- />
- <UserMacro
- Name="CallyTestDefs"
-
Value="$(BaseWinBuildDef);PREFIXDIR=\"/some/dummy/dir\";$(ClutterDisableDeprecationWarnings)"
- />
- <UserMacro
- Name="TestProgDef"
- Value="$(BaseBuildDef);TESTS_DATADIR=\"../share/clutter-$(ApiVersion)/data\""
- />
- <UserMacro
- Name="TestPerfProgDef"
-
Value="$(BaseBuildDef);TESTS_DATA_DIR=\"../share/clutter-$(ApiVersion)/data\";$(ClutterDisableDeprecationWarnings)"
- />
- <UserMacro
- Name="DoConfigs"
- Value="
-if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H

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

-
-:DONE_CONFIG_H

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

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

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

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

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

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

-goto DONE_CLUTTER_CONFIG_H

-
-:DO_CLUTTER_CONFIG_WIN32

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

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

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

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

-
-:DONE_CLUTTER_CONFIG_H

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

-cd ..\..\..\clutter

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

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

-:DONE_CLUTTER_MARSHAL_H

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

-cd ..\..\..\clutter

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

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

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

-:DONE_CLUTTER_MARSHAL_C

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

-call gen-enums.bat $(GlibEtcInstallRoot)

-cd .\vs$(VSVer)

-"
- />
<UserMacro
Name="ClutterDoInstall"
Value="
@@ -136,18 +14,17 @@ mkdir $(CopyDir)\share\clutter-$(ApiVersion)\data

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

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

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

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

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

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

+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 $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib

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

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

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

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

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

+$(ClutterDoInstallGDK)
:DO_INSTALL_COMMON_HEADERS

@@ -227,8 +104,8 @@ copy ..\..\..\clutter\clutter-stage.h $(CopyDir)\include\clutter-$(ApiVersion)\c
copy ..\..\..\clutter\clutter-stage-manager.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter

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

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

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

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

+copy ..\..\..\clutter\clutter-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

@@ -272,6 +149,7 @@ copy ..\..\..\clutter\deprecated\clutter-shader.h $(CopyDir)\include\clutter-$(A
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

@@ -301,44 +179,4 @@ mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk

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

"
/>
- <UserMacro
- Name="GenerateClutterDef"
- Value="
- echo EXPORTS > $(DefDir)\clutter.def

- cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_ENABLE_EXPERIMENTAL_API
..\..\..\clutter\clutter.symbols >> $(DefDir)\clutter.def

- "
- />
- <UserMacro
- Name="GenerateClutterGDKDef"
- Value="
- echo EXPORTS > $(DefDir)\clutter.def

- cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_WINDOWING_GDK
-DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols >> $(DefDir)\clutter.def

- "
- />
- <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 GlibLibtoolCompatibleDllPrefix and
- GlibLibtoolCompatibleDllSuffix if that is what you want -->
- <UserMacro
- Name="ClutterDllPrefix"
- Value="$(ClutterSeparateVSDllPrefix)"
- />
- <UserMacro
- Name="ClutterDllSuffix"
- Value="$(ClutterSeparateVSDllSuffix)"
- />
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/clutter-version-paths.vsprops b/build/win32/vs9/clutter-version-paths.vsprops
new file mode 100644
index 0000000..7b98819
--- /dev/null
+++ b/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>
diff --git a/build/win32/vs9/clutter.vcprojin b/build/win32/vs9/clutter.vcprojin
index ed2a893..fb924e8 100644
--- a/build/win32/vs9/clutter.vcprojin
+++ b/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="$(DoConfigs)"
+ 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"
@@ -42,15 +42,11 @@
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"
+ ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -59,19 +55,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="$(DoConfigs)"
+ 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"
@@ -81,15 +77,11 @@
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"
+ ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -98,18 +90,18 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(DoConfigs)"
+ 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"
@@ -119,15 +111,11 @@
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"
+ ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -136,19 +124,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="$(DoConfigs)"
+ 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"
@@ -158,15 +146,11 @@
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"
+ ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -175,20 +159,20 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(DoConfigs)"
+ 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"
@@ -197,15 +181,11 @@
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"
+ ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -216,7 +196,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 +204,13 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(DoConfigs)"
+ 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"
@@ -239,15 +219,11 @@
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"
+ ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -258,17 +234,17 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-gen-srcs.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="$(DoConfigs)"
+ CommandLine=""
/>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally"
+
AdditionalIncludeDirectories="..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir)"
PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(ClutterBuildDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -276,15 +252,11 @@
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"
+ ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -295,18 +267,18 @@
</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="$(DoConfigs)"
+ 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"
@@ -314,15 +286,11 @@
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"
+ ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
@@ -386,69 +354,269 @@
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="$(GenEnumsSrc)"
-
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ 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="$(GenEnumsSrc)"
-
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ CommandLine="$(GenEnumsSrcGDKC)"
+ Outputs="..\..\..\clutter\clutter-enum-types.c"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating Enumeration Sources..."
- CommandLine="$(GenEnumsSrc)"
-
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ CommandLine="$(GenEnumsSrcC)"
+ Outputs="..\..\..\clutter\clutter-enum-types.c"
/>
</FileConfiguration>
<FileConfiguration Name="Release_GDK|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating Enumeration Sources..."
- CommandLine="$(GenEnumsSrc)"
-
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ CommandLine="$(GenEnumsSrcGDKC)"
+ Outputs="..\..\..\clutter\clutter-enum-types.c"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool
Name="VCCustomBuildTool"
Description="Generating Enumeration Sources..."
- CommandLine="$(GenEnumsSrc)"
-
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ CommandLine="$(GenEnumsSrcC)"
+ Outputs="..\..\..\clutter\clutter-enum-types.c"
/>
</FileConfiguration>
<FileConfiguration Name="Debug_GDK|x64">
<Tool
Name="VCCustomBuildTool"
Description="Generating Enumeration Sources..."
- CommandLine="$(GenEnumsSrc)"
-
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ CommandLine="$(GenEnumsSrcGDKC)"
+ Outputs="..\..\..\clutter\clutter-enum-types.c"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool
Name="VCCustomBuildTool"
Description="Generating Enumeration Sources..."
- CommandLine="$(GenEnumsSrc)"
-
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ CommandLine="$(GenEnumsSrcC)"
+ Outputs="..\..\..\clutter\clutter-enum-types.c"
/>
</FileConfiguration>
<FileConfiguration Name="Release_GDK|x64">
<Tool
Name="VCCustomBuildTool"
Description="Generating Enumeration Sources..."
- CommandLine="$(GenEnumsSrc)"
-
Outputs="..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c"
+ CommandLine="$(GenEnumsSrcGDKC)"
+ Outputs="..\..\..\clutter\clutter-enum-types.c"
/>
</FileConfiguration>
</File>
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index 91c4c43..2121c4e 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -20,7 +20,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -32,7 +32,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -45,7 +45,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
@@ -58,7 +58,7 @@
</Configuration>
<Configuration
Name="Release|x64"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-install.vsprops"
OutputDirectory="$(GlibEtcInstallRoot)"
ConfigurationType="10"
CharacterSet="2"
diff --git a/build/win32/vs9/test-cogl-perf.vcproj b/build/win32/vs9/test-cogl-perf.vcproj
index e737e1e..e35b18d 100644
--- a/build/win32/vs9/test-cogl-perf.vcproj
+++ b/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"
>
@@ -50,7 +50,7 @@
<Configuration
Name="Debug|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -81,7 +81,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -113,7 +113,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
diff --git a/build/win32/vs9/test-interactive-clutter.vcprojin
b/build/win32/vs9/test-interactive-clutter.vcprojin
index b283deb..f5add52 100644
--- a/build/win32/vs9/test-interactive-clutter.vcprojin
+++ b/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"
diff --git a/build/win32/vs9/test-picking-performance.vcproj b/build/win32/vs9/test-picking-performance.vcproj
index 2abeedd..9fa7b60 100644
--- a/build/win32/vs9/test-picking-performance.vcproj
+++ b/build/win32/vs9/test-picking-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="test-picking-performance"
- ProjectGUID="{2035D56A-E748-475F-B3D5-C123BF652143}"
- RootNamespace="testpickingperformance"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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}"
- >
- <File RelativePath="..\..\..\tests\performance\test-picking.c" />
- </Filter>
- <Filter
- Name="Headers"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File RelativePath="..\..\..\tests\performance\test-common.h" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="test-picking-performance"
+ ProjectGUID="{2035D56A-E748-475F-B3D5-C123BF652143}"
+ RootNamespace="testpickingperformance"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ 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}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-picking.c" />
+ </Filter>
+ <Filter
+ Name="Headers"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-common.h" />
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-picking.vcproj b/build/win32/vs9/test-picking.vcproj
index 7caf1a5..9a00f2f 100644
--- a/build/win32/vs9/test-picking.vcproj
+++ b/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"
>
@@ -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"
@@ -114,7 +114,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
diff --git a/build/win32/vs9/test-random-text.vcproj b/build/win32/vs9/test-random-text.vcproj
index 05cbdde..c9fc13f 100644
--- a/build/win32/vs9/test-random-text.vcproj
+++ b/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"
>
@@ -50,7 +50,7 @@
<Configuration
Name="Debug|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -81,7 +81,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -113,7 +113,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
diff --git a/build/win32/vs9/test-state-hidden-performance.vcproj
b/build/win32/vs9/test-state-hidden-performance.vcproj
index 2716919..8fe32b7 100644
--- a/build/win32/vs9/test-state-hidden-performance.vcproj
+++ b/build/win32/vs9/test-state-hidden-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="test-state-hidden-performance"
- ProjectGUID="{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}"
- RootNamespace="teststatehiddenperformance"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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}"
- >
- <File RelativePath="..\..\..\tests\performance\test-state-hidden.c" />
- </Filter>
- <Filter
- Name="Headers"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File RelativePath="..\..\..\tests\performance\test-common.h" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="test-state-hidden-performance"
+ ProjectGUID="{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}"
+ RootNamespace="teststatehiddenperformance"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ 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}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-state-hidden.c" />
+ </Filter>
+ <Filter
+ Name="Headers"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-common.h" />
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-state-interactive-performance.vcproj
b/build/win32/vs9/test-state-interactive-performance.vcproj
index 8dd2989..2f4d011 100644
--- a/build/win32/vs9/test-state-interactive-performance.vcproj
+++ b/build/win32/vs9/test-state-interactive-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="test-state-interactive-performance"
- ProjectGUID="{011F9197-F986-44BD-A8F2-045C746B1B70}"
- RootNamespace="teststateinteractiveperformance"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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}"
- >
- <File RelativePath="..\..\..\tests\performance\test-state-interactive.c" />
- </Filter>
- <Filter
- Name="Headers"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File RelativePath="..\..\..\tests\performance\test-common.h" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="test-state-interactive-performance"
+ ProjectGUID="{011F9197-F986-44BD-A8F2-045C746B1B70}"
+ RootNamespace="teststateinteractiveperformance"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ 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}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-state-interactive.c" />
+ </Filter>
+ <Filter
+ Name="Headers"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-common.h" />
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-state-mini-performance.vcproj
b/build/win32/vs9/test-state-mini-performance.vcproj
index efdf288..7c9f838 100644
--- a/build/win32/vs9/test-state-mini-performance.vcproj
+++ b/build/win32/vs9/test-state-mini-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="test-state-mini-performance"
- ProjectGUID="{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}"
- RootNamespace="teststateminiperformance"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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}"
- >
- <File RelativePath="..\..\..\tests\performance\test-state-mini.c" />
- </Filter>
- <Filter
- Name="Headers"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File RelativePath="..\..\..\tests\performance\test-common.h" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="test-state-mini-performance"
+ ProjectGUID="{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}"
+ RootNamespace="teststateminiperformance"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ 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}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-state-mini.c" />
+ </Filter>
+ <Filter
+ Name="Headers"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-common.h" />
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-state-performance.vcproj b/build/win32/vs9/test-state-performance.vcproj
index 784cfb9..71f5c42 100644
--- a/build/win32/vs9/test-state-performance.vcproj
+++ b/build/win32/vs9/test-state-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="test-state-performance"
- ProjectGUID="{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}"
- RootNamespace="teststateperformance"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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}"
- >
- <File RelativePath="..\..\..\tests\performance\test-state.c" />
- </Filter>
- <Filter
- Name="Headers"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File RelativePath="..\..\..\tests\performance\test-common.h" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="test-state-performance"
+ ProjectGUID="{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}"
+ RootNamespace="teststateperformance"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ 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}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-state.c" />
+ </Filter>
+ <Filter
+ Name="Headers"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-common.h" />
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-state-pick-performance.vcproj
b/build/win32/vs9/test-state-pick-performance.vcproj
index b8bc457..5775970 100644
--- a/build/win32/vs9/test-state-pick-performance.vcproj
+++ b/build/win32/vs9/test-state-pick-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="test-state-pick-performance"
- ProjectGUID="{0C1E8E6C-1563-4F95-A994-6366EE992CB3}"
- RootNamespace="teststatepickperformance"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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}"
- >
- <File RelativePath="..\..\..\tests\performance\test-state-pick.c" />
- </Filter>
- <Filter
- Name="Headers"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File RelativePath="..\..\..\tests\performance\test-common.h" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="test-state-pick-performance"
+ ProjectGUID="{0C1E8E6C-1563-4F95-A994-6366EE992CB3}"
+ RootNamespace="teststatepickperformance"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ 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}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-state-pick.c" />
+ </Filter>
+ <Filter
+ Name="Headers"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-common.h" />
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-text-perf-performance.vcproj
b/build/win32/vs9/test-text-perf-performance.vcproj
index 71c3e84..3c0afe6 100644
--- a/build/win32/vs9/test-text-perf-performance.vcproj
+++ b/build/win32/vs9/test-text-perf-performance.vcproj
@@ -1,166 +1,166 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="test-text-perf-performance"
- ProjectGUID="{8AF1EA8E-305B-42C0-919D-12B1843B21A4}"
- RootNamespace="testtextperfperformance"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- 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;$(TestPerfProgDef)"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- 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="$(TestPerfProgDef)"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- 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}"
- >
- <File RelativePath="..\..\..\tests\performance\test-text-perf.c" />
- </Filter>
- <Filter
- Name="Headers"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File RelativePath="..\..\..\tests\performance\test-common.h" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="test-text-perf-performance"
+ ProjectGUID="{8AF1EA8E-305B-42C0-919D-12B1843B21A4}"
+ RootNamespace="testtextperfperformance"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="196613"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="_DEBUG;$(TestPerfProgDef)"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="17"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ ConfigurationType="1"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="$(TestPerfProgDef)"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies=""
+ 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}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-text-perf.c" />
+ </Filter>
+ <Filter
+ Name="Headers"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File RelativePath="..\..\..\tests\performance\test-common.h" />
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/build/win32/vs9/test-text-perf.vcproj b/build/win32/vs9/test-text-perf.vcproj
index 0928805..f441084 100644
--- a/build/win32/vs9/test-text-perf.vcproj
+++ b/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"
>
@@ -50,7 +50,7 @@
<Configuration
Name="Debug|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -81,7 +81,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -113,7 +113,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
diff --git a/build/win32/vs9/test-text.vcproj b/build/win32/vs9/test-text.vcproj
index 2fe2c17..a729be1 100644
--- a/build/win32/vs9/test-text.vcproj
+++ b/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"
>
@@ -50,7 +50,7 @@
<Configuration
Name="Debug|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
CharacterSet="2"
>
<Tool
@@ -81,7 +81,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -113,7 +113,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\clutter.vsprops"
+ InheritedPropertySheets=".\clutter-build-defines.vsprops"
CharacterSet="2"
WholeProgramOptimization="1"
>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
