diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-02-27 18:07:56 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-02-27 18:07:56 +0800 |
| commit | 6109c47189916bed54c1a958d29239b57c4b7e1b (patch) | |
| tree | 6a72cf1094e1e85a05033be6db663129c818d603 | |
| parent | 521f12847e3674f4e6e87d929e1e3d7f06e75e58 (diff) | |
| download | cogl-6109c47189916bed54c1a958d29239b57c4b7e1b.tar.gz | |
Fix Conformance Test MSVC 2008 Project
Don't define COGL_COMPILATION when we build the conformance tests.
| -rw-r--r-- | build/win32/vs9/cogl.vsprops | 4 | ||||
| -rw-r--r-- | 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 913783bf..1f768c38 100644 --- a/build/win32/vs9/cogl.vsprops +++ b/build/win32/vs9/cogl.vsprops @@ -70,10 +70,6 @@ Value="G_LOG_DOMAIN=\"Cogl-Pango\""
/>
<UserMacro
- Name="TestProgDef"
- Value="COGL_COMPILATION"
- />
- <UserMacro
Name="CopyDefinesSDLH"
Value="
if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H

diff --git a/build/win32/vs9/test-conformance-cogl.vcprojin b/build/win32/vs9/test-conformance-cogl.vcprojin index 1f834b49..03d68dba 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" |