From 72f992effe6cbc9f2b9a2052279a52aade2a037c Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 9 Jul 2012 17:41:14 +0800 Subject: [PATCH] Update Visual C++ project files -The test program and examples must be linked to SDL too when COGL is built with the SDL renderer, so add configs accordingly. -Also use Multibyte character sets (i.e. don't -DUNICODE) for all configs, like what GLib does, for consistency. -Fix the VS2010 property sheets that was accidently malformed. (cherry picked from commit 9ed541b4e35208df87ffaa5fbbb39e11e8c247ef) --- build/win32/vs10/cogl-crate.vcxproj | 147 ++++++++++++++- build/win32/vs10/cogl-hello.vcxproj | 169 +++++++++++++----- build/win32/vs10/cogl-info.vcxproj | 148 ++++++++++++++- build/win32/vs10/cogl-msaa.vcxproj | 148 ++++++++++++++- build/win32/vs10/cogl-pango.vcxprojin | 4 +- build/win32/vs10/cogl-sdl-hello.vcxproj | 4 +- build/win32/vs10/cogl.props | 2 +- build/win32/vs10/cogl.vcxprojin | 8 +- build/win32/vs10/cogl_sdl.sln | 64 +++---- .../vs10/test-conformance-cogl.vcxprojin | 147 ++++++++++++++- build/win32/vs9/cogl-crate.vcproj | 139 +++++++++++++- build/win32/vs9/cogl-hello.vcproj | 133 +++++++++++++- build/win32/vs9/cogl-info.vcproj | 133 +++++++++++++- build/win32/vs9/cogl-msaa.vcproj | 133 +++++++++++++- build/win32/vs9/cogl-pango.vcprojin | 4 +- build/win32/vs9/cogl-sdl-hello.vcproj | 4 +- build/win32/vs9/cogl.vcprojin | 8 +- build/win32/vs9/cogl_sdl.sln | 80 ++++----- .../win32/vs9/test-conformance-cogl.vcprojin | 133 +++++++++++++- 19 files changed, 1452 insertions(+), 156 deletions(-) diff --git a/build/win32/vs10/cogl-crate.vcxproj b/build/win32/vs10/cogl-crate.vcxproj index c45830216..7a717530c 100644 --- a/build/win32/vs10/cogl-crate.vcxproj +++ b/build/win32/vs10/cogl-crate.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug_SDL + Win32 + Debug x64 + + Debug_SDL + x64 + Release Win32 + + Release_SDL + Win32 + Release x64 + + Release_SDL + x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF} @@ -26,22 +42,40 @@ Application - Unicode + MultiByte + true + + + Application + MultiByte true Application - Unicode + MultiByte + + + Application + MultiByte Application MultiByte true + + Application + MultiByte + true + Application MultiByte + + Application + MultiByte + @@ -49,24 +83,48 @@ + + + + + + + + + + + + + + + + true + true + Debug\$(Platform)\bin\ true + true + Debug\$(Platform)\bin\ false + false + Release\$(Platform)\bin\ false + false + Release\$(Platform)\bin\ @@ -87,6 +145,25 @@ MachineX86 + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + SDL.lib;SDLmain.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + true + Console + MachineX86 + + Disabled @@ -110,6 +187,29 @@ MachineX64 + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + SDL.lib;SDLmain.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + true + Console + false + + + MachineX64 + + MaxSpeed @@ -131,6 +231,27 @@ MachineX86 + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + SDL.lib;SDLmain.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + true + Console + true + true + MachineX86 + + COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) @@ -153,6 +274,28 @@ MachineX64 + + + COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + SDL.lib;SDLmain.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + diff --git a/build/win32/vs10/cogl-hello.vcxproj b/build/win32/vs10/cogl-hello.vcxproj index 5e4496dac..152c9cac2 100644 --- a/build/win32/vs10/cogl-hello.vcxproj +++ b/build/win32/vs10/cogl-hello.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug_SDL + Win32 + Debug x64 + + Debug_SDL + x64 + Release Win32 + + Release_SDL + Win32 + Release x64 + + Release_SDL + x64 + {F5A43C12-7032-428E-A56A-D294075FA493} @@ -26,21 +42,39 @@ Application - Unicode + MultiByte true - + Application - Unicode + MultiByte true Application - Unicode + MultiByte + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + true Application - Unicode + MultiByte + + + Application + MultiByte @@ -49,24 +83,48 @@ + + + + + + + + + + + + + + + + true + true + Debug\$(Platform)\bin\ true + true + Debug\$(Platform)\bin\ false + false + Release\$(Platform)\bin\ false + false + Release\$(Platform)\bin\ @@ -86,6 +144,25 @@ MachineX86 + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + MachineX86 + + Disabled @@ -102,7 +179,7 @@ Console - + Disabled _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) @@ -114,48 +191,11 @@ ProgramDatabase + SDL.lib;SDLmain.lib;%(AdditionalDependencies) true Console - - - Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - false - - - MachineX64 - - MaxSpeed @@ -176,6 +216,27 @@ MachineX86 + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + true + true + MachineX86 + + MaxSpeed @@ -195,6 +256,26 @@ true + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + true + true + + diff --git a/build/win32/vs10/cogl-info.vcxproj b/build/win32/vs10/cogl-info.vcxproj index 2e5405111..5db8f1e7b 100644 --- a/build/win32/vs10/cogl-info.vcxproj +++ b/build/win32/vs10/cogl-info.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug_SDL + Win32 + Debug x64 + + Debug_SDL + x64 + Release Win32 + + Release_SDL + Win32 + Release x64 + + Release_SDL + x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3} @@ -26,22 +42,40 @@ Application - Unicode + MultiByte + true + + + Application + MultiByte true Application - Unicode + MultiByte + + + Application + MultiByte Application MultiByte true + + Application + MultiByte + true + Application MultiByte + + Application + MultiByte + @@ -49,25 +83,48 @@ + + + + + + + + + + + + + + + + - <_ProjectFileVersion>10.0.40219.1 true + true + Debug\$(Platform)\bin\ true + true + Debug\$(Platform)\bin\ false + false + Release\$(Platform)\bin\ false + false + Release\$(Platform)\bin\ @@ -87,6 +144,25 @@ MachineX86 + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + MachineX86 + + Disabled @@ -109,6 +185,29 @@ MachineX64 + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + false + + + MachineX64 + + MaxSpeed @@ -129,6 +228,27 @@ MachineX86 + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + true + true + MachineX86 + + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) @@ -150,6 +270,28 @@ MachineX64 + + + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + diff --git a/build/win32/vs10/cogl-msaa.vcxproj b/build/win32/vs10/cogl-msaa.vcxproj index ff77e4b77..3dfb1b85f 100644 --- a/build/win32/vs10/cogl-msaa.vcxproj +++ b/build/win32/vs10/cogl-msaa.vcxproj @@ -5,18 +5,34 @@ Debug Win32 + + Debug_SDL + Win32 + Debug x64 + + Debug_SDL + x64 + Release Win32 + + Release_SDL + Win32 + Release x64 + + Releas_SDLe + x64 + {44E864D4-8447-484D-9B16-D5405E0783CF} @@ -26,22 +42,40 @@ Application - Unicode + MultiByte + true + + + Application + MultiByte true Application - Unicode + MultiByte + + + Application + MultiByte Application MultiByte true + + Application + MultiByte + true + Application MultiByte + + Application + MultiByte + @@ -49,25 +83,48 @@ + + + + + + + + + + + + + + + + - <_ProjectFileVersion>10.0.40219.1 true + true + Debug\$(Platform)\bin\ true + true + Debug\$(Platform)\bin\ false + false + Release\$(Platform)\bin\ false + false + Release\$(Platform)\bin\ @@ -87,6 +144,25 @@ MachineX86 + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + MachineX86 + + Disabled @@ -109,6 +185,29 @@ MachineX64 + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + false + + + MachineX64 + + MaxSpeed @@ -129,7 +228,50 @@ MachineX86 + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin index 2c3f392a8..11070a7ed 100644 --- a/build/win32/vs10/cogl-pango.vcxprojin +++ b/build/win32/vs10/cogl-pango.vcxprojin @@ -26,12 +26,12 @@ DynamicLibrary - Unicode + MultiByte true DynamicLibrary - Unicode + MultiByte DynamicLibrary diff --git a/build/win32/vs10/cogl-sdl-hello.vcxproj b/build/win32/vs10/cogl-sdl-hello.vcxproj index fdfcde169..1186e66a4 100644 --- a/build/win32/vs10/cogl-sdl-hello.vcxproj +++ b/build/win32/vs10/cogl-sdl-hello.vcxproj @@ -26,12 +26,12 @@ Application - Unicode + MultiByte true Application - Unicode + MultiByte Application diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props index cb46ddfea..09bec4b50 100644 --- a/build/win32/vs10/cogl.props +++ b/build/win32/vs10/cogl.props @@ -203,7 +203,7 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def - + echo EXPORTS > ..\..\..\cogl-pango\cogl-pango.def diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin index a541d617b..86ffdd239 100644 --- a/build/win32/vs10/cogl.vcxprojin +++ b/build/win32/vs10/cogl.vcxprojin @@ -42,21 +42,21 @@ DynamicLibrary - Unicode + MultiByte true DynamicLibrary - Unicode + MultiByte true DynamicLibrary - Unicode + MultiByte DynamicLibrary - Unicode + MultiByte DynamicLibrary diff --git a/build/win32/vs10/cogl_sdl.sln b/build/win32/vs10/cogl_sdl.sln index c20e8f908..124f27704 100644 --- a/build/win32/vs10/cogl_sdl.sln +++ b/build/win32/vs10/cogl_sdl.sln @@ -41,14 +41,14 @@ Global {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.Build.0 = Release|Win32 {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.ActiveCfg = Release|x64 {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|x64.Build.0 = Release|x64 - {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.ActiveCfg = Debug|Win32 - {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.Build.0 = Debug|Win32 - {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.ActiveCfg = Debug|x64 - {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.Build.0 = Debug|x64 - {F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.ActiveCfg = Release|Win32 - {F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.Build.0 = Release|Win32 - {F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.ActiveCfg = Release|x64 - {F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.Build.0 = Release|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.ActiveCfg = Debug_SDL|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|Win32.Build.0 = Debug_SDL|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.ActiveCfg = Debug_SDL|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug|x64.Build.0 = Debug_SDL|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.ActiveCfg = Release_SDL|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|Win32.Build.0 = Release_SDL|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.ActiveCfg = Release_SDL|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release|x64.Build.0 = Release_SDL|x64 {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug|Win32.ActiveCfg = Debug|Win32 {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug|Win32.Build.0 = Debug|Win32 {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug|x64.ActiveCfg = Debug|x64 @@ -57,30 +57,30 @@ Global {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|Win32.Build.0 = Release|Win32 {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|x64.ActiveCfg = Release|x64 {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|x64.Build.0 = Release|x64 - {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.Build.0 = Debug|Win32 - {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.ActiveCfg = Debug|x64 - {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.Build.0 = Debug|x64 - {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.ActiveCfg = Release|Win32 - {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.Build.0 = Release|Win32 - {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.ActiveCfg = Release|x64 - {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.Build.0 = Release|x64 - {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.ActiveCfg = Debug|Win32 - {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.Build.0 = Debug|Win32 - {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.ActiveCfg = Debug|x64 - {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.Build.0 = Debug|x64 - {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.ActiveCfg = Release|Win32 - {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.Build.0 = Release|Win32 - {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.ActiveCfg = Release|x64 - {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|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}.Debug|x64.ActiveCfg = Debug|x64 - {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug|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 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.ActiveCfg = Debug_SDL|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|Win32.Build.0 = Debug_SDL|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.ActiveCfg = Debug_SDL|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug|x64.Build.0 = Debug_SDL|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.ActiveCfg = Release_SDL|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|Win32.Build.0 = Release_SDL|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.ActiveCfg = Release_SDL|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release|x64.Build.0 = Release_SDL|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.ActiveCfg = Debug_SDL|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|Win32.Build.0 = Debug_SDL|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.ActiveCfg = Debug_SDL|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug|x64.Build.0 = Debug_SDL|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.ActiveCfg = Release_SDL|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|Win32.Build.0 = Release_SDL|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.ActiveCfg = Release_SDL|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release|x64.Build.0 = Release_SDL|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.ActiveCfg = Debug_SDL|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|Win32.Build.0 = Debug_SDL|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.ActiveCfg = Debug_SDL|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug|x64.Build.0 = Debug_SDL|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.ActiveCfg = Release_SDL|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|Win32.Build.0 = Release_SDL|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.ActiveCfg = Release_SDL|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release|x64.Build.0 = Release_SDL|x64 {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.ActiveCfg = Debug|Win32 {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|Win32.Build.0 = Debug|Win32 {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/build/win32/vs10/test-conformance-cogl.vcxprojin b/build/win32/vs10/test-conformance-cogl.vcxprojin index b7d91f287..b7eb8da9f 100644 --- a/build/win32/vs10/test-conformance-cogl.vcxprojin +++ b/build/win32/vs10/test-conformance-cogl.vcxprojin @@ -5,18 +5,34 @@ Debug Win32 + + Debug_SDL + Win32 + Debug x64 + + Debug_SDL + x64 + Release Win32 + + Release_SDL + Win32 + Release x64 + + Release_SDL + x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE} @@ -26,22 +42,40 @@ Application - Unicode + MultiByte + true + + + Application + MultiByte true Application - Unicode + MultiByte + + + Application + MultiByte Application MultiByte true + + Application + MultiByte + true + Application MultiByte + + Application + MultiByte + @@ -49,24 +83,48 @@ + + + + + + + + + + + + + + + + true + true + Debug\$(Platform)\bin\ true + true + Debug\$(Platform)\bin\ false + false + Release\$(Platform)\bin\ false + false + Release\$(Platform)\bin\ @@ -87,6 +145,25 @@ MachineX86 + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + MachineX86 + + Disabled @@ -110,6 +187,29 @@ MachineX64 + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + false + + + MachineX64 + + MaxSpeed @@ -131,6 +231,27 @@ MachineX86 + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + SDL.lib;SDLMain.lib;%(AdditionalDependencies) + true + Console + true + true + MachineX86 + + COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) @@ -153,6 +274,28 @@ MachineX64 + + + COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + SDL.lib;SDLmain.lib;%(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + #include "testconformance.vs10.sourcefiles" diff --git a/build/win32/vs9/cogl-crate.vcproj b/build/win32/vs9/cogl-crate.vcproj index e4bdedb76..696f58e99 100644 --- a/build/win32/vs9/cogl-crate.vcproj +++ b/build/win32/vs9/cogl-crate.vcproj @@ -21,9 +21,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/cogl-info.vcproj b/build/win32/vs9/cogl-info.vcproj index b869263b5..d4c64c918 100644 --- a/build/win32/vs9/cogl-info.vcproj +++ b/build/win32/vs9/cogl-info.vcproj @@ -23,7 +23,7 @@ Name="Debug|Win32" InheritedPropertySheets=".\cogl.vsprops" ConfigurationType="1" - CharacterSet="1" + CharacterSet="2" > + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/cogl-msaa.vcproj b/build/win32/vs9/cogl-msaa.vcproj index 61dc10931..913c16190 100644 --- a/build/win32/vs9/cogl-msaa.vcproj +++ b/build/win32/vs9/cogl-msaa.vcproj @@ -23,7 +23,7 @@ Name="Debug|Win32" InheritedPropertySheets=".\cogl.vsprops" ConfigurationType="1" - CharacterSet="1" + CharacterSet="2" > + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/cogl-pango.vcprojin b/build/win32/vs9/cogl-pango.vcprojin index 746986357..b0353dcc7 100644 --- a/build/win32/vs9/cogl-pango.vcprojin +++ b/build/win32/vs9/cogl-pango.vcprojin @@ -24,7 +24,7 @@ InheritedPropertySheets=".\cogl.vsprops" IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\cogl-pango" ConfigurationType="2" - CharacterSet="1" + CharacterSet="2" > + + + + + + + + + + + + + + + + + + + +