From 206ea0de6be706f39a4e04e2cde956576bc70628 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 3 Mar 2014 17:48:31 +0800 Subject: [PATCH] Update the Visual Studio 2010 Projects This updates the Visual Studio 2010 Projects in the following ways, similar to the recent changes to the Visual Studio 2008 projects: -Make all the copying of the pre-configured header files custom build rules, so that it is cleaner when people clean their builds, and the files can be re-copied when updated. -Split up the property sheets, so to ease future maintenance -Make the cogl-path library built as a DLL -Build and link against SDL-2.x for SDL builds -Make everything except the .sln file and the README.txt file use UNIX line endings, for easier maintenance. -Merge cogl_sdl.sln and install-sdl.vcxproj into cogl.sln and install.vcxproj respectively. -Update build of the conformance test to not use COGL_COMPILATION, and make it link to cogl-path. --- build/win32/vs10/Makefile.am | 11 +- build/win32/vs10/cogl-build-defines.props | 55 + build/win32/vs10/cogl-crate.vcxproj | 344 +++--- build/win32/vs10/cogl-crate.vcxproj.filters | 28 +- build/win32/vs10/cogl-gen-srcs.props | 107 ++ build/win32/vs10/cogl-hello.vcxproj | 312 ++--- build/win32/vs10/cogl-hello.vcxproj.filters | 28 +- build/win32/vs10/cogl-info.vcxproj | 328 +++--- build/win32/vs10/cogl-info.vcxproj.filters | 28 +- build/win32/vs10/cogl-install.props | 216 ++++ build/win32/vs10/cogl-msaa.vcxproj | 330 +++--- build/win32/vs10/cogl-msaa.vcxproj.filters | 28 +- build/win32/vs10/cogl-pango.vcxproj.filtersin | 2 +- build/win32/vs10/cogl-pango.vcxprojin | 398 +++---- build/win32/vs10/cogl-path.vcxproj.filtersin | 3 +- build/win32/vs10/cogl-path.vcxprojin | 554 ++++----- ...-hello.vcxproj => cogl-sdl2-hello.vcxproj} | 22 +- ...ilters => cogl-sdl2-hello.vcxproj.filters} | 2 +- build/win32/vs10/cogl-version-paths.props | 53 + build/win32/vs10/cogl.props | 414 ------- build/win32/vs10/cogl.sln | 98 +- build/win32/vs10/cogl.vcxproj.filtersin | 8 +- build/win32/vs10/cogl.vcxprojin | 1002 +++++++++-------- build/win32/vs10/cogl_sdl.sln | 106 -- build/win32/vs10/install-sdl.vcxproj | 137 --- build/win32/vs10/install.vcxproj | 338 ++++-- .../test-conformance-cogl.vcxproj.filtersin | 2 +- .../vs10/test-conformance-cogl.vcxprojin | 24 +- 28 files changed, 2439 insertions(+), 2539 deletions(-) create mode 100644 build/win32/vs10/cogl-build-defines.props create mode 100644 build/win32/vs10/cogl-gen-srcs.props create mode 100644 build/win32/vs10/cogl-install.props rename build/win32/vs10/{cogl-sdl-hello.vcxproj => cogl-sdl2-hello.vcxproj} (91%) rename build/win32/vs10/{cogl-sdl-hello.vcxproj.filters => cogl-sdl2-hello.vcxproj.filters} (87%) create mode 100644 build/win32/vs10/cogl-version-paths.props delete mode 100644 build/win32/vs10/cogl.props delete mode 100644 build/win32/vs10/cogl_sdl.sln delete mode 100644 build/win32/vs10/install-sdl.vcxproj diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index b54bae633..390a3f1c9 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -1,7 +1,9 @@ EXTRA_DIST = \ cogl.sln \ - cogl_sdl.sln \ - cogl.props \ + cogl-version-paths.props \ + cogl-build-defines.props \ + cogl-gen-srcs.props \ + cogl-install.props \ cogl.vcxproj \ cogl.vcxprojin \ cogl.vcxproj.filters \ @@ -16,8 +18,8 @@ EXTRA_DIST = \ cogl-pango.vcxproj.filtersin \ cogl-hello.vcxproj \ cogl-hello.vcxproj.filters \ - cogl-sdl-hello.vcxproj \ - cogl-sdl-hello.vcxproj.filters \ + cogl-sdl2-hello.vcxproj \ + cogl-sdl2-hello.vcxproj.filters \ cogl-msaa.vcxproj \ cogl-msaa.vcxproj.filters \ cogl-info.vcxproj \ @@ -29,5 +31,4 @@ EXTRA_DIST = \ test-conformance-cogl.vcxproj.filters \ test-conformance-cogl.vcxproj.filtersin \ install.vcxproj \ - install-sdl.vcxproj \ README.txt diff --git a/build/win32/vs10/cogl-build-defines.props b/build/win32/vs10/cogl-build-defines.props new file mode 100644 index 000000000..27b2e4c72 --- /dev/null +++ b/build/win32/vs10/cogl-build-defines.props @@ -0,0 +1,55 @@ + + + + + + + _WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG + HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines) + $(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS + _DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG + G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir" + G_LOG_DOMAIN="CoglPath" + G_LOG_DOMAIN="Cogl-Pango" + + + <_PropertySheetDisplayName>coglbuilddefinesprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + %(DisableSpecificWarnings) + + + glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + + + $(BaseBuildDefines) + + + $(LibBuildDefines) + + + $(ReleaseLibBuildDefines) + + + $(DebugLibBuildDefines) + + + $(CoglBuildDefines) + + + $(CoglPathBuildDefines) + + + $(CoglPangoBuildDefines) + + + diff --git a/build/win32/vs10/cogl-crate.vcxproj b/build/win32/vs10/cogl-crate.vcxproj index 5c80bad99..8b5f6d6e3 100644 --- a/build/win32/vs10/cogl-crate.vcxproj +++ b/build/win32/vs10/cogl-crate.vcxproj @@ -1,172 +1,172 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {DE1A2710-04BB-4C3D-90C1-B070E326B1CF} - cogl-crate - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) - true - Console - MachineX86 - - - - - Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - 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-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - {fe5abd0f-91e8-4aa5-9c1c-408427d5f768} - false - - - {f3a80987-5411-43db-a23b-06f2076e1206} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF} + cogl-crate + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + true + Console + MachineX86 + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + 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-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + + + + + + {fe5abd0f-91e8-4aa5-9c1c-408427d5f768} + false + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + diff --git a/build/win32/vs10/cogl-crate.vcxproj.filters b/build/win32/vs10/cogl-crate.vcxproj.filters index 512afe1d4..27b706254 100644 --- a/build/win32/vs10/cogl-crate.vcxproj.filters +++ b/build/win32/vs10/cogl-crate.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Sources - - - \ No newline at end of file + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs10/cogl-gen-srcs.props b/build/win32/vs10/cogl-gen-srcs.props new file mode 100644 index 000000000..b68b92ce0 --- /dev/null +++ b/build/win32/vs10/cogl-gen-srcs.props @@ -0,0 +1,107 @@ + + + + + + + +if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H +if not exist ..\..\..\cogl\WGL_DEFINES goto DO_COGL_DEFINES_H +del ..\..\..\cogl\cogl-defines.h +del ..\..\..\cogl\WGL_DEFINES +:DO_COGL_DEFINES_H +copy ..\..\..\cogl\cogl-defines.h.win32_sdl ..\..\..\cogl\SDL_DEFINES +copy ..\..\..\cogl\SDL_DEFINES ..\..\..\cogl\cogl-defines.h +:DONE_COGL_DEFINES_H + + +if exist ..\..\..\cogl\WGL_DEFINES goto DONE_COGL_DEFINES_H +if not exist ..\..\..\cogl\SDL_DEFINES goto DO_COGL_DEFINES_H +del ..\..\..\cogl\cogl-defines.h +del ..\..\..\cogl\SDL_DEFINES +:DO_COGL_DEFINES_H +copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\WGL_DEFINES +copy ..\..\..\cogl\WGL_DEFINES ..\..\..\cogl\cogl-defines.h +:DONE_COGL_DEFINES_H + + copy ..\..\..\config.h.win32 ..\..\..\config.h + copy ..\..\..\cogl\cogl-gl-header.h.win32 ..\..\..\cogl\cogl-gl-header.h + +cd ..\..\..\cogl-path +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-path-enum-types.h.in cogl-path-types.h cogl1-path-functions.h > cogl-path-enum-types.h +cd $(SolutionDir) + + +cd ..\..\..\cogl-path +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-path-enum-types.c.in cogl-path-types.h cogl1-path-functions.h > cogl-path-enum-types.c +cd $(SolutionDir) + + +cd ..\..\..\cogl +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in deprecated\cogl-clip-state.h deprecated\cogl-fixed.h deprecated\cogl-material-compat.h deprecated\cogl-vertex-buffer.h deprecated\cogl-shader.h deprecated\cogl-clutter.h deprecated\cogl-type-casts.h deprecated\cogl-framebuffer-deprecated.h deprecated\cogl-texture-deprecated.h deprecated\cogl-auto-texture.h cogl1-context.h cogl-bitmap.h cogl-color.h cogl-matrix.h cogl-offscreen.h cogl-primitives.h cogl-texture.h cogl-types.h cogl.h cogl-win32-renderer.h > cogl-enum-types.h +cd $(SolutionDir) + + +cd ..\..\..\cogl +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in deprecated\cogl-clip-state.h deprecated\cogl-fixed.h deprecated\cogl-material-compat.h deprecated\cogl-vertex-buffer.h deprecated\cogl-shader.h deprecated\cogl-clutter.h deprecated\cogl-type-casts.h deprecated\cogl-framebuffer-deprecated.h deprecated\cogl-texture-deprecated.h deprecated\cogl-auto-texture.h cogl1-context.h cogl-bitmap.h cogl-color.h cogl-matrix.h cogl-offscreen.h cogl-primitives.h cogl-texture.h cogl-types.h cogl.h cogl-win32-renderer.h > cogl-enum-types.c +cd $(SolutionDir) + + +echo EXPORTS > $(DefDir)\cogl.def +cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def + + +echo EXPORTS > $(DefDir)\cogl.def +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 >> $(DefDir)\cogl.def + + +echo EXPORTS > $(DefDir)\cogl-path.def +cl -EP ..\..\..\cogl-path\cogl-path.symbols >> $(DefDir)\cogl-path.def + + +echo EXPORTS > $(DefDir)\cogl-pango.def +cl -EP ..\..\..\cogl-pango\cogl-pango.symbols >> $(DefDir)\cogl-pango.def + + + + <_PropertySheetDisplayName>coglprops + + + + $(CopyConfigH) + + + $(CopyGLHeaderH) + + + $(CopyDefinesSDLH) + + + $(CopyDefinesH) + + + $(GenCoglPathEnumsH) + + + $(GenCoglPathEnumsC) + + + $(GenCoglEnumsH) + + + $(GenCoglEnumsC) + + + $(GenerateCoglDef) + + + $(GenerateCoglDef) + + + $(GenerateCoglPathDef) + + + $(GenerateCoglPangoDef) + + + diff --git a/build/win32/vs10/cogl-hello.vcxproj b/build/win32/vs10/cogl-hello.vcxproj index 6aa877125..7ef7e6164 100644 --- a/build/win32/vs10/cogl-hello.vcxproj +++ b/build/win32/vs10/cogl-hello.vcxproj @@ -1,156 +1,156 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {F5A43C12-7032-428E-A56A-D294075FA493} - cogl-hello - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - true - Console - - - - - MaxSpeed - true - COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - MaxSpeed - true - COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - - - - - - - - {f3a80987-5411-43db-a23b-06f2076e1206} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {F5A43C12-7032-428E-A56A-D294075FA493} + cogl-hello + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + + + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + + + + + + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + diff --git a/build/win32/vs10/cogl-hello.vcxproj.filters b/build/win32/vs10/cogl-hello.vcxproj.filters index 84c9a466c..26236c707 100644 --- a/build/win32/vs10/cogl-hello.vcxproj.filters +++ b/build/win32/vs10/cogl-hello.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Sources - - - \ No newline at end of file + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs10/cogl-info.vcxproj b/build/win32/vs10/cogl-info.vcxproj index 7aae8ea1e..8032316c9 100644 --- a/build/win32/vs10/cogl-info.vcxproj +++ b/build/win32/vs10/cogl-info.vcxproj @@ -1,164 +1,164 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {CD17F5C8-C860-4A65-8209-4D0B093A3DA3} - coglinfo - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - true - true - false - - - MachineX64 - - - - - - - - {f3a80987-5411-43db-a23b-06f2076e1206} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3} + coglinfo + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + false + + + MachineX64 + + + + + + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + diff --git a/build/win32/vs10/cogl-info.vcxproj.filters b/build/win32/vs10/cogl-info.vcxproj.filters index 225e706fd..c73fb108c 100644 --- a/build/win32/vs10/cogl-info.vcxproj.filters +++ b/build/win32/vs10/cogl-info.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Sources - - - \ No newline at end of file + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs10/cogl-install.props b/build/win32/vs10/cogl-install.props new file mode 100644 index 000000000..dac2232ec --- /dev/null +++ b/build/win32/vs10/cogl-install.props @@ -0,0 +1,216 @@ + + + + + + + +mkdir $(CopyDir)\bin + +mkdir $(CopyDir)\lib + + +if "$(Configuration)" == "Release_SDL" goto DO_REL_BIN + +if "$(Configuration)" == "Debug_SDL" goto DO_DBG_BIN + + +copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin + +copy $(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib + +copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin + +goto DONE_BIN + + +:DO_REL_BIN + +copy Release\$(Platform)\bin\*.dll $(CopyDir)\bin + +copy Release\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib + +copy Release\$(Platform)\bin\*.exe $(CopyDir)\bin + +goto DONE_BIN + + +:DO_DBG_BIN + +copy Debug\$(Platform)\bin\*.dll $(CopyDir)\bin + +copy Debug\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib + +copy Debug\$(Platform)\bin\*.exe $(CopyDir)\bin + +goto DONE_BIN + +:DONE_BIN + + +$(CoglDoInstallBin) + +mkdir $(CopyDir)\share\cogl-$(ApiVersion)\examples-data + +copy ..\..\..\examples\*.jpg $(CopyDir)\share\cogl-$(ApiVersion)\examples-data + + +mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-atlas-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-error.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-fence.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-frame-info.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-macros.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-matrix-stack.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-output.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-poll.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-snippet.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-texture-2d-gl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-sub-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + +copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + + +mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango + +copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango + + +mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path + +copy ..\..\..\cogl-path\cogl-path.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path + +copy ..\..\..\cogl-path\cogl-path-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path + +copy ..\..\..\cogl-path\cogl1-path-functions.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path + +copy ..\..\..\cogl-path\cogl2-path-functions.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path + +copy ..\..\..\cogl-path\cogl-path-enum-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path + + copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl + + + <_PropertySheetDisplayName>coglinstallprops + + + + $(CoglDoInstall) + + + $(CoglDoInstall) + + + $(CoglDoInstallSDL) + + + diff --git a/build/win32/vs10/cogl-msaa.vcxproj b/build/win32/vs10/cogl-msaa.vcxproj index 29ed46b5e..f63c78466 100644 --- a/build/win32/vs10/cogl-msaa.vcxproj +++ b/build/win32/vs10/cogl-msaa.vcxproj @@ -1,165 +1,165 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {44E864D4-8447-484D-9B16-D5405E0783CF} - coglmsaa - Win32Proj - - - - Application - MultiByte - true - - - Application - MultiByte - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - false - - - - Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - true - Console - MachineX86 - - - - - Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - true - Console - false - - - MachineX64 - - - - - MaxSpeed - true - COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - true - Console - true - true - MachineX86 - - - - - COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - - - %(AdditionalDependencies) - true - Console - true - true - false - - - MachineX64 - - - - - - - - {f3a80987-5411-43db-a23b-06f2076e1206} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {44E864D4-8447-484D-9B16-D5405E0783CF} + coglmsaa + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + COGL_ENABLE_EXPERIMENTAL_2_0_API;$(BaseBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + %(AdditionalDependencies) + true + Console + true + true + false + + + MachineX64 + + + + + + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + diff --git a/build/win32/vs10/cogl-msaa.vcxproj.filters b/build/win32/vs10/cogl-msaa.vcxproj.filters index 94457e960..db51fe2ed 100644 --- a/build/win32/vs10/cogl-msaa.vcxproj.filters +++ b/build/win32/vs10/cogl-msaa.vcxproj.filters @@ -1,14 +1,14 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Sources - - - \ No newline at end of file + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Sources + + + diff --git a/build/win32/vs10/cogl-pango.vcxproj.filtersin b/build/win32/vs10/cogl-pango.vcxproj.filtersin index 48d7d45d4..5f7ba5aa3 100644 --- a/build/win32/vs10/cogl-pango.vcxproj.filtersin +++ b/build/win32/vs10/cogl-pango.vcxproj.filtersin @@ -16,4 +16,4 @@ Resource Files - \ No newline at end of file + diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin index 9698c0250..0988da772 100644 --- a/build/win32/vs10/cogl-pango.vcxprojin +++ b/build/win32/vs10/cogl-pango.vcxprojin @@ -1,202 +1,202 @@  - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} - coglpango - Win32Proj - - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - true - true - false - true - - - - $(PreBuildCmd) - - - Disabled - $(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl-pango.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - MachineX86 - - - - - $(PreBuildCmd) - - - Disabled - $(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl-pango.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - MachineX64 - - - - - $(PreBuildCmd) - - - MaxSpeed - true - $(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl-pango.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - true - true - MachineX86 - - - - - $(PreBuildCmd) - - - $(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl-pango.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - true - true - MachineX64 - - - + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} + coglpango + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + true + + + + $(PreBuildCmd) + + + Disabled + $(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl-pango.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + MachineX86 + + + + + $(PreBuildCmd) + + + Disabled + $(DebugLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl-pango.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + MachineX64 + + + + + $(PreBuildCmd) + + + MaxSpeed + true + $(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl-pango.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + true + true + MachineX86 + + + + + $(PreBuildCmd) + + + $(ReleaseLibBuildDefines);$(CoglPangoBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl-pango.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + true + true + MachineX64 + + + #include "coglpango.vs10.sourcefiles" - - - - Generating $(IntDir)\cogl-pango.def - $(GenerateCoglPangoDef) - $(IntDir)\cogl-pango.def;%(Outputs) - Generating $(IntDir)\cogl-pango.def - $(GenerateCoglPangoDef) - $(IntDir)\cogl-pango.def;%(Outputs) - Generating $(IntDir)\cogl-pango.def - $(GenerateCoglPangoDef) - $(IntDir)\cogl-pango.def;%(Outputs) - Generating $(IntDir)\cogl-pango.def - $(GenerateCoglPangoDef) - $(IntDir)\cogl-pango.def;%(Outputs) - - - - - - - - {f3a80987-5411-43db-a23b-06f2076e1206} - false - - - - - - \ No newline at end of file + + + + Generating $(IntDir)\cogl-pango.def + $(GenerateCoglPangoDef) + $(IntDir)\cogl-pango.def;%(Outputs) + Generating $(IntDir)\cogl-pango.def + $(GenerateCoglPangoDef) + $(IntDir)\cogl-pango.def;%(Outputs) + Generating $(IntDir)\cogl-pango.def + $(GenerateCoglPangoDef) + $(IntDir)\cogl-pango.def;%(Outputs) + Generating $(IntDir)\cogl-pango.def + $(GenerateCoglPangoDef) + $(IntDir)\cogl-pango.def;%(Outputs) + + + + + + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + diff --git a/build/win32/vs10/cogl-path.vcxproj.filtersin b/build/win32/vs10/cogl-path.vcxproj.filtersin index aa93b41c5..1c4a30f94 100644 --- a/build/win32/vs10/cogl-path.vcxproj.filtersin +++ b/build/win32/vs10/cogl-path.vcxproj.filtersin @@ -18,7 +18,8 @@ Sources + Resource Files Resource Files Resource Files - \ No newline at end of file + diff --git a/build/win32/vs10/cogl-path.vcxprojin b/build/win32/vs10/cogl-path.vcxprojin index c6e777324..4a03e99c2 100644 --- a/build/win32/vs10/cogl-path.vcxprojin +++ b/build/win32/vs10/cogl-path.vcxprojin @@ -1,334 +1,226 @@  - - - Debug_SDL - Win32 - - - Debug_SDL - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_SDL - Win32 - - - Release_SDL - x64 - - - Release - Win32 - - - Release - x64 - - - - {F3A80987-5411-43DB-A23B-06F2076E1207} - coglpath - Win32Proj - - - - StaticLibrary - MultiByte - true - - - StaticLibrary - MultiByte - true - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)\Debug\$(Platform)\bin\ - $(SolutionDir)\Debug\$(Platform)\bin\ - $(SolutionDir)\Release\$(Platform)\bin\ - $(SolutionDir)\Release\$(Platform)\bin\ - - - - -$(DoDefines) -$(PreBuildCmd) - - - - Disabled - ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - - - -$(DoDefinesSDL) -$(PreBuildCmd) - - - - Disabled - ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - - - -$(DoDefines) -$(PreBuildCmd) - - - - Disabled - ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - - - -$(DoDefinesSDL) -$(PreBuildCmd) - - - - Disabled - ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - - - -$(DoDefines) -$(PreBuildCmd) - - - - MaxSpeed - ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) - true - $(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - - - -$(DoDefinesSDL) -$(PreBuildCmd) - - - - MaxSpeed - ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) - true - $(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - - - -$(DoDefines) -$(PreBuildCmd) - - - - ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) - $(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - - - -$(DoDefinesSDL) -$(PreBuildCmd) - - - - ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) - $(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {F3A80987-5411-43DB-A23B-06F2076E1207} + coglpath + Win32Proj + + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + Disabled + ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) + $(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + %(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\$(ProjectName).def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + MachineX86 + + + + + + + + Disabled + ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) + $(DebugLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\$(ProjectName).def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + MachineX64 + + + + + + + + MaxSpeed + ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) + true + $(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\$(ProjectName).def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + true + true + MachineX86 + + + + + + + + ..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys;%(AdditionalIncludeDirectories) + $(ReleaseLibBuildDefines);$(CoglPathBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + %(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\$(ProjectName).def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + true + true + MachineX64 + + + #include "cogl-path.vs10.sourcefiles" - - - - - Generating ..\..\..\cogl-path\cogl-path-enum-types.h - $(GenCoglPathEnumsH) - ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.h - $(GenCoglPathEnumsH) - ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.h - $(GenCoglPathEnumsH) - ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.h - $(GenCoglPathEnumsH) - ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.h - $(GenCoglPathEnumsH) - ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.h - $(GenCoglPathEnumsH) - ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.h - $(GenCoglPathEnumsH) - ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.h - $(GenCoglPathEnumsH) - ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) - - - Generating ..\..\..\cogl-path\cogl-path-enum-types.c - $(GenCoglPathEnumsC) - ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.c - $(GenCoglPathEnumsC) - ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.c - $(GenCoglPathEnumsC) - ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.c - $(GenCoglPathEnumsC) - ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.c - $(GenCoglPathEnumsC) - ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.c - $(GenCoglPathEnumsC) - ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.c - $(GenCoglPathEnumsC) - ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) - Generating ..\..\..\cogl-path\cogl-path-enum-types.c - $(GenCoglPathEnumsC) - ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) - - - - - - \ No newline at end of file + + + + + Generating ..\..\..\cogl-path\cogl-path-enum-types.h + $(GenCoglPathEnumsH) + ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) + Generating ..\..\..\cogl-path\cogl-path-enum-types.h + $(GenCoglPathEnumsH) + ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) + Generating ..\..\..\cogl-path\cogl-path-enum-types.h + $(GenCoglPathEnumsH) + ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) + Generating ..\..\..\cogl-path\cogl-path-enum-types.h + $(GenCoglPathEnumsH) + ..\..\..\cogl-path\cogl-path-enum-types.h;%(Outputs) + + + Generating ..\..\..\cogl-path\cogl-path-enum-types.c + $(GenCoglPathEnumsC) + ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) + Generating ..\..\..\cogl-path\cogl-path-enum-types.c + $(GenCoglPathEnumsC) + ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) + Generating ..\..\..\cogl-path\cogl-path-enum-types.c + $(GenCoglPathEnumsC) + ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) + Generating ..\..\..\cogl-path\cogl-path-enum-types.c + $(GenCoglPathEnumsC) + ..\..\..\cogl-path\cogl-path-enum-types.c;%(Outputs) + + + Generating cogl-path.symbols... + $(GenerateCoglPathDef) + $(IntDir)\cogl-path.def;%(Outputs) + Generating cogl-path.symbols... + $(GenerateCoglPathDef) + $(IntDir)\cogl-path.def;%(Outputs) + Generating cogl-path.symbols... + $(GenerateCoglPathDef) + $(IntDir)\cogl-path.def;%(Outputs) + Generating cogl-path.symbols... + $(GenerateCoglPathDef) + $(IntDir)\cogl-path.def;%(Outputs) + + + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + diff --git a/build/win32/vs10/cogl-sdl-hello.vcxproj b/build/win32/vs10/cogl-sdl2-hello.vcxproj similarity index 91% rename from build/win32/vs10/cogl-sdl-hello.vcxproj rename to build/win32/vs10/cogl-sdl2-hello.vcxproj index 1186e66a4..9e4f9aefb 100644 --- a/build/win32/vs10/cogl-sdl-hello.vcxproj +++ b/build/win32/vs10/cogl-sdl2-hello.vcxproj @@ -20,7 +20,7 @@ {0B5D144D-1872-42CD-8437-FFDCDD08C03E} - coglsdlhello + coglsdl2hello Win32Proj @@ -47,19 +47,19 @@ - + - + - + - + @@ -82,7 +82,7 @@ EditAndContinue - SDL.lib;SDLmain.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;%(AdditionalDependencies) true Console MachineX86 @@ -102,7 +102,7 @@ CompileAsC - SDL.lib;SDLmain.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;%(AdditionalDependencies) true Console false @@ -124,7 +124,7 @@ ProgramDatabase - SDL.lib;SDLmain.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;%(AdditionalDependencies) true Console true @@ -143,7 +143,7 @@ CompileAsC - SDL.lib;SDLmain.lib;%(AdditionalDependencies) + SDL2.lib;SDL2main.lib;%(AdditionalDependencies) true Console true @@ -155,7 +155,7 @@ - + @@ -166,4 +166,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/cogl-sdl-hello.vcxproj.filters b/build/win32/vs10/cogl-sdl2-hello.vcxproj.filters similarity index 87% rename from build/win32/vs10/cogl-sdl-hello.vcxproj.filters rename to build/win32/vs10/cogl-sdl2-hello.vcxproj.filters index 6bdc21afb..967dc658e 100644 --- a/build/win32/vs10/cogl-sdl-hello.vcxproj.filters +++ b/build/win32/vs10/cogl-sdl2-hello.vcxproj.filters @@ -7,7 +7,7 @@ - + Sources diff --git a/build/win32/vs10/cogl-version-paths.props b/build/win32/vs10/cogl-version-paths.props new file mode 100644 index 000000000..2979609cb --- /dev/null +++ b/build/win32/vs10/cogl-version-paths.props @@ -0,0 +1,53 @@ + + + + 10 + $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) + 1.0 + $(GlibEtcInstallRoot) + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + lib + -$(ApiVersion)-0 + + -1-vs$(VSVer) + + + $(CoglSeparateVSDllPrefix) + $(CoglSeparateVSDllSuffix) + + + <_PropertySheetDisplayName>coglversionpathsprops + + + + $(GlibEtcInstallRoot) + + + $(CopyDir) + + + $(DefDir) + + + $(ApiVersion) + + + $(CoglLibtoolCompatibleDllPrefix) + + + $(CoglLibtoolCompatibleDllSuffix) + + + $(CoglSeparateVSDllPrefix) + + + $(CoglSeparateVSDllSuffix) + + + $(CoglDllPrefix) + + + $(CoglDllSuffix) + + + diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props deleted file mode 100644 index ee5ec7b07..000000000 --- a/build/win32/vs10/cogl.props +++ /dev/null @@ -1,414 +0,0 @@ - - - - 10 - $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) - ..\..\..\vs$(VSVer)\$(Platform) - 1.0 - _WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG - HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines) - $(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS - _DEBUG;$(LibBuildDefines);COGL_GL_DEBUG;COGL_OBJECT_DEBUG;COGL_HANDLE_DEBUG - G_LOG_DOMAIN="Cogl";COGL_HAS_WIN32_SUPPORT;COGL_BUILD_EXP;COGL_GL_LIBNAME="";COGL_LOCALEDIR="/some/random/dir" - G_LOG_DOMAIN="CoglPath" - G_LOG_DOMAIN="Cogl-Pango" - COGL_COMPILATION - $(GlibEtcInstallRoot) - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - -if exist ..\..\..\cogl\SDL_DEFINES goto DONE_COGL_DEFINES_H -if not exist ..\..\..\cogl\WGL_DEFINES goto DO_COGL_DEFINES_H -del ..\..\..\cogl\cogl-defines.h -del ..\..\..\cogl\WGL_DEFINES -:DO_COGL_DEFINES_H -copy ..\..\..\cogl\cogl-defines.h.win32_sdl ..\..\..\cogl\SDL_DEFINES -copy ..\..\..\cogl\SDL_DEFINES ..\..\..\cogl\cogl-defines.h -:DONE_COGL_DEFINES_H - - -if exist ..\..\..\cogl\WGL_DEFINES goto DONE_COGL_DEFINES_H -if not exist ..\..\..\cogl\SDL_DEFINES goto DO_COGL_DEFINES_H -del ..\..\..\cogl\cogl-defines.h -del ..\..\..\cogl\SDL_DEFINES -:DO_COGL_DEFINES_H -copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\WGL_DEFINES -copy ..\..\..\cogl\WGL_DEFINES ..\..\..\cogl\cogl-defines.h -:DONE_COGL_DEFINES_H - - -if exist ..\..\..\config.h goto DONE_CONFIG_H - -copy ..\..\..\config.h.win32 ..\..\..\config.h - -:DONE_CONFIG_H - -if not exist ..\..\..\cogl\cogl-gl-header.h copy ..\..\..\cogl\cogl-gl-header.h.win32 ..\..\..\cogl\cogl-gl-header.h - - - -if exist ..\..\..\cogl-path\cogl-path-enum-types.h goto DONE_COGLPATH_ENUMS_H - -cd ..\..\..\cogl-path - -perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-path-enum-types.h.in cogl-path-types.h cogl1-path-functions.h > cogl-path-enum-types.h - -cd $(SolutionDir) - -:DONE_COGLPATH_ENUMS_H - - - -if exist ..\..\..\cogl-path\cogl-path-enum-types.c goto DONE_COGLPATH_ENUMS_C - -cd ..\..\..\cogl-path - -perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-path-enum-types.c.in cogl-path-types.h cogl1-path-functions.h > cogl-path-enum-types.c - -cd $(SolutionDir) - -:DONE_COGLPATH_ENUMS_C - - - -if exist ..\..\..\cogl\cogl-enum-types.h goto DONE_COGL_ENUMS_H - -cd ..\..\..\cogl - -perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in cogl1-context.h cogl-bitmap.h cogl-color.h cogl-fixed.h cogl-material-compat.h cogl-matrix.h cogl-offscreen.h cogl-primitives.h cogl-shader.h cogl-texture.h cogl-types.h cogl-vertex-buffer.h cogl-clutter.h cogl.h cogl-win32-renderer.h > cogl-enum-types.h - -cd $(SolutionDir) - -:DONE_COGL_ENUMS_H - - - -if exist ..\..\..\cogl\cogl-enum-types.c goto DONE_COGL_ENUMS_C - -cd ..\..\..\cogl - -perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in cogl1-context.h cogl-bitmap.h cogl-color.h cogl-fixed.h cogl-material-compat.h cogl-matrix.h cogl-offscreen.h cogl-primitives.h cogl-shader.h cogl-texture.h cogl-types.h cogl-vertex-buffer.h cogl-clutter.h cogl.h cogl-win32-renderer.h > cogl-enum-types.c - -cd $(SolutionDir) - -:DONE_COGL_ENUMS_C - - - -mkdir $(CopyDir) - -mkdir $(CopyDir)\bin - -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin - - -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin - - -copy ..\*.bat $(CopyDir)\bin - - -mkdir $(CopyDir)\share\cogl-$(ApiVersion)\examples-data - -copy ..\..\..\examples\*.jpg $(CopyDir)\share\cogl-$(ApiVersion)\examples-data - - -mkdir $(CopyDir)\lib - -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib - - -mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-atlas-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-error.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-fence.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-frame-info.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-macros.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-matrix-stack.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-output.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-poll.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-snippet.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-texture-2d-gl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-sub-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - -copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - - -mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango - -copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango - - -mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path - -copy ..\..\..\cogl-path\cogl-path.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path - -copy ..\..\..\cogl-path\cogl-path-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path - -copy ..\..\..\cogl-path\cogl1-path-functions.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path - -copy ..\..\..\cogl-path\cogl2-path-functions.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path - -copy ..\..\..\cogl-path\cogl-path-enum-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-path - - -copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - - -set VSVER=$(VSVer) - -set CONF=$(Configuration) - -set PLAT=$(Platform) - -set BASEDIR=$(GlibEtcInstallRootFromBuildWin32) - -cd .. - -call gengir_pango.bat - -cd vs$(VSVer) - - - echo EXPORTS > $(DefDir)\cogl.def - - cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols >> $(DefDir)\cogl.def - - - - echo EXPORTS > $(DefDir)\cogl.def - - 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 >> $(DefDir)\cogl.def - - - - echo EXPORTS > $(DefDir)\cogl-pango.def - - cl -EP ..\..\..\cogl-pango\cogl-pango.symbols >> $(DefDir)\cogl-pango.def - - - lib - -$(ApiVersion)-0 - - -1-vs$(VSVer) - $(CoglSeparateVSDllPrefix) - $(CoglSeparateVSDllSuffix) - - - <_PropertySheetDisplayName>coglprops - $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - - - - ..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) - G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - %(DisableSpecificWarnings) - - - glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies) - $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) - - - - - $(GlibEtcInstallRoot) - - - $(CopyDir) - - - $(DefDir) - - - $(ApiVersion) - - - $(BaseBuildDefines) - - - $(LibBuildDefines) - - - $(ReleaseLibBuildDefines) - - - $(DebugLibBuildDefines) - - - $(CoglBuildDefines) - - - $(CoglPathBuildDefines) - - - $(CoglPangoBuildDefines) - - - $(TestProgDef) - - - $(DoDefinesSDL) - - - $(DoDefinesSDL) - - - $(PreBuildCmd) - - - $(GenCoglPathEnumsH) - - - $(GenCoglPathEnumsC) - - - $(GenCoglEnumsH) - - - $(GenCoglEnumsC) - - - $(CoglDoInstall) - - - $(CoglDoInstallSDL) - - - $(GenerateCoglDef) - - - $(GenerateCoglDef) - - - $(GenerateCoglPangoDef) - - - $(CoglLibtoolCompatibleDllPrefix) - - - $(CoglLibtoolCompatibleDllSuffix) - - - $(CoglSeparateVSDllPrefix) - - - $(CoglSeparateVSDllSuffix) - - - $(CoglDllPrefix) - - - $(CoglDllSuffix) - - - diff --git a/build/win32/vs10/cogl.sln b/build/win32/vs10/cogl.sln index 1ab14ca04..693587eba 100644 --- a/build/win32/vs10/cogl.sln +++ b/build/win32/vs10/cogl.sln @@ -1,14 +1,16 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-path", "cogl-path.vcxproj", "{F3A80987-5411-43DB-A23B-06F2076E1207}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl", "cogl.vcxproj", "{F3A80987-5411-43DB-A23B-06F2076E1206}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-path", "cogl-path.vcxproj", "{F3A80987-5411-43DB-A23B-06F2076E1207}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-pango", "cogl-pango.vcxproj", "{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-hello", "cogl-hello.vcxproj", "{F5A43C12-7032-428E-A56A-D294075FA493}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-sdl2-hello", "cogl-sdl2-hello.vcxproj", "{0B5D144D-1872-42CD-8437-FFDCDD08C03E}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-info", "cogl-info.vcxproj", "{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}" @@ -20,19 +22,15 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug_SDL|Win32 = Debug_SDL|Win32 Debug|x64 = Debug|x64 + Debug_SDL|x64 = Debug_SDL|x64 Release|Win32 = Release|Win32 + Release_SDL|Win32 = Release_SDL|Win32 Release|x64 = Release|x64 + Release_SDL|x64 = Release_SDL|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.ActiveCfg = Debug|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.Build.0 = Debug|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.ActiveCfg = Debug|x64 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.Build.0 = Debug|x64 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.ActiveCfg = Release|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.Build.0 = Release|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.ActiveCfg = Release|x64 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.Build.0 = Release|x64 {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.ActiveCfg = Debug|Win32 {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.Build.0 = Debug|Win32 {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.ActiveCfg = Debug|x64 @@ -41,6 +39,30 @@ Global {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.Build.0 = Release|Win32 {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.ActiveCfg = Release|x64 {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.Build.0 = Release|x64 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug_SDL|Win32.ActiveCfg = Debug_SDL|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug_SDL|Win32.Build.0 = Debug_SDL|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug_SDL|x64.ActiveCfg = Debug_SDL|x64 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug_SDL|x64.Build.0 = Debug_SDL|x64 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release_SDL|Win32.ActiveCfg = Release_SDL|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release_SDL|Win32.Build.0 = Release_SDL|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release_SDL|x64.ActiveCfg = Release_SDL|x64 + {F3A80987-5411-43DB-A23B-06F2076E1206}.Release_SDL|x64.Build.0 = Release_SDL|x64 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.ActiveCfg = Debug|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.Build.0 = Debug|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.ActiveCfg = Debug|x64 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.Build.0 = Debug|x64 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.ActiveCfg = Release|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.Build.0 = Release|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.ActiveCfg = Release|x64 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.Build.0 = Release|x64 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug_SDL|Win32.ActiveCfg = Debug|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug_SDL|Win32.Build.0 = Debug|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug_SDL|x64.ActiveCfg = Debug|x64 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug_SDL|x64.Build.0 = Debug|x64 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Release_SDL|Win32.ActiveCfg = Release|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Release_SDL|Win32.Build.0 = Release|Win32 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Release_SDL|x64.ActiveCfg = Release|x64 + {F3A80987-5411-43DB-A23B-06F2076E1207}.Release_SDL|x64.Build.0 = Release|x64 {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.ActiveCfg = Debug|Win32 {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.Build.0 = Debug|Win32 {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.ActiveCfg = Debug|x64 @@ -49,6 +71,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 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug_SDL|Win32.ActiveCfg = Debug|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug_SDL|Win32.Build.0 = Debug|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug_SDL|x64.ActiveCfg = Debug|x64 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug_SDL|x64.Build.0 = Debug|x64 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release_SDL|Win32.ActiveCfg = Release|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release_SDL|Win32.Build.0 = Release|Win32 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release_SDL|x64.ActiveCfg = Release|x64 + {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release_SDL|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 @@ -57,6 +87,22 @@ Global {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_SDL|Win32.ActiveCfg = Debug|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug_SDL|Win32.Build.0 = Debug|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug_SDL|x64.ActiveCfg = Debug|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Debug_SDL|x64.Build.0 = Debug|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release_SDL|Win32.ActiveCfg = Release|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release_SDL|Win32.Build.0 = Release|Win32 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release_SDL|x64.ActiveCfg = Release|x64 + {F5A43C12-7032-428E-A56A-D294075FA493}.Release_SDL|x64.Build.0 = Release|x64 + {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug_SDL|Win32.ActiveCfg = Debug|Win32 + {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug_SDL|Win32.Build.0 = Debug|Win32 + {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug_SDL|x64.ActiveCfg = Debug|x64 + {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug_SDL|x64.Build.0 = Debug|x64 + {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release_SDL|Win32.ActiveCfg = Release|Win32 + {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release_SDL|Win32.Build.0 = Release|Win32 + {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release_SDL|x64.ActiveCfg = Release|x64 + {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release_SDL|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 @@ -65,6 +111,14 @@ Global {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 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug_SDL|Win32.ActiveCfg = Debug|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug_SDL|Win32.Build.0 = Debug|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug_SDL|x64.ActiveCfg = Debug|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Debug_SDL|x64.Build.0 = Debug|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release_SDL|Win32.ActiveCfg = Release|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release_SDL|Win32.Build.0 = Release|Win32 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release_SDL|x64.ActiveCfg = Release|x64 + {CD17F5C8-C860-4A65-8209-4D0B093A3DA3}.Release_SDL|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 @@ -73,6 +127,14 @@ Global {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 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug_SDL|Win32.ActiveCfg = Debug|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug_SDL|Win32.Build.0 = Debug|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug_SDL|x64.ActiveCfg = Debug|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Debug_SDL|x64.Build.0 = Debug|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release_SDL|Win32.ActiveCfg = Release|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release_SDL|Win32.Build.0 = Release|Win32 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release_SDL|x64.ActiveCfg = Release|x64 + {DE1A2710-04BB-4C3D-90C1-B070E326B1CF}.Release_SDL|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 @@ -81,6 +143,14 @@ Global {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 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_SDL|Win32.ActiveCfg = Debug|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_SDL|Win32.Build.0 = Debug|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_SDL|x64.ActiveCfg = Debug|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Debug_SDL|x64.Build.0 = Debug|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_SDL|Win32.ActiveCfg = Release|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_SDL|Win32.Build.0 = Release|Win32 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_SDL|x64.ActiveCfg = Release|x64 + {0F08F253-DE1A-40CB-A890-93AE3CA23ADE}.Release_SDL|x64.Build.0 = Release|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 @@ -89,6 +159,14 @@ Global {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|Win32 {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64 {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|Win32.ActiveCfg = Debug_SDL|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|Win32.Build.0 = Debug_SDL|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|x64.ActiveCfg = Debug_SDL|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug_SDL|x64.Build.0 = Debug_SDL|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|Win32.ActiveCfg = Release_SDL|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|Win32.Build.0 = Release_SDL|Win32 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|x64.ActiveCfg = Release_SDL|x64 + {35B2A4AC-7235-4FC7-995D-469D59195041}.Release_SDL|x64.Build.0 = Release_SDL|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/win32/vs10/cogl.vcxproj.filtersin b/build/win32/vs10/cogl.vcxproj.filtersin index 963c23887..92d11985f 100644 --- a/build/win32/vs10/cogl.vcxproj.filtersin +++ b/build/win32/vs10/cogl.vcxproj.filtersin @@ -15,7 +15,7 @@ Sources - Sources + Sources Sources Sources #include "cogl.vs10.sourcefiles.filters" @@ -30,8 +30,12 @@ Sources\Driver_GL + Resource Files + Resource Files + Resource Files + Resource Files Resource Files Resource Files Resource Files - \ No newline at end of file + diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin index 970901ca2..cc3be48db 100644 --- a/build/win32/vs10/cogl.vcxprojin +++ b/build/win32/vs10/cogl.vcxprojin @@ -1,479 +1,529 @@  - - - Debug - Win32 - - - Debug_SDL - Win32 - - - Debug - x64 - - - Debug_SDL - x64 - - - Release - Win32 - - - Release_SDL - Win32 - - - Release - x64 - - - Release_SDL - x64 - - - - {F3A80987-5411-43DB-A23B-06F2076E1206} - cogl - Win32Proj - - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - true - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - DynamicLibrary - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - Debug\$(Platform)\bin\ - true - true - Debug\$(Platform)\bin\ - false - false - Release\$(Platform)\bin\ - true - true - Release\$(Platform)\bin\ - - - - - $(DoDefines) - $(PreBuildCmd) - - - - Disabled - ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - MachineX86 - - - - - - $(DoDefinesSDL) - $(PreBuildCmd) - - - - Disabled - ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - - SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - MachineX86 - - - - - - $(DoDefines) - $(PreBuildCmd) - - - - Disabled - ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - MachineX64 - - - - - - $(DoDefinesSDL) - $(PreBuildCmd) - - - - Disabled - ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) - $(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - - SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - MachineX64 - - - - - - $(DoDefines) - $(PreBuildCmd) - - - - MaxSpeed - ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) - true - $(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - true - true - MachineX86 - - - - - - $(DoDefinesSDL) - $(PreBuildCmd) - - - - MaxSpeed - ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) - true - $(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - - - SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - true - true - MachineX86 - - - - - - $(DoDefines) - $(PreBuildCmd) - - - - ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) - $(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - true - true - MachineX64 - - - - - - $(DoDefinesSDL) - $(PreBuildCmd) - - - - ..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) - $(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - - SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) - $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll - $(IntDir)\cogl.def - $(TargetDir)$(ProjectName)-$(ApiVersion).lib - true - Windows - true - true - MachineX64 - - - - - - true - true - true - true - - - true - true - true - true - - + + + Debug + Win32 + + + Debug_SDL + Win32 + + + Debug + x64 + + + Debug_SDL + x64 + + + Release + Win32 + + + Release_SDL + Win32 + + + Release + x64 + + + Release_SDL + x64 + + + + {F3A80987-5411-43DB-A23B-06F2076E1206} + cogl + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + Debug\$(Platform)\bin\ + true + true + Debug\$(Platform)\bin\ + false + false + Release\$(Platform)\bin\ + true + true + Release\$(Platform)\bin\ + + + + + + + Disabled + ..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) + $(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + MachineX86 + + + + + + + + Disabled + ..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) + $(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + SDL2.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + MachineX86 + + + + + + + + Disabled + ..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) + $(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + MachineX64 + + + + + + + + Disabled + ..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) + $(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + SDL2.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + MachineX64 + + + + + + + + MaxSpeed + ..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) + true + $(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + true + true + MachineX86 + + + + + + + + MaxSpeed + ..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) + true + $(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + SDL2.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + true + true + MachineX86 + + + + + + + + ..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) + $(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + true + true + MachineX64 + + + + + + + + ..\..\..\cogl\deprecated;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories) + $(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + + SDL2.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies) + $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll + $(IntDir)\cogl.def + $(TargetDir)$(ProjectName)-$(ApiVersion).lib + true + Windows + true + true + MachineX64 + + + + + + true + true + true + true + + + true + true + true + true + + #include "cogl.vs10.sourcefiles" - - - - - - - - - - - - - Generating $(IntDir)\cogl.def - $(GenerateCoglSDLDef) - $(IntDir)\cogl.def;%(Outputs) - Generating $(IntDir)\cogl.def - $(GenerateCoglSDLDef) - $(IntDir)\cogl.def;%(Outputs) - Generating $(IntDir)\cogl.def - $(GenerateCoglDef) - $(IntDir)\cogl.def;%(Outputs) - Generating $(IntDir)\cogl.def - $(GenerateCoglDef) - $(IntDir)\cogl.def;%(Outputs) - Generating $(IntDir)\cogl.def - $(GenerateCoglSDLDef) - $(IntDir)\cogl.def;%(Outputs) - Generating $(IntDir)\cogl.def - $(GenerateCoglSDLDef) - $(IntDir)\cogl.def;%(Outputs) - Generating $(IntDir)\cogl.def - $(GenerateCoglDef) - $(IntDir)\cogl.def;%(Outputs) - Generating $(IntDir)\cogl.def - $(GenerateCoglDef) - $(IntDir)\cogl.def;%(Outputs) - - - Generating ..\..\..\cogl\cogl-enum-types.h - $(GenCoglEnumsH) - ..\..\..\cogl\cogl-enum-types.h;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.h - $(GenCoglEnumsH) - ..\..\..\cogl\cogl-enum-types.h;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.h - $(GenCoglEnumsH) - ..\..\..\cogl\cogl-enum-types.h;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.h - $(GenCoglEnumsH) - ..\..\..\cogl\cogl-enum-types.h;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.h - $(GenCoglEnumsH) - ..\..\..\cogl\cogl-enum-types.h;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.h - $(GenCoglEnumsH) - ..\..\..\cogl\cogl-enum-types.h;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.h - $(GenCoglEnumsH) - ..\..\..\cogl\cogl-enum-types.h;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.h - $(GenCoglEnumsH) - ..\..\..\cogl\cogl-enum-types.h;%(Outputs) - - - Generating ..\..\..\cogl\cogl-enum-types.c - $(GenCoglEnumsC) - ..\..\..\cogl\cogl-enum-types.c;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.c - $(GenCoglEnumsC) - ..\..\..\cogl\cogl-enum-types.c;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.c - $(GenCoglEnumsC) - ..\..\..\cogl\cogl-enum-types.c;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.c - $(GenCoglEnumsC) - ..\..\..\cogl\cogl-enum-types.c;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.c - $(GenCoglEnumsC) - ..\..\..\cogl\cogl-enum-types.c;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.c - $(GenCoglEnumsC) - ..\..\..\cogl\cogl-enum-types.c;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.c - $(GenCoglEnumsC) - ..\..\..\cogl\cogl-enum-types.c;%(Outputs) - Generating ..\..\..\cogl\cogl-enum-types.c - $(GenCoglEnumsC) - ..\..\..\cogl\cogl-enum-types.c;%(Outputs) - - - - - - - - {f3a80987-5411-43db-a23b-06f2076e1207} - false - - - - - - \ No newline at end of file + + + + + + + + + + + + + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + + + Copying cogl-gl-header.h from cogl-gl-header.h.win32... + $(CopyGLHeaderH) + ..\..\..\cogl\cogl-gl-header.h;%(Outputs) + Copying cogl-gl-header.h from cogl-gl-header.h.win32... + $(CopyGLHeaderH) + ..\..\..\cogl\cogl-gl-header.h;%(Outputs) + Copying cogl-gl-header.h from cogl-gl-header.h.win32... + $(CopyGLHeaderH) + ..\..\..\cogl\cogl-gl-header.h;%(Outputs) + Copying cogl-gl-header.h from cogl-gl-header.h.win32... + $(CopyGLHeaderH) + ..\..\..\cogl\cogl-gl-header.h;%(Outputs) + Copying cogl-gl-header.h from cogl-gl-header.h.win32... + $(CopyGLHeaderH) + ..\..\..\cogl\cogl-gl-header.h;%(Outputs) + Copying cogl-gl-header.h from cogl-gl-header.h.win32... + $(CopyGLHeaderH) + ..\..\..\cogl\cogl-gl-header.h;%(Outputs) + Copying cogl-gl-header.h from cogl-gl-header.h.win32... + $(CopyGLHeaderH) + ..\..\..\cogl\cogl-gl-header.h;%(Outputs) + Copying cogl-gl-header.h from cogl-gl-header.h.win32... + $(CopyGLHeaderH) + ..\..\..\cogl\cogl-gl-header.h;%(Outputs) + + + Copying cogl-defines.h from cogl-defines.h.win32... + $(CopyDefinesH) + ..\..\..\cogl\cogl-defines.h;..\..\..\cogl\WGL_DEFINES;%(Outputs) + Copying cogl-defines.h from cogl-defines.h.win32... + $(CopyDefinesH) + ..\..\..\cogl\cogl-defines.h;..\..\..\cogl\WGL_DEFINES;%(Outputs) + Copying cogl-defines.h from cogl-defines.h.win32... + $(CopyDefinesH) + ..\..\..\cogl\cogl-defines.h;..\..\..\cogl\WGL_DEFINES;%(Outputs) + Copying cogl-defines.h from cogl-defines.h.win32... + $(CopyDefinesH) + ..\..\..\cogl\cogl-defines.h;..\..\..\cogl\WGL_DEFINES;%(Outputs) + + + Copying cogl-defines.h from cogl-defines.h.win32_SDL... + $(CopyDefinesSDLH) + ..\..\..\cogl\cogl-defines.h;..\..\..\cogl\SDL_DEFINES;%(Outputs) + Copying cogl-defines.h from cogl-defines.h.win32_SDL... + $(CopyDefinesSDLH) + ..\..\..\cogl\cogl-defines.h;..\..\..\cogl\SDL_DEFINES;%(Outputs) + Copying cogl-defines.h from cogl-defines.h.win32_SDL... + $(CopyDefinesSDLH) + ..\..\..\cogl\cogl-defines.h;..\..\..\cogl\SDL_DEFINES;%(Outputs) + Copying cogl-defines.h from cogl-defines.h.win32_SDL... + $(CopyDefinesSDLH) + ..\..\..\cogl\cogl-defines.h;..\..\..\cogl\SDL_DEFINES;%(Outputs) + + + Generating $(IntDir)\cogl.def + $(GenerateCoglSDLDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglSDLDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglSDLDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglSDLDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + Generating $(IntDir)\cogl.def + $(GenerateCoglDef) + $(IntDir)\cogl.def;%(Outputs) + + + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.h + $(GenCoglEnumsH) + ..\..\..\cogl\cogl-enum-types.h;%(Outputs) + + + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + Generating ..\..\..\cogl\cogl-enum-types.c + $(GenCoglEnumsC) + ..\..\..\cogl\cogl-enum-types.c;%(Outputs) + + + + + + + + + diff --git a/build/win32/vs10/cogl_sdl.sln b/build/win32/vs10/cogl_sdl.sln deleted file mode 100644 index 671e86c06..000000000 --- a/build/win32/vs10/cogl_sdl.sln +++ /dev/null @@ -1,106 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-path", "cogl-path.vcxproj", "{F3A80987-5411-43DB-A23B-06F2076E1207}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl", "cogl.vcxproj", "{F3A80987-5411-43DB-A23B-06F2076E1206}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-pango", "cogl-pango.vcxproj", "{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-hello", "cogl-hello.vcxproj", "{F5A43C12-7032-428E-A56A-D294075FA493}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-sdl-hello", "cogl-sdl-hello.vcxproj", "{0B5D144D-1872-42CD-8437-FFDCDD08C03E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-info", "cogl-info.vcxproj", "{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install-sdl", "install-sdl.vcxproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-crate", "cogl-crate.vcxproj", "{DE1A2710-04BB-4C3D-90C1-B070E326B1CF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-cogl", "test-conformance-cogl.vcxproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.ActiveCfg = Debug_SDL|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|Win32.Build.0 = Debug_SDL|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.ActiveCfg = Debug_SDL|x64 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Debug|x64.Build.0 = Debug_SDL|x64 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.ActiveCfg = Release_SDL|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|Win32.Build.0 = Release_SDL|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.ActiveCfg = Release_SDL|x64 - {F3A80987-5411-43DB-A23B-06F2076E1207}.Release|x64.Build.0 = Release_SDL|x64 - {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.ActiveCfg = Debug_SDL|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|Win32.Build.0 = Debug_SDL|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.ActiveCfg = Debug_SDL|x64 - {F3A80987-5411-43DB-A23B-06F2076E1206}.Debug|x64.Build.0 = Debug_SDL|x64 - {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.ActiveCfg = Release_SDL|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|Win32.Build.0 = Release_SDL|Win32 - {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.ActiveCfg = Release_SDL|x64 - {F3A80987-5411-43DB-A23B-06F2076E1206}.Release|x64.Build.0 = Release_SDL|x64 - {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.ActiveCfg = Debug|Win32 - {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|Win32.Build.0 = Debug|Win32 - {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.ActiveCfg = Debug|x64 - {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Debug|x64.Build.0 = Debug|x64 - {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}.Release|Win32.ActiveCfg = Release|Win32 - {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 - {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 - {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Debug|x64.Build.0 = Debug|x64 - {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|Win32.ActiveCfg = Release|Win32 - {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 - {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 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Debug|x64.Build.0 = Debug|x64 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.ActiveCfg = Release|Win32 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|Win32.Build.0 = Release|Win32 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.ActiveCfg = Release|x64 - {35B2A4AC-7235-4FC7-995D-469D59195041}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/win32/vs10/install-sdl.vcxproj b/build/win32/vs10/install-sdl.vcxproj deleted file mode 100644 index 52725524b..000000000 --- a/build/win32/vs10/install-sdl.vcxproj +++ /dev/null @@ -1,137 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {35B2A4AC-7235-4FC7-995D-469D59195041} - install - - - - Utility - MultiByte - true - - - Utility - MultiByte - - - Utility - MultiByte - true - - - Utility - MultiByte - - - - - - - - - - - - - - - - - - - - - - - $(GlibEtcInstallRoot)\ - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - $(GlibEtcInstallRoot)\ - - - - - -$(CoglDoInstall) -$(CoglDoInstallSDL) - - - - - - -$(CoglDoInstall) -$(CoglDoInstallSDL) - - - - - - -$(CoglDoInstall) -$(CoglDoInstallSDL) - - - - - - -$(CoglDoInstall) -$(CoglDoInstallSDL) - - - - - - {0f08f253-de1a-40cb-a890-93ae3ca23ade} - false - - - {de1a2710-04bb-4c3d-90c1-b070e326b1cf} - false - - - {f5a43c12-7032-428e-a56a-d294075fa493} - false - - - {0b5d144d-1872-42cd-8437-ffdcdd08c03e} - false - - - {cd17f5c8-c860-4a65-8209-4d0b093a3da3} - false - - - {fe5abd0f-91e8-4aa5-9c1c-408427d5f768} - false - - - {f3a80987-5411-43db-a23b-06f2076e1206} - false - - - - - - \ No newline at end of file diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index 5b903b9f3..a002989cf 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -1,121 +1,217 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {35B2A4AC-7235-4FC7-995D-469D59195041} - install - - - - Utility - MultiByte - true - - - Utility - MultiByte - - - Utility - MultiByte - true - - - Utility - MultiByte - - - - - - - - - - - - - - - - - - - - - - - $(GlibEtcInstallRoot)\ - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - $(GlibEtcInstallRoot)\ - - - - - $(CoglDoInstall) - - - - - $(CoglDoInstall) - - - - - $(CoglDoInstall) - - - - - $(CoglDoInstall) - - - - - {0f08f253-de1a-40cb-a890-93ae3ca23ade} - false - - - {de1a2710-04bb-4c3d-90c1-b070e326b1cf} - false - - - {f5a43c12-7032-428e-a56a-d294075fa493} - false - - - {cd17f5c8-c860-4a65-8209-4d0b093a3da3} - false - - - {fe5abd0f-91e8-4aa5-9c1c-408427d5f768} - false - - - {f3a80987-5411-43db-a23b-06f2076e1206} - false - - - - - - \ No newline at end of file + + + + + Debug + Win32 + + + Debug_SDL + Win32 + + + Debug + x64 + + + Debug_SDL + x64 + + + Release + Win32 + + + Release_SDL + Win32 + + + Release + x64 + + + Release_SDL + x64 + + + + {35B2A4AC-7235-4FC7-995D-469D59195041} + install + + + + Utility + MultiByte + + + Utility + MultiByte + + + Utility + MultiByte + + + Utility + MultiByte + + + Utility + MultiByte + true + + + Utility + MultiByte + true + + + Utility + MultiByte + true + + + Utility + MultiByte + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(GlibEtcInstallRoot)\ + $(GlibEtcInstallRoot)\ + $(GlibEtcInstallRoot)\ + $(GlibEtcInstallRoot)\ + + + $(GlibEtcInstallRoot)\ + $(GlibEtcInstallRoot)\ + $(GlibEtcInstallRoot)\ + $(GlibEtcInstallRoot)\ + + + + + + $(CoglDoInstall) + + + + + +$(CoglDoInstall) +$(CoglDoInstallSDL) + + + + + + $(CoglDoInstall) + + + + + +$(CoglDoInstall) +$(CoglDoInstallSDL) + + + + + + $(CoglDoInstall) + + + + + +$(CoglDoInstall) +$(CoglDoInstallSDL) + + + + + + $(CoglDoInstall) + + + + + +$(CoglDoInstall) +$(CoglDoInstallSDL) + + + + + + {0f08f253-de1a-40cb-a890-93ae3ca23ade} + false + + + {de1a2710-04bb-4c3d-90c1-b070e326b1cf} + false + + + {f5a43c12-7032-428e-a56a-d294075fa493} + false + + + {0b5d144d-1872-42cd-8437-ffdcdd08c03e} + false + + + {cd17f5c8-c860-4a65-8209-4d0b093a3da3} + false + + + {fe5abd0f-91e8-4aa5-9c1c-408427d5f768} + false + + + {f3a80987-5411-43db-a23b-06f2076e1207} + false + + + {f3a80987-5411-43db-a23b-06f2076e1206} + false + + + + + + diff --git a/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin b/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin index a1b8af590..7d44a1f98 100644 --- a/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin +++ b/build/win32/vs10/test-conformance-cogl.vcxproj.filtersin @@ -10,4 +10,4 @@ #include "testconformance.vs10.sourcefiles.filters" Sources - \ No newline at end of file + diff --git a/build/win32/vs10/test-conformance-cogl.vcxprojin b/build/win32/vs10/test-conformance-cogl.vcxprojin index d1c7059df..424901bb4 100644 --- a/build/win32/vs10/test-conformance-cogl.vcxprojin +++ b/build/win32/vs10/test-conformance-cogl.vcxprojin @@ -47,19 +47,19 @@ - + - + - + - + @@ -72,7 +72,7 @@ Disabled ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) - _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -92,7 +92,7 @@ Disabled ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) - _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + _DEBUG;COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -117,7 +117,7 @@ MaxSpeed ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) true - COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -137,7 +137,7 @@ ..\..\..\test-fixtures;%(AdditionalIncludeDirectories) - COGL_ENABLE_EXPERIMENTAL_API;$(TestProgDef);%(PreprocessorDefinitions) + COGL_ENABLE_EXPERIMENTAL_API;%(PreprocessorDefinitions) MultiThreadedDLL @@ -166,7 +166,11 @@ {ea036190-0950-4640-84f9-d459a33b33a8} false - + + {f3a80987-5411-43db-a23b-06f2076e1207} + false + + {fe5abd0f-91e8-4aa5-9c1c-408427d5f768} false @@ -174,4 +178,4 @@ - \ No newline at end of file +