diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 2bfacc8db..5c7a05567 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -14,7 +14,10 @@ EXTRA_DIST = \ clutter.vcxprojin \ clutter.vcxproj.filters \ clutter.vcxproj.filtersin \ - clutter.props \ + clutter-build-defines.props \ + clutter-gen-srcs.props \ + clutter-install.props \ + clutter-version-paths.props \ install.vcxproj \ test-cogl-perf.vcxproj \ test-cogl-perf.vcxproj.filters \ diff --git a/build/win32/vs10/cally-atkcomponent-example.vcxproj b/build/win32/vs10/cally-atkcomponent-example.vcxproj index a07814de8..3aafd4fea 100644 --- a/build/win32/vs10/cally-atkcomponent-example.vcxproj +++ b/build/win32/vs10/cally-atkcomponent-example.vcxproj @@ -47,19 +47,19 @@ - + - + - + - + @@ -169,4 +169,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/cally-atkcomponent-example.vcxproj.filters b/build/win32/vs10/cally-atkcomponent-example.vcxproj.filters index 5188a4877..94e8fae66 100644 --- a/build/win32/vs10/cally-atkcomponent-example.vcxproj.filters +++ b/build/win32/vs10/cally-atkcomponent-example.vcxproj.filters @@ -23,4 +23,4 @@ Headers - \ No newline at end of file + diff --git a/build/win32/vs10/cally-atkeditabletext-example.vcxproj b/build/win32/vs10/cally-atkeditabletext-example.vcxproj index d3011b734..f509c7c50 100644 --- a/build/win32/vs10/cally-atkeditabletext-example.vcxproj +++ b/build/win32/vs10/cally-atkeditabletext-example.vcxproj @@ -47,19 +47,19 @@ - + - + - + - + @@ -169,4 +169,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters b/build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters index 931b48cfc..3d06352dd 100644 --- a/build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters +++ b/build/win32/vs10/cally-atkeditabletext-example.vcxproj.filters @@ -23,4 +23,4 @@ Headers - \ No newline at end of file + diff --git a/build/win32/vs10/cally-atkevents-example.vcxproj b/build/win32/vs10/cally-atkevents-example.vcxproj index 0bc99dd38..4822df0a0 100644 --- a/build/win32/vs10/cally-atkevents-example.vcxproj +++ b/build/win32/vs10/cally-atkevents-example.vcxproj @@ -47,19 +47,19 @@ - + - + - + - + @@ -173,4 +173,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/cally-atkevents-example.vcxproj.filters b/build/win32/vs10/cally-atkevents-example.vcxproj.filters index 58c2c138c..dec13f824 100644 --- a/build/win32/vs10/cally-atkevents-example.vcxproj.filters +++ b/build/win32/vs10/cally-atkevents-example.vcxproj.filters @@ -23,4 +23,4 @@ Headers - \ No newline at end of file + diff --git a/build/win32/vs10/cally-atktext-example.vcxproj b/build/win32/vs10/cally-atktext-example.vcxproj index 372a6d96f..faa6501ab 100644 --- a/build/win32/vs10/cally-atktext-example.vcxproj +++ b/build/win32/vs10/cally-atktext-example.vcxproj @@ -47,19 +47,19 @@ - + - + - + - + @@ -169,4 +169,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/cally-atktext-example.vcxproj.filters b/build/win32/vs10/cally-atktext-example.vcxproj.filters index 1318d81d6..bda5036e5 100644 --- a/build/win32/vs10/cally-atktext-example.vcxproj.filters +++ b/build/win32/vs10/cally-atktext-example.vcxproj.filters @@ -22,4 +22,4 @@ Headers - \ No newline at end of file + diff --git a/build/win32/vs10/cally-clone-example.vcxproj b/build/win32/vs10/cally-clone-example.vcxproj index e769dca64..a508a2366 100644 --- a/build/win32/vs10/cally-clone-example.vcxproj +++ b/build/win32/vs10/cally-clone-example.vcxproj @@ -47,19 +47,19 @@ - + - + - + - + @@ -169,4 +169,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/cally-clone-example.vcxproj.filters b/build/win32/vs10/cally-clone-example.vcxproj.filters index 90fccbd5a..81284881e 100644 --- a/build/win32/vs10/cally-clone-example.vcxproj.filters +++ b/build/win32/vs10/cally-clone-example.vcxproj.filters @@ -23,4 +23,4 @@ Headers - \ No newline at end of file + diff --git a/build/win32/vs10/clutter-build-defines.props b/build/win32/vs10/clutter-build-defines.props new file mode 100644 index 000000000..04583de3a --- /dev/null +++ b/build/win32/vs10/clutter-build-defines.props @@ -0,0 +1,63 @@ + + + + + + + _WIN32_WINNT=0x0501 + HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API + $(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG + $(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS + $(BaseWinBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_LOCALEDIR="../share/locale";CLUTTER_SYSCONFDIR="../etc";COGL_DISABLE_DEPRECATION_WARNINGS + CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS + $(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir";$(ClutterDisableDeprecationWarnings) + $(BaseWinBuildDef);TESTS_DATADIR="../share/clutter-$(ApiVersion)/data";TESTS_DATA_DIR="../share/clutter-$(ApiVersion)/data" + $(TestProgDef);$(ClutterDisableDeprecationWarnings) + + + <_PropertySheetDisplayName>clutterbuilddefinesprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;..\..\..\clutter;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) + G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + %(DisableSpecificWarnings) + + + cogl-pango-1.0.lib;cogl-path-1.0.lib;cogl-1.0.lib;glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + + + $(BaseWinBuildDef) + + + $(LibBuildDefines) + + + $(DebugLibBuildDefines) + + + $(ReleaseLibBuildDefines) + + + $(ClutterBuildDefines) + + + $(ClutterDisableDeprecationWarnings) + + + $(CallyTestDefs) + + + $(TestProgDef) + + + $(TestPerfProgDef) + + + diff --git a/build/win32/vs10/clutter-gen-srcs.props b/build/win32/vs10/clutter-gen-srcs.props new file mode 100644 index 000000000..11ecedba5 --- /dev/null +++ b/build/win32/vs10/clutter-gen-srcs.props @@ -0,0 +1,98 @@ + + + + + + + copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h + +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 + + +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 + + +$(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 + + ..\..\..\clutter\clutter-action.h ..\..\..\clutter\clutter-actor-meta.h ..\..\..\clutter\clutter-actor.h ..\..\..\clutter\clutter-align-constraint.h ..\..\..\clutter\clutter-animatable.h ..\..\..\clutter\clutter-backend.h ..\..\..\clutter\clutter-bind-constraint.h ..\..\..\clutter\clutter-binding-pool.h ..\..\..\clutter\clutter-bin-layout.h ..\..\..\clutter\clutter-blur-effect.h ..\..\..\clutter\clutter-box-layout.h ..\..\..\clutter\clutter-brightness-contrast-effect.h ..\..\..\clutter\clutter-cairo.h ..\..\..\clutter\clutter-canvas.h ..\..\..\clutter\clutter-child-meta.h ..\..\..\clutter\clutter-click-action.h ..\..\..\clutter\clutter-cogl-compat.h ..\..\..\clutter\clutter-clone.h ..\..\..\clutter\clutter-color-static.h ..\..\..\clutter\clutter-color.h ..\..\..\clutter\clutter-colorize-effect.h ..\..\..\clutter\clutter-constraint.h ..\..\..\clutter\clutter-container.h ..\..\..\clutter\clutter-content.h ..\..\..\clutter\clutter-deform-effect.h ..\..\..\clutter\clutter-deprecated.h ..\..\..\clutter\clutter-desaturate-effect.h ..\..\..\clutter\clutter-device-manager.h ..\..\..\clutter\clutter-drag-action.h ..\..\..\clutter\clutter-drop-action.h ..\..\..\clutter\clutter-effect.h ..\..\..\clutter\clutter-enums.h ..\..\..\clutter\clutter-event.h ..\..\..\clutter\clutter-feature.h ..\..\..\clutter\clutter-fixed-layout.h ..\..\..\clutter\clutter-flow-layout.h ..\..\..\clutter\clutter-gesture-action.h ..\..\..\clutter\clutter-grid-layout.h ..\..\..\clutter\clutter-group.h ..\..\..\clutter\clutter-image.h ..\..\..\clutter\clutter-input-device.h ..\..\..\clutter\clutter-interval.h ..\..\..\clutter\clutter-keyframe-transition.h ..\..\..\clutter\clutter-keysyms.h ..\..\..\clutter\clutter-layout-manager.h ..\..\..\clutter\clutter-layout-meta.h ..\..\..\clutter\clutter-list-model.h ..\..\..\clutter\clutter-macros.h ..\..\..\clutter\clutter-main.h ..\..\..\clutter\clutter-model.h ..\..\..\clutter\clutter-offscreen-effect.h ..\..\..\clutter\clutter-page-turn-effect.h ..\..\..\clutter\clutter-paint-nodes.h ..\..\..\clutter\clutter-paint-node.h ..\..\..\clutter\clutter-pan-action.h ..\..\..\clutter\clutter-path-constraint.h ..\..\..\clutter\clutter-path.h ..\..\..\clutter\clutter-property-transition.h ..\..\..\clutter\clutter-rotate-action.h ..\..\..\clutter\clutter-script.h ..\..\..\clutter\clutter-scriptable.h ..\..\..\clutter\clutter-scroll-actor.h ..\..\..\clutter\clutter-settings.h ..\..\..\clutter\clutter-shader-effect.h ..\..\..\clutter\clutter-shader-types.h ..\..\..\clutter\clutter-swipe-action.h ..\..\..\clutter\clutter-snap-constraint.h ..\..\..\clutter\clutter-stage.h ..\..\..\clutter\clutter-stage-manager.h ..\..\..\clutter\clutter-tap-action.h ..\..\..\clutter\clutter-test-utils.h ..\..\..\clutter\clutter-texture.h ..\..\..\clutter\clutter-text.h ..\..\..\clutter\clutter-text-buffer.h ..\..\..\clutter\clutter-timeline.h ..\..\..\clutter\clutter-transition-group.h ..\..\..\clutter\clutter-transition.h ..\..\..\clutter\clutter-types.h ..\..\..\clutter\clutter-units.h ..\..\..\clutter\clutter-zoom-action.h ..\..\..\clutter\win32\clutter-win32.h + ..\..\..\clutter\gdk\clutter-gdk.h + perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) > ..\..\..\clutter\clutter-enum-types.h + perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) > ..\..\..\clutter\clutter-enum-types.c + perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.h.in $(EnumHeaders) $(GdkEnumHeader) > ..\..\..\clutter\clutter-enum-types.h + perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template ..\..\..\clutter\clutter-enum-types.c.in $(EnumHeaders) $(GdkEnumHeader) > ..\..\..\clutter\clutter-enum-types.c + +echo EXPORTS > $(DefDir)\clutter.def + +cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols >> $(DefDir)\clutter.def + + +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 + + + + <_PropertySheetDisplayName>cluttergensrcsprops + + + + $(CopyConfigH) + + + $(CopyClutterConfigH) + + + $(CopyClutterConfigGDKH) + + + $(GenMarshalSrc) + + + $(EnumHeaders) + + + $(GdkEnumHeader) + + + $(GenEnumsSrcC) + + + $(GenEnumsSrcC) + + + $(GenEnumsSrcGDKH) + + + $(GenEnumsSrcGDKC) + + + $(GenerateClutterDef) + + + $(GenerateClutterGDKDef) + + + diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter-install.props similarity index 61% rename from build/win32/vs10/clutter.props rename to build/win32/vs10/clutter-install.props index bfdb92a80..2e2c55afe 100644 --- a/build/win32/vs10/clutter.props +++ b/build/win32/vs10/clutter-install.props @@ -1,75 +1,10 @@  + + + - 10 - $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) - 1.0 - $(GlibEtcInstallRoot) - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - _WIN32_WINNT=0x0500 - $(BaseWinBuildDef) - HAVE_CONFIG_H;CLUTTER_COMPILATION;COGL_ENABLE_EXPERIMENTAL_API;COGL_HAS_WIN32_SUPPORT;CLUTTER_ENABLE_EXPERIMENTAL_API - $(LibBuildDefines);_DEBUG;CLUTTER_ENABLE_DEBUG - $(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS - $(BaseBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_LOCALEDIR="../share/locale";CLUTTER_SYSCONFDIR="../etc";COGL_DISABLE_DEPRECATION_WARNINGS - CLUTTER_DISABLE_DEPRECATION_WARNINGS;GLIB_DISABLE_DEPRECATION_WARNINGS - $(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir";$(ClutterDisableDeprecationWarnings) - $(BaseBuildDef);TESTS_DATADIR="../share/clutter-$(ApiVersion)/data" - $(BaseBuildDef);TESTS_DATA_DIR="../share/clutter-$(ApiVersion)/data";$(ClutterDisableDeprecationWarnings) - -if exist ..\..\..\clutter\config.h goto DONE_CONFIG_H -copy ..\..\..\clutter\config.h.win32 ..\..\..\clutter\config.h - -:DONE_CONFIG_H -if "$(Configuration)" == "Release" goto DO_CLUTTER_CONFIG_WIN32 -if "$(Configuration)" == "Debug" goto DO_CLUTTER_CONFIG_WIN32 - -if exist ..\..\..\clutter\clutter.bld.GDK.win32 goto DONE_CLUTTER_CONFIG_H -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 - - -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 - - - -cd .. -call gen-enums.bat $(GlibEtcInstallRoot) -cd .\vs$(VSVer) - - - + mkdir $(CopyDir) mkdir $(CopyDir)\bin @@ -81,13 +16,12 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin -copy ..\*.bat $(CopyDir)\bin +copy ..\..\..\tests\interactive\*.png $(CopyDir)\share\clutter-$(ApiVersion)\data -copy ..\..\..\tests\data\*.png $(CopyDir)\share\clutter-$(ApiVersion)\data +copy ..\..\..\tests\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ApiVersion)\data -copy ..\..\..\tests\data\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ApiVersion)\data +copy ..\..\..\tests\interactive\*.json $(CopyDir)\share\clutter-$(ApiVersion)\data -copy ..\..\..\tests\data\*.json $(CopyDir)\share\clutter-$(ApiVersion)\data mkdir $(CopyDir)\lib @@ -97,11 +31,10 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDi mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\win32 -if exist clutter.bld.win32.win32 goto DO_INSTALL_COMMON_HEADERS - -mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk -copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk +if "$(Configuration)" == "Release" goto DO_INSTALL_COMMON_HEADERS +if "$(Configuration)" == "Debug" goto DO_INSTALL_COMMON_HEADERS +$(ClutterDoInstallGDK) :DO_INSTALL_COMMON_HEADERS @@ -253,10 +186,10 @@ copy ..\..\..\clutter\clutter-stage-window.h $(CopyDir)\include\clutter-$(ApiVer 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 @@ -342,6 +275,8 @@ copy ..\..\..\clutter\deprecated\clutter-stage-manager.h $(CopyDir)\include\clut 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 @@ -376,140 +311,22 @@ copy ..\..\..\clutter\cally\cally-text.h $(CopyDir)\include\clutter-$(ApiVersion copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(ApiVersion)\cally copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ApiVersion)\cally - - - - + + mkdir $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk copy ..\..\..\clutter\gdk\clutter-gdk.h $(CopyDir)\include\clutter-$(ApiVersion)\clutter\gdk - - - echo EXPORTS > $(DefDir)\clutter.def - - cl -EP -DHAVE_CAIRO -DCLUTTER_WINDOWING_WIN32 -DCLUTTER_ENABLE_EXPERIMENTAL_API ..\..\..\clutter\clutter.symbols >> $(DefDir)\clutter.def - - - - 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 - - - lib - -$(ApiVersion)-0 - - -1-vs$(VSVer) - $(ClutterSeparateVSDllPrefix) - $(ClutterSeparateVSDllSuffix) + - <_PropertySheetDisplayName>clutterprops - $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + <_PropertySheetDisplayName>clutterinstallprops - - - ..\..\..;..\..\..\clutter;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-1.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) - G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - %(DisableSpecificWarnings) - - - cogl-pango-1.0.lib;cogl-1.0.lib;glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies) - $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) - - - - $(VSVer) - - - $(GlibEtcInstallRoot) - - - $(CopyDir) - - - $(DefDir) - - - $(ApiVersion) - - - $(BaseWinBuildDef) - - - $(BaseBuildDef) - - - $(LibBuildDefines) - - - $(DebugLibBuildDefines) - - - $(ReleaseLibBuildDefines) - - - $(ClutterBuildDefines) - - - $(CallyTestDefs) - - - $(TestProgDef) - - - $(ClutterDisableDeprecationWarnings) - - - $(TestPerfProgDef) - - - $(DoConfigs) - - - $(GenMarshalSrc) - - - $(GenEnumsSrc) - $(ClutterDoInstall) $(ClutterDoInstallGDK) - - $(ClutterDoInstallReleaseBin) - - - $(ClutterDoInstallDebugBin) - - - $(GenerateClutterDef) - - - $(GenerateClutterGDKDef) - - - $(ClutterLibtoolCompatibleDllPrefix) - - - $(ClutterLibtoolCompatibleDllSuffix) - - - $(ClutterSeparateVSDllPrefix) - - - $(ClutterSeparateVSDllSuffix) - - - $(ClutterDllPrefix) - - - $(ClutterDllSuffix) - diff --git a/build/win32/vs10/clutter-version-paths.props b/build/win32/vs10/clutter-version-paths.props new file mode 100644 index 000000000..997854e49 --- /dev/null +++ b/build/win32/vs10/clutter-version-paths.props @@ -0,0 +1,57 @@ + + + + 10 + $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) + 1.0 + $(GlibEtcInstallRoot) + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + lib + -$(ApiVersion)-0 + + -1-vs$(VSVer) + + $(ClutterSeparateVSDllPrefix) + $(ClutterSeparateVSDllSuffix) + + + <_PropertySheetDisplayName>clutterversionpathsprops + + + + $(VSVer) + + + $(GlibEtcInstallRoot) + + + $(CopyDir) + + + $(DefDir) + + + $(ApiVersion) + + + $(ClutterLibtoolCompatibleDllPrefix) + + + $(ClutterLibtoolCompatibleDllSuffix) + + + $(ClutterSeparateVSDllPrefix) + + + $(ClutterSeparateVSDllSuffix) + + + $(ClutterDllPrefix) + + + $(ClutterDllSuffix) + + + diff --git a/build/win32/vs10/clutter.vcxproj.filtersin b/build/win32/vs10/clutter.vcxproj.filtersin index c89755d66..106877f3e 100644 --- a/build/win32/vs10/clutter.vcxproj.filtersin +++ b/build/win32/vs10/clutter.vcxproj.filtersin @@ -24,8 +24,12 @@ Sources + Resource Files + Resource Files + Resource Files Resource Files Resource Files + Resource Files Resource Files diff --git a/build/win32/vs10/clutter.vcxprojin b/build/win32/vs10/clutter.vcxprojin index 48ebeae91..a639d4308 100644 --- a/build/win32/vs10/clutter.vcxprojin +++ b/build/win32/vs10/clutter.vcxprojin @@ -79,35 +79,35 @@ - + - + - + - + - + - + - + - + @@ -130,7 +130,7 @@ Disabled - ..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories) + ..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories) $(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -143,7 +143,7 @@ opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(IntDir)\clutter.def + $(IntDir)\$(ProjectName).def $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows @@ -156,7 +156,7 @@ Disabled - ..\..\..\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);%(AdditionalIncludeDirectories) $(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -169,7 +169,7 @@ opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(IntDir)\clutter.def + $(IntDir)\$(ProjectName).def $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows @@ -182,7 +182,7 @@ Disabled - ..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories) + ..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories) $(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -195,7 +195,7 @@ opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(IntDir)\clutter.def + $(IntDir)\$(ProjectName).def $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows @@ -208,7 +208,7 @@ Disabled - ..\..\..\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);%(AdditionalIncludeDirectories) $(DebugLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) true EnableFastChecks @@ -221,7 +221,7 @@ opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(IntDir)\clutter.def + $(IntDir)\$(ProjectName).def $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows @@ -235,7 +235,7 @@ MaxSpeed true - ..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories) + ..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories) $(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) MultiThreadedDLL true @@ -247,7 +247,7 @@ opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(IntDir)\clutter.def + $(IntDir)\$(ProjectName).def $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows @@ -263,7 +263,7 @@ MaxSpeed true - ..\..\..\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);%(AdditionalIncludeDirectories) $(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) MultiThreadedDLL true @@ -275,7 +275,7 @@ opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(IntDir)\clutter.def + $(IntDir)\$(ProjectName).def $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows @@ -289,7 +289,7 @@ $(DoConfigs) - ..\..\..\clutter;..\..\..\clutter\win32;..\..\..\clutter\deprecated;..\..\..\clutter\cally;%(AdditionalIncludeDirectories) + ..\..\..\clutter;..\..\..\clutter\cally;$(SolutionDir);%(AdditionalIncludeDirectories) $(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -300,7 +300,7 @@ opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(IntDir)\clutter.def + $(IntDir)\$(ProjectName).def $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows @@ -314,7 +314,7 @@ $(DoConfigs) - ..\..\..\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);%(AdditionalIncludeDirectories) $(ReleaseLibBuildDefines);$(ClutterBuildDefines);%(PreprocessorDefinitions) MultiThreadedDLL @@ -325,7 +325,7 @@ opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;gdk-3.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.lib;cairo.lib;atk-1.0.lib;gmodule-2.0.lib;gio-2.0.lib;%(AdditionalDependencies) $(OutDir)$(ClutterDllPrefix)$(ProjectName)$(ClutterDllSuffix).dll - $(IntDir)\clutter.def + $(IntDir)\$(ProjectName).def $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows @@ -374,6 +374,60 @@ + + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\clutter\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\clutter\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\clutter\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\clutter\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\clutter\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\clutter\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\clutter\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\clutter\config.h;%(Outputs) + + + Copying clutter-config.h from clutter-config.h.win32_GDK... + $(CopyClutterConfigGDKH) + ..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs) + Copying clutter-config.h from clutter-config.h.win32_GDK... + $(CopyClutterConfigGDKH) + ..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs) + Copying clutter-config.h from clutter-config.h.win32_GDK... + $(CopyClutterConfigGDKH) + ..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs) + Copying clutter-config.h from clutter-config.h.win32_GDK... + $(CopyClutterConfigGDKH) + ..\..\..\clutter\clutter-config.h;clutter.bld.GDK.win32;%(Outputs) + + + Copying clutter-config.h from clutter-config.h.win32... + $(CopyClutterConfigH) + ..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs) + Copying clutter-config.h from clutter-config.h.win32... + $(CopyClutterConfigH) + ..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs) + Copying clutter-config.h from clutter-config.h.win32... + $(CopyClutterConfigH) + ..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs) + Copying clutter-config.h from clutter-config.h.win32... + $(CopyClutterConfigH) + ..\..\..\clutter\clutter-config.h;clutter.bld.win32.win32;%(Outputs) + Generating Marshalling Sources... $(GenMarshalSrc) @@ -401,30 +455,56 @@ ..\..\..\clutter\clutter-marshal.h;..\..\..\clutter\clutter-marshal.c;%(Outputs) + Generating Enumeration Header... + $(GenEnumsSrcGDKH) + ..\..\..\clutter\clutter-enum-types.h;%(Outputs) + Generating Enumeration Header... + $(GenEnumsSrcH) + ..\..\..\clutter\clutter-enum-types.h;%(Outputs) + Generating Enumeration Header... + $(GenEnumsSrcGDKH) + ..\..\..\clutter\clutter-enum-types.h;%(Outputs) + Generating Enumeration Header... + $(GenEnumsSrcH) + ..\..\..\clutter\clutter-enum-types.h;%(Outputs) + Generating Enumeration Header... + $(GenEnumsSrcGDKH) + ..\..\..\clutter\clutter-enum-types.h;%(Outputs) + Generating Enumeration Header... + $(GenEnumsSrcH) + ..\..\..\clutter\clutter-enum-types.h;%(Outputs) + Generating Enumeration Header... + $(GenEnumsSrcGDKH) + ..\..\..\clutter\clutter-enum-types.h;%(Outputs) + Generating Enumeration Header... + $(GenEnumsSrcH) + ..\..\..\clutter\clutter-enum-types.h;%(Outputs) + + Generating Enumeration Sources... - $(GenEnumsSrc) - ..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs) + $(GenEnumsSrcGDKC) + ..\..\..\clutter\clutter-enum-types.c;%(Outputs) Generating Enumeration Sources... - $(GenEnumsSrc) - ..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs) + $(GenEnumsSrcC) + ..\..\..\clutter\clutter-enum-types.c;%(Outputs) Generating Enumeration Sources... - $(GenEnumsSrc) - ..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs) + $(GenEnumsSrcGDKC) + ..\..\..\clutter\clutter-enum-types.c;%(Outputs) Generating Enumeration Sources... - $(GenEnumsSrc) - ..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs) + $(GenEnumsSrcC) + ..\..\..\clutter\clutter-enum-types.c;%(Outputs) Generating Enumeration Sources... - $(GenEnumsSrc) - ..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs) + $(GenEnumsSrcGDKC) + ..\..\..\clutter\clutter-enum-types.c;%(Outputs) Generating Enumeration Sources... - $(GenEnumsSrc) - ..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs) + $(GenEnumsSrcC) + ..\..\..\clutter\clutter-enum-types.c;%(Outputs) Generating Enumeration Sources... - $(GenEnumsSrc) - ..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs) + $(GenEnumsSrcGDKC) + ..\..\..\clutter\clutter-enum-types.c;%(Outputs) Generating Enumeration Sources... - $(GenEnumsSrc) - ..\..\..\clutter\clutter-enum-types.h;..\..\..\clutter\clutter-enum-types.c;%(Outputs) + $(GenEnumsSrcC) + ..\..\..\clutter\clutter-enum-types.c;%(Outputs) Generating clutter.def... @@ -459,4 +539,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index 72df1f672..f83623803 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -46,19 +46,19 @@ - + - + - + - + @@ -170,4 +170,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/test-cogl-perf.vcxproj b/build/win32/vs10/test-cogl-perf.vcxproj index 17d55c491..ea7f765e6 100644 --- a/build/win32/vs10/test-cogl-perf.vcxproj +++ b/build/win32/vs10/test-cogl-perf.vcxproj @@ -47,19 +47,19 @@ - + - + - + - + @@ -163,4 +163,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/test-cogl-perf.vcxproj.filters b/build/win32/vs10/test-cogl-perf.vcxproj.filters index c351e2255..e4a80eee3 100644 --- a/build/win32/vs10/test-cogl-perf.vcxproj.filters +++ b/build/win32/vs10/test-cogl-perf.vcxproj.filters @@ -11,4 +11,4 @@ Sources - \ No newline at end of file + diff --git a/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin b/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin index a5f15fa43..926c30eb7 100644 --- a/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin +++ b/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin @@ -9,4 +9,4 @@ #include "testinteractive.vs10.sourcefiles.filters" - \ No newline at end of file + diff --git a/build/win32/vs10/test-interactive-clutter.vcxprojin b/build/win32/vs10/test-interactive-clutter.vcxprojin index cab15264b..6ea2a207f 100644 --- a/build/win32/vs10/test-interactive-clutter.vcxprojin +++ b/build/win32/vs10/test-interactive-clutter.vcxprojin @@ -47,19 +47,19 @@ - + - + - + - + @@ -169,4 +169,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/test-picking-performance.vcxproj b/build/win32/vs10/test-picking-performance.vcxproj index 3ca2c1000..bc8ddfddc 100644 --- a/build/win32/vs10/test-picking-performance.vcxproj +++ b/build/win32/vs10/test-picking-performance.vcxproj @@ -1,169 +1,169 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2035D56A-E748-475F-B3D5-C123BF652143} - testpickingperformance - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2035D56A-E748-475F-B3D5-C123BF652143} + testpickingperformance + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + + + + + + + + + {ea036190-0950-4640-84f9-d459a33b33a8} + false + + + + + + diff --git a/build/win32/vs10/test-picking-performance.vcxproj.filters b/build/win32/vs10/test-picking-performance.vcxproj.filters index f90e6956f..8ffda0997 100644 --- a/build/win32/vs10/test-picking-performance.vcxproj.filters +++ b/build/win32/vs10/test-picking-performance.vcxproj.filters @@ -1,23 +1,23 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Sources - - - - - Headers - - - \ No newline at end of file + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Sources + + + + + Headers + + + diff --git a/build/win32/vs10/test-picking.vcxproj b/build/win32/vs10/test-picking.vcxproj index 940cbc287..cb425a07f 100644 --- a/build/win32/vs10/test-picking.vcxproj +++ b/build/win32/vs10/test-picking.vcxproj @@ -47,19 +47,19 @@ - + - + - + - + @@ -164,4 +164,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/test-picking.vcxproj.filters b/build/win32/vs10/test-picking.vcxproj.filters index 43d775421..27fac1be5 100644 --- a/build/win32/vs10/test-picking.vcxproj.filters +++ b/build/win32/vs10/test-picking.vcxproj.filters @@ -11,4 +11,4 @@ Sources - \ No newline at end of file + diff --git a/build/win32/vs10/test-random-text.vcxproj b/build/win32/vs10/test-random-text.vcxproj index 0386ab3dc..6865fbb8c 100644 --- a/build/win32/vs10/test-random-text.vcxproj +++ b/build/win32/vs10/test-random-text.vcxproj @@ -47,19 +47,19 @@ - + - + - + - + @@ -163,4 +163,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/test-random-text.vcxproj.filters b/build/win32/vs10/test-random-text.vcxproj.filters index 22be023a1..9cfb50c71 100644 --- a/build/win32/vs10/test-random-text.vcxproj.filters +++ b/build/win32/vs10/test-random-text.vcxproj.filters @@ -11,4 +11,4 @@ Sources - \ No newline at end of file + diff --git a/build/win32/vs10/test-state-hidden-performance.vcxproj b/build/win32/vs10/test-state-hidden-performance.vcxproj index 15f68716d..2cf96aa5b 100644 --- a/build/win32/vs10/test-state-hidden-performance.vcxproj +++ b/build/win32/vs10/test-state-hidden-performance.vcxproj @@ -1,169 +1,169 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F} - teststatehiddenperformance - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F} + teststatehiddenperformance + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + + + + + + + + + {ea036190-0950-4640-84f9-d459a33b33a8} + false + + + + + + diff --git a/build/win32/vs10/test-state-hidden-performance.vcxproj.filters b/build/win32/vs10/test-state-hidden-performance.vcxproj.filters index c0ceb02c7..91e778e77 100644 --- a/build/win32/vs10/test-state-hidden-performance.vcxproj.filters +++ b/build/win32/vs10/test-state-hidden-performance.vcxproj.filters @@ -1,23 +1,23 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Sources - - - - - Headers - - - \ No newline at end of file + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Sources + + + + + Headers + + + diff --git a/build/win32/vs10/test-state-interactive-performance.vcxproj b/build/win32/vs10/test-state-interactive-performance.vcxproj index a431a1f4a..0b57829cb 100644 --- a/build/win32/vs10/test-state-interactive-performance.vcxproj +++ b/build/win32/vs10/test-state-interactive-performance.vcxproj @@ -1,169 +1,169 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {011F9197-F986-44BD-A8F2-045C746B1B70} - teststateinteractiveperformance - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {011F9197-F986-44BD-A8F2-045C746B1B70} + teststateinteractiveperformance + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + + + + + + + + + {ea036190-0950-4640-84f9-d459a33b33a8} + false + + + + + + diff --git a/build/win32/vs10/test-state-interactive-performance.vcxproj.filters b/build/win32/vs10/test-state-interactive-performance.vcxproj.filters index a72cd2688..ddb63cc3e 100644 --- a/build/win32/vs10/test-state-interactive-performance.vcxproj.filters +++ b/build/win32/vs10/test-state-interactive-performance.vcxproj.filters @@ -1,23 +1,23 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Sources - - - - - Headers - - - \ No newline at end of file + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Sources + + + + + Headers + + + diff --git a/build/win32/vs10/test-state-mini-performance.vcxproj b/build/win32/vs10/test-state-mini-performance.vcxproj index ca45df1f3..6303cc300 100644 --- a/build/win32/vs10/test-state-mini-performance.vcxproj +++ b/build/win32/vs10/test-state-mini-performance.vcxproj @@ -1,169 +1,169 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {D4A09850-E35B-4124-A9FF-784AB5BBCD2C} - teststateminiperformance - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C} + teststateminiperformance + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + + + + + + + + + {ea036190-0950-4640-84f9-d459a33b33a8} + false + + + + + + diff --git a/build/win32/vs10/test-state-mini-performance.vcxproj.filters b/build/win32/vs10/test-state-mini-performance.vcxproj.filters index e9339f2b6..fe9e2b735 100644 --- a/build/win32/vs10/test-state-mini-performance.vcxproj.filters +++ b/build/win32/vs10/test-state-mini-performance.vcxproj.filters @@ -1,23 +1,23 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Sources - - - - - Headers - - - \ No newline at end of file + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Sources + + + + + Headers + + + diff --git a/build/win32/vs10/test-state-performance.vcxproj b/build/win32/vs10/test-state-performance.vcxproj index de7e08912..6fa6b4f67 100644 --- a/build/win32/vs10/test-state-performance.vcxproj +++ b/build/win32/vs10/test-state-performance.vcxproj @@ -1,169 +1,169 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {BEE86058-B4BF-4AA5-91BF-E3620538ED5E} - teststateperformance - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E} + teststateperformance + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + + + + + + + + + {ea036190-0950-4640-84f9-d459a33b33a8} + false + + + + + + diff --git a/build/win32/vs10/test-state-performance.vcxproj.filters b/build/win32/vs10/test-state-performance.vcxproj.filters index 932d24e12..c94c7dc6d 100644 --- a/build/win32/vs10/test-state-performance.vcxproj.filters +++ b/build/win32/vs10/test-state-performance.vcxproj.filters @@ -1,23 +1,23 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Sources - - - - - Headers - - - \ No newline at end of file + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Sources + + + + + Headers + + + diff --git a/build/win32/vs10/test-state-pick-performance.vcxproj b/build/win32/vs10/test-state-pick-performance.vcxproj index f375446f9..201d7c6fa 100644 --- a/build/win32/vs10/test-state-pick-performance.vcxproj +++ b/build/win32/vs10/test-state-pick-performance.vcxproj @@ -1,169 +1,169 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {0C1E8E6C-1563-4F95-A994-6366EE992CB3} - teststatepickperformance - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0C1E8E6C-1563-4F95-A994-6366EE992CB3} + teststatepickperformance + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + + + + + + + + + {ea036190-0950-4640-84f9-d459a33b33a8} + false + + + + + + diff --git a/build/win32/vs10/test-state-pick-performance.vcxproj.filters b/build/win32/vs10/test-state-pick-performance.vcxproj.filters index ea7b375ce..138e63f65 100644 --- a/build/win32/vs10/test-state-pick-performance.vcxproj.filters +++ b/build/win32/vs10/test-state-pick-performance.vcxproj.filters @@ -1,23 +1,23 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Sources - - - - - Headers - - - \ No newline at end of file + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Sources + + + + + Headers + + + diff --git a/build/win32/vs10/test-text-perf-performance.vcxproj b/build/win32/vs10/test-text-perf-performance.vcxproj index f0ee2a89a..578e4f881 100644 --- a/build/win32/vs10/test-text-perf-performance.vcxproj +++ b/build/win32/vs10/test-text-perf-performance.vcxproj @@ -1,169 +1,169 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8AF1EA8E-305B-42C0-919D-12B1843B21A4} - testtextperfperformance - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - $(TestPerfProgDef);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - - - - {ea036190-0950-4640-84f9-d459a33b33a8} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8AF1EA8E-305B-42C0-919D-12B1843B21A4} + testtextperfperformance + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;$(TestPerfProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + $(TestPerfProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + + + + + + + + + {ea036190-0950-4640-84f9-d459a33b33a8} + false + + + + + + diff --git a/build/win32/vs10/test-text-perf-performance.vcxproj.filters b/build/win32/vs10/test-text-perf-performance.vcxproj.filters index 31cce6d30..940822ea1 100644 --- a/build/win32/vs10/test-text-perf-performance.vcxproj.filters +++ b/build/win32/vs10/test-text-perf-performance.vcxproj.filters @@ -1,23 +1,23 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Sources - - - - - Headers - - - \ No newline at end of file + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Sources + + + + + Headers + + + diff --git a/build/win32/vs10/test-text-perf.vcxproj b/build/win32/vs10/test-text-perf.vcxproj index c82d9f796..367e6043b 100644 --- a/build/win32/vs10/test-text-perf.vcxproj +++ b/build/win32/vs10/test-text-perf.vcxproj @@ -47,19 +47,19 @@ - + - + - + - + @@ -163,4 +163,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/test-text-perf.vcxproj.filters b/build/win32/vs10/test-text-perf.vcxproj.filters index c8b96c7a8..d153208e4 100644 --- a/build/win32/vs10/test-text-perf.vcxproj.filters +++ b/build/win32/vs10/test-text-perf.vcxproj.filters @@ -11,4 +11,4 @@ Sources - \ No newline at end of file + diff --git a/build/win32/vs10/test-text.vcxproj b/build/win32/vs10/test-text.vcxproj index 4b975f596..b6f2be071 100644 --- a/build/win32/vs10/test-text.vcxproj +++ b/build/win32/vs10/test-text.vcxproj @@ -47,19 +47,19 @@ - + - + - + - + @@ -163,4 +163,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/test-text.vcxproj.filters b/build/win32/vs10/test-text.vcxproj.filters index dba7a2684..e37673fdf 100644 --- a/build/win32/vs10/test-text.vcxproj.filters +++ b/build/win32/vs10/test-text.vcxproj.filters @@ -11,4 +11,4 @@ Sources - \ No newline at end of file +