diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index eb62b2f28..94d883df2 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -28,10 +28,24 @@ EXTRA_DIST = \ test-interactive-clutter.vcxproj.filtersin \ test-picking.vcxproj \ test-picking.vcxproj.filters \ + test-picking-performance.vcxproj \ + test-picking-performance.vcxproj.filters \ test-random-text.vcxproj \ test-random-text.vcxproj.filters \ + test-state-hidden-performance.vcxproj \ + test-state-hidden-performance.vcxproj.filters \ + test-state-interactive-performance.vcxproj \ + test-state-interactive-performance.vcxproj.filters \ + test-state-mini-performance.vcxproj \ + test-state-mini-performance.vcxproj.filters \ + test-state-performance.vcxproj \ + test-state-performance.vcxproj.filters \ + test-state-pick-performance.vcxproj \ + test-state-pick-performance.vcxproj.filters \ test-text-perf.vcxproj \ test-text-perf.vcxproj.filters \ + test-text-perf-performance.vcxproj \ + test-text-perf-performance.vcxproj.filters \ test-text.vcxproj \ test-text.vcxproj.filters \ README.txt diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props index 756dba84c..12f5105f7 100644 --- a/build/win32/vs10/clutter.props +++ b/build/win32/vs10/clutter.props @@ -12,6 +12,7 @@ $(BaseBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_PREFIX="../";CLUTTER_LIBDIR="../lib";CLUTTER_DATADIR="../share";CLUTTER_LOCALEDIR="../share/locale";CLUTTER_SYSCONFDIR="../etc" $(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir" $(BaseBuildDef);TESTS_DATADIR="../share/clutter-$(ClutterApiVersion)/data" + $(BaseBuildDef);TESTS_DATA_DIR=\"../share/clutter-$(ClutterApiVersion)/data\" if exist ..\..\..\config.h goto DONE_CONFIG_H @@ -400,6 +401,9 @@ copy ..\..\..\doc\cookbook\examples\*.png $(CopyDir)\share\clutter-$(ClutterApiV $(TestProgDef) + + $(TestPerfProgDef) + $(PreBuildCmd) diff --git a/build/win32/vs10/clutter.sln b/build/win32/vs10/clutter.sln index 78161391a..43fc59cba 100644 --- a/build/win32/vs10/clutter.sln +++ b/build/win32/vs10/clutter.sln @@ -13,6 +13,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text", "test-text.vcxp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text-perf", "test-text-perf.vcxproj", "{F072974F-6675-4A79-96FF-0B0DEB113AA4}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text-perf-performance", "test-text-perf-performance.vcxproj", "{8AF1EA8E-305B-42C0-919D-12B1843B21A4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-pick-performance", "test-state-pick-performance.vcxproj", "{0C1E8E6C-1563-4F95-A994-6366EE992CB3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-mini-performance", "test-state-mini-performance.vcxproj", "{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-interactive-performance", "test-state-interactive-performance.vcxproj", "{011F9197-F986-44BD-A8F2-045C746B1B70}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-hidden-performance", "test-state-hidden-performance.vcxproj", "{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-performance", "test-state-performance.vcxproj", "{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-picking-performance", "test-picking-performance.vcxproj", "{2035D56A-E748-475F-B3D5-C123BF652143}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atktext-example", "cally-atktext-example.vcxproj", "{27BA2900-A28A-4869-B16D-FBE581A12402}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkcomponent-example", "cally-atkcomponent-example.vcxproj", "{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}" @@ -85,6 +99,62 @@ Global {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|Win32.Build.0 = Release|Win32 {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|x64.ActiveCfg = Release|x64 {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|x64.Build.0 = Release|x64 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|Win32.ActiveCfg = Debug|Win32 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|Win32.Build.0 = Debug|Win32 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|x64.ActiveCfg = Debug|x64 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|x64.Build.0 = Debug|x64 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|Win32.ActiveCfg = Release|Win32 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|Win32.Build.0 = Release|Win32 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|x64.ActiveCfg = Release|x64 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|x64.Build.0 = Release|x64 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|Win32.ActiveCfg = Debug|Win32 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|Win32.Build.0 = Debug|Win32 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|x64.ActiveCfg = Debug|x64 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|x64.Build.0 = Debug|x64 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|Win32.ActiveCfg = Release|Win32 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|Win32.Build.0 = Release|Win32 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|x64.ActiveCfg = Release|x64 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|x64.Build.0 = Release|x64 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|Win32.ActiveCfg = Debug|Win32 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|Win32.Build.0 = Debug|Win32 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|x64.ActiveCfg = Debug|x64 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|x64.Build.0 = Debug|x64 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|Win32.ActiveCfg = Release|Win32 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|Win32.Build.0 = Release|Win32 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|x64.ActiveCfg = Release|x64 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|x64.Build.0 = Release|x64 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|Win32.ActiveCfg = Debug|Win32 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|Win32.Build.0 = Debug|Win32 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|x64.ActiveCfg = Debug|x64 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|x64.Build.0 = Debug|x64 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|Win32.ActiveCfg = Release|Win32 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|Win32.Build.0 = Release|Win32 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|x64.ActiveCfg = Release|x64 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|x64.Build.0 = Release|x64 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|Win32.Build.0 = Debug|Win32 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|x64.ActiveCfg = Debug|x64 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|x64.Build.0 = Debug|x64 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|Win32.ActiveCfg = Release|Win32 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|Win32.Build.0 = Release|Win32 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|x64.ActiveCfg = Release|x64 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|x64.Build.0 = Release|x64 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|Win32.ActiveCfg = Debug|Win32 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|Win32.Build.0 = Debug|Win32 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|x64.ActiveCfg = Debug|x64 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|x64.Build.0 = Debug|x64 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|Win32.ActiveCfg = Release|Win32 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|Win32.Build.0 = Release|Win32 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|x64.ActiveCfg = Release|x64 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|x64.Build.0 = Release|x64 + {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|Win32.ActiveCfg = Debug|Win32 + {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|Win32.Build.0 = Debug|Win32 + {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|x64.ActiveCfg = Debug|x64 + {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|x64.Build.0 = Debug|x64 + {2035D56A-E748-475F-B3D5-C123BF652143}.Release|Win32.ActiveCfg = Release|Win32 + {2035D56A-E748-475F-B3D5-C123BF652143}.Release|Win32.Build.0 = Release|Win32 + {2035D56A-E748-475F-B3D5-C123BF652143}.Release|x64.ActiveCfg = Release|x64 + {2035D56A-E748-475F-B3D5-C123BF652143}.Release|x64.Build.0 = Release|x64 {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|Win32.ActiveCfg = Debug|Win32 {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|Win32.Build.0 = Debug|Win32 {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index 5d410458c..cc987c255 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -126,6 +126,10 @@ {75f9e5af-040c-448e-96be-c282efffe2d9} false + + {2035d56a-e748-475f-b3d5-c123bf652143} + false + {f433db3c-1223-489a-ad0c-c64b09f51139} false @@ -134,6 +138,30 @@ {b8849c58-6773-453c-a2e5-00f02ee20b18} false + + {2d60135e-2e37-4f54-a1c5-43bcd5bbba4f} + false + + + {011f9197-f986-44bd-a8f2-045c746b1b70} + false + + + {d4a09850-e35b-4124-a9ff-784ab5bbcd2c} + false + + + {bee86058-b4bf-4aa5-91bf-e3620538ed5e} + false + + + {0c1e8e6c-1563-4f95-a994-6366ee992cb3} + false + + + {8af1ea8e-305b-42c0-919d-12b1843b21a4} + false + {f072974f-6675-4a79-96ff-0b0deb113aa4} false diff --git a/build/win32/vs10/test-picking-performance.vcxproj b/build/win32/vs10/test-picking-performance.vcxproj new file mode 100644 index 000000000..d222d4f84 --- /dev/null +++ b/build/win32/vs10/test-picking-performance.vcxproj @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2035D56A-E748-475F-B3D5-C123BF652143} + testpickingperformance + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + 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 diff --git a/build/win32/vs10/test-picking-performance.vcxproj.filters b/build/win32/vs10/test-picking-performance.vcxproj.filters new file mode 100644 index 000000000..f90e6956f --- /dev/null +++ b/build/win32/vs10/test-picking-performance.vcxproj.filters @@ -0,0 +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 diff --git a/build/win32/vs10/test-state-hidden-performance.vcxproj b/build/win32/vs10/test-state-hidden-performance.vcxproj new file mode 100644 index 000000000..f3c23b68b --- /dev/null +++ b/build/win32/vs10/test-state-hidden-performance.vcxproj @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F} + teststatehiddenperformance + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + 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 diff --git a/build/win32/vs10/test-state-hidden-performance.vcxproj.filters b/build/win32/vs10/test-state-hidden-performance.vcxproj.filters new file mode 100644 index 000000000..c0ceb02c7 --- /dev/null +++ b/build/win32/vs10/test-state-hidden-performance.vcxproj.filters @@ -0,0 +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 diff --git a/build/win32/vs10/test-state-interactive-performance.vcxproj b/build/win32/vs10/test-state-interactive-performance.vcxproj new file mode 100644 index 000000000..4de71e3e6 --- /dev/null +++ b/build/win32/vs10/test-state-interactive-performance.vcxproj @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {011F9197-F986-44BD-A8F2-045C746B1B70} + teststateinteractiveperformance + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + 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 diff --git a/build/win32/vs10/test-state-interactive-performance.vcxproj.filters b/build/win32/vs10/test-state-interactive-performance.vcxproj.filters new file mode 100644 index 000000000..a72cd2688 --- /dev/null +++ b/build/win32/vs10/test-state-interactive-performance.vcxproj.filters @@ -0,0 +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 diff --git a/build/win32/vs10/test-state-mini-performance.vcxproj b/build/win32/vs10/test-state-mini-performance.vcxproj new file mode 100644 index 000000000..cb6f42192 --- /dev/null +++ b/build/win32/vs10/test-state-mini-performance.vcxproj @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C} + teststateminiperformance + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + 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 diff --git a/build/win32/vs10/test-state-mini-performance.vcxproj.filters b/build/win32/vs10/test-state-mini-performance.vcxproj.filters new file mode 100644 index 000000000..e9339f2b6 --- /dev/null +++ b/build/win32/vs10/test-state-mini-performance.vcxproj.filters @@ -0,0 +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 diff --git a/build/win32/vs10/test-state-performance.vcxproj b/build/win32/vs10/test-state-performance.vcxproj new file mode 100644 index 000000000..1898140fa --- /dev/null +++ b/build/win32/vs10/test-state-performance.vcxproj @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E} + teststateperformance + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + 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 diff --git a/build/win32/vs10/test-state-performance.vcxproj.filters b/build/win32/vs10/test-state-performance.vcxproj.filters new file mode 100644 index 000000000..932d24e12 --- /dev/null +++ b/build/win32/vs10/test-state-performance.vcxproj.filters @@ -0,0 +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 diff --git a/build/win32/vs10/test-state-pick-performance.vcxproj b/build/win32/vs10/test-state-pick-performance.vcxproj new file mode 100644 index 000000000..aaed61ac0 --- /dev/null +++ b/build/win32/vs10/test-state-pick-performance.vcxproj @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0C1E8E6C-1563-4F95-A994-6366EE992CB3} + teststatepickperformance + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + 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 diff --git a/build/win32/vs10/test-state-pick-performance.vcxproj.filters b/build/win32/vs10/test-state-pick-performance.vcxproj.filters new file mode 100644 index 000000000..ea7b375ce --- /dev/null +++ b/build/win32/vs10/test-state-pick-performance.vcxproj.filters @@ -0,0 +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 diff --git a/build/win32/vs10/test-text-perf-performance.vcxproj b/build/win32/vs10/test-text-perf-performance.vcxproj new file mode 100644 index 000000000..b8d7a3c5e --- /dev/null +++ b/build/win32/vs10/test-text-perf-performance.vcxproj @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8AF1EA8E-305B-42C0-919D-12B1843B21A4} + testtextperfperformance + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + 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 diff --git a/build/win32/vs10/test-text-perf-performance.vcxproj.filters b/build/win32/vs10/test-text-perf-performance.vcxproj.filters new file mode 100644 index 000000000..31cce6d30 --- /dev/null +++ b/build/win32/vs10/test-text-perf-performance.vcxproj.filters @@ -0,0 +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 diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 8192f1a1c..b11bf625b 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -15,7 +15,14 @@ EXTRA_DIST = \ test-interactive-clutter.vcproj \ test-interactive-clutter.vcprojin \ test-picking.vcproj \ + test-picking-performance.vcproj \ test-random-text.vcproj \ + test-state-hidden-performance.vcproj \ + test-state-interactive-performance.vcproj \ + test-state-mini-performance.vcproj \ + test-state-performance.vcproj \ + test-state-pick-performance.vcproj \ test-text-perf.vcproj \ + test-text-perf-performance.vcproj \ test-text.vcproj \ README.txt diff --git a/build/win32/vs9/clutter.sln b/build/win32/vs9/clutter.sln index 195ecb01c..23b59f2bc 100644 --- a/build/win32/vs9/clutter.sln +++ b/build/win32/vs9/clutter.sln @@ -28,6 +28,41 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text-perf", "test-text {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-text-perf-performance", "test-text-perf-performance.vcproj", "{8AF1EA8E-305B-42C0-919D-12B1843B21A4}" + ProjectSection(ProjectDependencies) = postProject + {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-pick-performance", "test-state-pick-performance.vcproj", "{0C1E8E6C-1563-4F95-A994-6366EE992CB3}" + ProjectSection(ProjectDependencies) = postProject + {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-mini-performance", "test-state-mini-performance.vcproj", "{D4A09850-E35B-4124-A9FF-784AB5BBCD2C}" + ProjectSection(ProjectDependencies) = postProject + {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-interactive-performance", "test-state-interactive-performance.vcproj", "{011F9197-F986-44BD-A8F2-045C746B1B70}" + ProjectSection(ProjectDependencies) = postProject + {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-hidden-performance", "test-state-hidden-performance.vcproj", "{2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}" + ProjectSection(ProjectDependencies) = postProject + {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-state-performance", "test-state-performance.vcproj", "{BEE86058-B4BF-4AA5-91BF-E3620538ED5E}" + ProjectSection(ProjectDependencies) = postProject + {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-picking-performance", "test-picking-performance.vcproj", "{2035D56A-E748-475F-B3D5-C123BF652143}" + ProjectSection(ProjectDependencies) = postProject + {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atktext-example", "cally-atktext-example.vcproj", "{27BA2900-A28A-4869-B16D-FBE581A12402}" ProjectSection(ProjectDependencies) = postProject {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} @@ -69,6 +104,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", {F433DB3C-1223-489A-AD0C-C64B09F51139} = {F433DB3C-1223-489A-AD0C-C64B09F51139} {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC} = {B0A69C4A-4E54-45E8-B7E4-B8B2D49E30FC} {F072974F-6675-4A79-96FF-0B0DEB113AA4} = {F072974F-6675-4A79-96FF-0B0DEB113AA4} + {8AF1EA8E-305B-42C0-919D-12B1843B21A4} = {8AF1EA8E-305B-42C0-919D-12B1843B21A4} + {0C1E8E6C-1563-4F95-A994-6366EE992CB3} = {0C1E8E6C-1563-4F95-A994-6366EE992CB3} + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C} = {D4A09850-E35B-4124-A9FF-784AB5BBCD2C} + {011F9197-F986-44BD-A8F2-045C746B1B70} = {011F9197-F986-44BD-A8F2-045C746B1B70} + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F} = {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F} + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E} = {BEE86058-B4BF-4AA5-91BF-E3620538ED5E} + {2035D56A-E748-475F-B3D5-C123BF652143} = {2035D56A-E748-475F-B3D5-C123BF652143} {B8849C58-6773-453C-A2E5-00F02EE20B18} = {B8849C58-6773-453C-A2E5-00F02EE20B18} {0DA94D83-B64E-40AC-8074-96C2416BBBE8} = {0DA94D83-B64E-40AC-8074-96C2416BBBE8} {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} @@ -136,6 +178,62 @@ Global {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Debug|x64.Build.0 = Debug|x64 {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|x64.ActiveCfg = Release|x64 {F072974F-6675-4A79-96FF-0B0DEB113AA4}.Release|x64.Build.0 = Release|x64 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|Win32.ActiveCfg = Debug|Win32 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|Win32.Build.0 = Debug|Win32 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|Win32.ActiveCfg = Release|Win32 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|Win32.Build.0 = Release|Win32 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|x64.ActiveCfg = Debug|x64 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Debug|x64.Build.0 = Debug|x64 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|x64.ActiveCfg = Release|x64 + {8AF1EA8E-305B-42C0-919D-12B1843B21A4}.Release|x64.Build.0 = Release|x64 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|Win32.ActiveCfg = Debug|Win32 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|Win32.Build.0 = Debug|Win32 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|Win32.ActiveCfg = Release|Win32 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|Win32.Build.0 = Release|Win32 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|x64.ActiveCfg = Debug|x64 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Debug|x64.Build.0 = Debug|x64 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|x64.ActiveCfg = Release|x64 + {0C1E8E6C-1563-4F95-A994-6366EE992CB3}.Release|x64.Build.0 = Release|x64 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|Win32.ActiveCfg = Debug|Win32 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|Win32.Build.0 = Debug|Win32 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|Win32.ActiveCfg = Release|Win32 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|Win32.Build.0 = Release|Win32 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|x64.ActiveCfg = Debug|x64 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Debug|x64.Build.0 = Debug|x64 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|x64.ActiveCfg = Release|x64 + {D4A09850-E35B-4124-A9FF-784AB5BBCD2C}.Release|x64.Build.0 = Release|x64 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|Win32.ActiveCfg = Debug|Win32 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|Win32.Build.0 = Debug|Win32 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|Win32.ActiveCfg = Release|Win32 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|Win32.Build.0 = Release|Win32 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|x64.ActiveCfg = Debug|x64 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Debug|x64.Build.0 = Debug|x64 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|x64.ActiveCfg = Release|x64 + {011F9197-F986-44BD-A8F2-045C746B1B70}.Release|x64.Build.0 = Release|x64 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|Win32.ActiveCfg = Debug|Win32 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|Win32.Build.0 = Debug|Win32 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|Win32.ActiveCfg = Release|Win32 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|Win32.Build.0 = Release|Win32 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|x64.ActiveCfg = Debug|x64 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Debug|x64.Build.0 = Debug|x64 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|x64.ActiveCfg = Release|x64 + {2D60135E-2E37-4F54-A1C5-43BCD5BBBA4F}.Release|x64.Build.0 = Release|x64 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|Win32.ActiveCfg = Debug|Win32 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|Win32.Build.0 = Debug|Win32 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|Win32.ActiveCfg = Release|Win32 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|Win32.Build.0 = Release|Win32 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|x64.ActiveCfg = Debug|x64 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Debug|x64.Build.0 = Debug|x64 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|x64.ActiveCfg = Release|x64 + {BEE86058-B4BF-4AA5-91BF-E3620538ED5E}.Release|x64.Build.0 = Release|x64 + {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|Win32.ActiveCfg = Debug|Win32 + {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|Win32.Build.0 = Debug|Win32 + {2035D56A-E748-475F-B3D5-C123BF652143}.Release|Win32.ActiveCfg = Release|Win32 + {2035D56A-E748-475F-B3D5-C123BF652143}.Release|Win32.Build.0 = Release|Win32 + {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|x64.ActiveCfg = Debug|x64 + {2035D56A-E748-475F-B3D5-C123BF652143}.Debug|x64.Build.0 = Debug|x64 + {2035D56A-E748-475F-B3D5-C123BF652143}.Release|x64.ActiveCfg = Release|x64 + {2035D56A-E748-475F-B3D5-C123BF652143}.Release|x64.Build.0 = Release|x64 {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|Win32.ActiveCfg = Debug|Win32 {27BA2900-A28A-4869-B16D-FBE581A12402}.Debug|Win32.Build.0 = Debug|Win32 {27BA2900-A28A-4869-B16D-FBE581A12402}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops index be627a908..92316a93b 100644 --- a/build/win32/vs9/clutter.vsprops +++ b/build/win32/vs9/clutter.vsprops @@ -58,6 +58,10 @@ Name="TestProgDef" Value="$(BaseBuildDef);TESTS_DATADIR=\"../share/clutter-$(ClutterApiVersion)/data\"" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/test-state-hidden-performance.vcproj b/build/win32/vs9/test-state-hidden-performance.vcproj new file mode 100644 index 000000000..886b386c0 --- /dev/null +++ b/build/win32/vs9/test-state-hidden-performance.vcproj @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/test-state-interactive-performance.vcproj b/build/win32/vs9/test-state-interactive-performance.vcproj new file mode 100644 index 000000000..45c9615c4 --- /dev/null +++ b/build/win32/vs9/test-state-interactive-performance.vcproj @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/test-state-mini-performance.vcproj b/build/win32/vs9/test-state-mini-performance.vcproj new file mode 100644 index 000000000..62002d17d --- /dev/null +++ b/build/win32/vs9/test-state-mini-performance.vcproj @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/test-state-performance.vcproj b/build/win32/vs9/test-state-performance.vcproj new file mode 100644 index 000000000..435814add --- /dev/null +++ b/build/win32/vs9/test-state-performance.vcproj @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/test-state-pick-performance.vcproj b/build/win32/vs9/test-state-pick-performance.vcproj new file mode 100644 index 000000000..1d9277def --- /dev/null +++ b/build/win32/vs9/test-state-pick-performance.vcproj @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/test-text-perf-performance.vcproj b/build/win32/vs9/test-text-perf-performance.vcproj new file mode 100644 index 000000000..9264a10b1 --- /dev/null +++ b/build/win32/vs9/test-text-perf-performance.vcproj @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +