isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 12:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Conformance Test MSVC 2008 Project

Browse Source 
Don't define COGL_COMPILATION when we build the conformance tests.
This commit is contained in:
Chun-wei Fan 2014-02-27 18:07:56 +08:00
parent 521f12847e
commit 6109c47189
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/win32/vs9/cogl.vsprops
View File

@ -69,10 +69,6 @@
Name="CoglPangoBuildDefines" Name="CoglPangoBuildDefines"
Value="G_LOG_DOMAIN=\"Cogl-Pango\"" Value="G_LOG_DOMAIN=\"Cogl-Pango\""
/> />
<UserMacro
Name="TestProgDef"
Value="COGL_COMPILATION"
/>
<UserMacro <UserMacro
Name="CopyDefinesSDLH" Name="CopyDefinesSDLH"
Value=" Value="

8
build/win32/vs9/test-conformance-cogl.vcprojin
View File

@ -32,7 +32,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\test-fixtures" AdditionalIncludeDirectories="..\..\..\test-fixtures"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)" PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -62,7 +62,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\test-fixtures" AdditionalIncludeDirectories="..\..\..\test-fixtures"
Optimization="0" Optimization="0"
PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)" PreprocessorDefinitions="_DEBUG;COGL_ENABLE_EXPERIMENTAL_API"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -97,7 +97,7 @@
AdditionalIncludeDirectories="..\..\..\test-fixtures" AdditionalIncludeDirectories="..\..\..\test-fixtures"
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)" PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -128,7 +128,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\test-fixtures" AdditionalIncludeDirectories="..\..\..\test-fixtures"
PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef)" PreprocessorDefinitions="COGL_ENABLE_EXPERIMENTAL_API"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"