[cogl/cogl-1.18] Fix Conformance Test MSVC 2008 Project

[Chun-wei Fan <fanchunwei src gnome org>]

commit 6109c47189916bed54c1a958d29239b57c4b7e1b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Feb 27 18:07:56 2014 +0800

    Fix Conformance Test MSVC 2008 Project
    
    Don't define COGL_COMPILATION when we build the conformance tests.

 build/win32/vs9/cogl.vsprops                   |    4 ----
 build/win32/vs9/test-conformance-cogl.vcprojin |    8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 913783b..1f768c3 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -70,10 +70,6 @@
                Value="G_LOG_DOMAIN=\&quot;Cogl-Pango\&quot;"
        />
        <UserMacro
-               Name="TestProgDef"
-               Value="COGL_COMPILATION"
-       />
-       <UserMacro
                Name="CopyDefinesSDLH"
                Value="
 if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H&#x0D;&#x0A;
diff --git a/build/win32/vs9/test-conformance-cogl.vcprojin b/build/win32/vs9/test-conformance-cogl.vcprojin
index 1f834b4..03d68db 100644
--- a/build/win32/vs9/test-conformance-cogl.vcprojin
+++ b/build/win32/vs9/test-conformance-cogl.vcprojin
@@ -32,7 +32,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\test-fixtures"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
+                               PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -62,7 +62,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\test-fixtures"
                                Optimization="0"
-                               PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
+                               PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -97,7 +97,7 @@
                                AdditionalIncludeDirectories="..\..\..\test-fixtures"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
+                               PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="0"
@@ -128,7 +128,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="..\..\..\test-fixtures"
-                               PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)"
+                               PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"