diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 94d883df2..2bfacc8db 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -18,10 +18,6 @@ EXTRA_DIST = \
install.vcxproj \
test-cogl-perf.vcxproj \
test-cogl-perf.vcxproj.filters \
- test-conformance-clutter.vcxproj \
- test-conformance-clutter.vcxprojin \
- test-conformance-clutter.vcxproj.filters \
- test-conformance-clutter.vcxproj.filtersin \
test-interactive-clutter.vcxproj \
test-interactive-clutter.vcxprojin \
test-interactive-clutter.vcxproj.filters \
diff --git a/build/win32/vs10/clutter.sln b/build/win32/vs10/clutter.sln
index 23213b68d..9a51e7200 100644
--- a/build/win32/vs10/clutter.sln
+++ b/build/win32/vs10/clutter.sln
@@ -37,8 +37,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkevents-example", "
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "cally-clone-example.vcxproj", "{E77D40D0-19D4-4865-BE20-B6DA05BA234D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-clutter", "test-conformance-clutter.vcxproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcxproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}"
@@ -343,22 +341,6 @@ Global
{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|Win32.Build.0 = Release|Win32
{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.ActiveCfg = Release|x64
{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release|x64.Build.0 = Release|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.Build.0 = Debug|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.ActiveCfg = Debug|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.Build.0 = Debug|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.ActiveCfg = Release|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.Build.0 = Release|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.ActiveCfg = Release|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.Build.0 = Release|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release|x64
{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|Win32.Build.0 = Debug|Win32
{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug_GDK|x64.ActiveCfg = Debug|x64
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index cc987c255..72df1f672 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -118,10 +118,6 @@
{0da94d83-b64e-40ac-8074-96c2416bbbe8}
false
-
- {0f08f253-de1a-40cb-a890-93ae3ca23ade}
- false
-
{75f9e5af-040c-448e-96be-c282efffe2d9}
false
diff --git a/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin b/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin
deleted file mode 100644
index 8028da3d1..000000000
--- a/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
-
-#include "testconformance.vs10.sourcefiles.filters"
-
-
\ No newline at end of file
diff --git a/build/win32/vs10/test-conformance-clutter.vcxprojin b/build/win32/vs10/test-conformance-clutter.vcxprojin
deleted file mode 100644
index f8d923a83..000000000
--- a/build/win32/vs10/test-conformance-clutter.vcxprojin
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}
- testconformanceclutter
- Win32Proj
-
-
-
- Application
- MultiByte
- true
-
-
- Application
- MultiByte
-
-
- Application
- MultiByte
- true
-
-
- Application
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- true
- false
- false
-
-
-
- Disabled
- _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;CLUTTER_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- EditAndContinue
-
-
- pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)
- true
- Console
- MachineX86
-
-
-
-
- Disabled
- _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;CLUTTER_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level3
- ProgramDatabase
- CompileAsC
-
-
- pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)
- true
- Console
- false
-
-
- MachineX64
-
-
-
-
- MaxSpeed
- true
- COGL_ENABLE_EXPERIMENTAL_API;CLUTTER_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)
- MultiThreadedDLL
- true
-
-
- Level3
- ProgramDatabase
-
-
- pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)
- true
- Console
- true
- true
- MachineX86
-
-
-
-
- COGL_ENABLE_EXPERIMENTAL_API;CLUTTER_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions)
- MultiThreadedDLL
-
-
- Level3
- ProgramDatabase
- CompileAsC
-
-
- pango-1.0.lib;cairo.lib;atk-1.0.lib;OpenGL32.lib;%(AdditionalDependencies)
- true
- Console
- true
- true
- false
-
-
- MachineX64
-
-
-
-#include "testconformance.vs10.sourcefiles"
-
-
-
- {ea036190-0950-4640-84f9-d459a33b33a8}
- false
-
-
-
-
-
-
\ No newline at end of file
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index b11bf625b..8723fe29d 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -10,8 +10,6 @@ EXTRA_DIST = \
clutter.vsprops \
install.vcproj \
test-cogl-perf.vcproj \
- test-conformance-clutter.vcproj \
- test-conformance-clutter.vcprojin \
test-interactive-clutter.vcproj \
test-interactive-clutter.vcprojin \
test-picking.vcproj \
diff --git a/build/win32/vs9/clutter.sln b/build/win32/vs9/clutter.sln
index e1ac96062..2610fd6bd 100644
--- a/build/win32/vs9/clutter.sln
+++ b/build/win32/vs9/clutter.sln
@@ -88,11 +88,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "call
{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-clutter", "test-conformance-clutter.vcproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
- ProjectSection(ProjectDependencies) = postProject
- {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
ProjectSection(ProjectDependencies) = postProject
{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
@@ -118,7 +113,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
{E77D40D0-19D4-4865-BE20-B6DA05BA234D} = {E77D40D0-19D4-4865-BE20-B6DA05BA234D}
{4B2C0EE0-F1BD-499C-ACAD-260CF14C352E} = {4B2C0EE0-F1BD-499C-ACAD-260CF14C352E}
{C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4} = {C8EC4CE0-9C6A-4733-A0DD-477689FAF5F4}
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE} = {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}
{75F9E5AF-040C-448E-96BE-C282EFFFE2D9} = {75F9E5AF-040C-448E-96BE-C282EFFFE2D9}
EndProjectSection
EndProject
@@ -422,22 +416,6 @@ Global
{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Debug_GDK|x64.Build.0 = Debug|x64
{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.ActiveCfg = Release|x64
{E77D40D0-19D4-4865-BE20-B6DA05BA234D}.Release_GDK|x64.Build.0 = Release|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.ActiveCfg = Debug|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|Win32.Build.0 = Debug|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.ActiveCfg = Release|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|Win32.Build.0 = Release|Win32
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.ActiveCfg = Debug|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_GDK|x64.Build.0 = Debug|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.ActiveCfg = Release|x64
- {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_GDK|x64.Build.0 = Release|x64
{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.ActiveCfg = Debug|Win32
{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Debug|Win32.Build.0 = Debug|Win32
{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/build/win32/vs9/test-conformance-clutter.vcprojin b/build/win32/vs9/test-conformance-clutter.vcprojin
deleted file mode 100644
index 673c54c09..000000000
--- a/build/win32/vs9/test-conformance-clutter.vcprojin
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#include "testconformance.sourcefiles"
-
-
-
-
-