From 72b25bd09832d67fb22e29fbaac6c699ae822a8e Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Thu, 7 Mar 2013 11:37:32 +0800 Subject: [PATCH] Update Visual Studio Project Files -Make entries of the property sheets more like the property sheets of the projects in the GTK+/Clutter stack, mainly changing CoglApiVersion to ApiVersion, for better consistency, and update the corresponding projects -Add command item in property sheets to build introspection files for Cogl and Cogl Pango. -Stop building and installing the cogl-msaa example, as it is something that isn't really meant for Windows, and causes an internal compiler error on Visual Studio 2010 x64 builds --- build/win32/vs10/cogl-crate.vcxproj | 8 +- build/win32/vs10/cogl-pango.vcxprojin | 8 +- build/win32/vs10/cogl.props | 197 ++++++++++++++------------ build/win32/vs10/cogl.sln | 10 -- build/win32/vs10/cogl.vcxprojin | 16 +-- build/win32/vs10/install.vcxproj | 4 - build/win32/vs9/cogl-crate.vcproj | 8 +- build/win32/vs9/cogl-pango.vcprojin | 8 +- build/win32/vs9/cogl.sln | 14 -- build/win32/vs9/cogl.vcprojin | 16 +-- build/win32/vs9/cogl.vsprops | 187 +++++++++++++----------- build/win32/vs9/cogl_sdl.sln | 14 -- 12 files changed, 239 insertions(+), 251 deletions(-) diff --git a/build/win32/vs10/cogl-crate.vcxproj b/build/win32/vs10/cogl-crate.vcxproj index 9f137730b..5c80bad99 100644 --- a/build/win32/vs10/cogl-crate.vcxproj +++ b/build/win32/vs10/cogl-crate.vcxproj @@ -71,7 +71,7 @@ Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -90,7 +90,7 @@ Disabled - _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + _DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -114,7 +114,7 @@ MaxSpeed true - COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) MultiThreadedDLL true @@ -133,7 +133,7 @@ - COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) + COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin index 673c07a10..22888c115 100644 --- a/build/win32/vs10/cogl-pango.vcxprojin +++ b/build/win32/vs10/cogl-pango.vcxprojin @@ -89,7 +89,7 @@ pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll $(IntDir)\cogl-pango.def - $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows MachineX86 @@ -117,7 +117,7 @@ pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll $(IntDir)\cogl-pango.def - $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows MachineX64 @@ -145,7 +145,7 @@ pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll $(IntDir)\cogl-pango.def - $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows true @@ -172,7 +172,7 @@ pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies) $(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll $(IntDir)\cogl-pango.def - $(TargetDir)$(ProjectName)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows true diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props index 762e80953..36220cbcc 100644 --- a/build/win32/vs10/cogl.props +++ b/build/win32/vs10/cogl.props @@ -1,9 +1,10 @@  - ..\..\..\..\vs10\$(Platform) - ..\..\..\vs10\$(Platform) - 1.0 + 10 + ..\..\..\..\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 @@ -45,13 +46,13 @@ if not exist ..\..\..\cogl\cogl-gl-header.h copy ..\..\..\cogl\cogl-gl-header.h. cd .. -gen-enums.bat $(GlibMkEnumsPath) +gen-enums.bat $(GlibEtcInstallRootFromBuildWin32) -cd .\vs10 +cd .\vs$(VSVer) - + mkdir $(CopyDir) mkdir $(CopyDir)\bin @@ -65,151 +66,166 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin copy ..\*.bat $(CopyDir)\bin -mkdir $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data +mkdir $(CopyDir)\share\cogl-$(ApiVersion)\examples-data -copy ..\..\..\examples\*.jpg $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data +copy ..\..\..\examples\*.jpg $(CopyDir)\share\cogl-$(ApiVersion)\examples-data mkdir $(CopyDir)\lib -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(CoglApiVersion).lib $(CopyDir)\lib +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib -mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl -mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango +mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango -copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango +copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango -copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-error.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-error.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-frame-info.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-frame-info.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-matrix-stack.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-matrix-stack.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-output.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-output.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-path.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-path-functions.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-path-functions.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-poll.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-poll.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-snippet.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-snippet.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture-2d-gl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-texture-2d-gl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-sub-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-sub-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl2-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl2-path.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl - - -copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl - + + +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 @@ -229,11 +245,11 @@ copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl lib - -$(CoglApiVersion)-0 - - -1-vs10 - $(CoglSeparateVS10DllPrefix) - $(CoglSeparateVS10DllSuffix) + -$(ApiVersion)-0 + + -1-vs$(VSVer) + $(CoglSeparateVSDllPrefix) + $(CoglSeparateVSDllSuffix) <_PropertySheetDisplayName>coglprops @@ -262,11 +278,8 @@ copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl $(DefDir) - - $(GlibMkEnumsPath) - - - $(CoglApiVersion) + + $(ApiVersion) $(BaseBuildDefines) @@ -319,11 +332,11 @@ copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl $(CoglLibtoolCompatibleDllSuffix) - - $(CoglSeparateVS10DllPrefix) + + $(CoglSeparateVSDllPrefix) - - $(CoglSeparateVS10DllSuffix) + + $(CoglSeparateVSDllSuffix) $(CoglDllPrefix) diff --git a/build/win32/vs10/cogl.sln b/build/win32/vs10/cogl.sln index e827a0209..006a04bd8 100644 --- a/build/win32/vs10/cogl.sln +++ b/build/win32/vs10/cogl.sln @@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-pango", "cogl-pango.vc 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-msaa", "cogl-msaa.vcxproj", "{44E864D4-8447-484D-9B16-D5405E0783CF}" -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}" @@ -49,14 +47,6 @@ 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 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.ActiveCfg = Debug|Win32 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.Build.0 = Debug|Win32 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.ActiveCfg = Debug|x64 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.Build.0 = Debug|x64 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.ActiveCfg = Release|Win32 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.Build.0 = Release|Win32 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.ActiveCfg = Release|x64 - {44E864D4-8447-484D-9B16-D5405E0783CF}.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 diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin index 8e865ec1a..0b3e2c9a4 100644 --- a/build/win32/vs10/cogl.vcxprojin +++ b/build/win32/vs10/cogl.vcxprojin @@ -150,7 +150,7 @@ 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)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows MachineX86 @@ -182,7 +182,7 @@ 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)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows MachineX86 @@ -214,7 +214,7 @@ 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)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows MachineX64 @@ -246,7 +246,7 @@ 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)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows MachineX64 @@ -278,7 +278,7 @@ 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)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows true @@ -312,7 +312,7 @@ 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)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows true @@ -343,7 +343,7 @@ 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)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows true @@ -374,7 +374,7 @@ 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)-$(CoglApiVersion).lib + $(TargetDir)$(ProjectName)-$(ApiVersion).lib true Windows true diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index 5c4708a53..5b903b9f3 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -102,10 +102,6 @@ {f5a43c12-7032-428e-a56a-d294075fa493} false - - {44e864d4-8447-484d-9b16-d5405e0783cf} - false - {cd17f5c8-c860-4a65-8209-4d0b093a3da3} false diff --git a/build/win32/vs9/cogl-crate.vcproj b/build/win32/vs9/cogl-crate.vcproj index 1e8617e82..2912a72df 100644 --- a/build/win32/vs9/cogl-crate.vcproj +++ b/build/win32/vs9/cogl-crate.vcproj @@ -31,7 +31,7 @@ + + - @@ -116,87 +120,100 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin copy ..\*.bat $(CopyDir)\bin -mkdir $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data -copy ..\..\..\examples\crate.jpg $(CopyDir)\share\cogl-$(CoglApiVersion)\examples-data +mkdir $(CopyDir)\share\cogl-$(ApiVersion)\examples-data +copy ..\..\..\examples\crate.jpg $(CopyDir)\share\cogl-$(ApiVersion)\examples-data mkdir $(CopyDir)\lib -copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(CoglApiVersion).lib $(CopyDir)\lib +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib -mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -mkdir $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango -copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl-pango -copy ..\..\..\cogl\cogl-object.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-attribute-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-bitmap.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-color.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-deprecated.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-depth-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-error.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-euler.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-fixed.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-frame-info.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-glib-source.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-material-compat.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-quaternion.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-vector.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-matrix-stack.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-output.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-primitive-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-path-functions.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-pipeline-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-pixel-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-poll.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-shader.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-snippet.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture-2d-gl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-sub-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-attribute.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-primitive.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-clip-state.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-framebuffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-clutter.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-defines.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-enum-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl +mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl +mkdir $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango +copy ..\..\..\cogl-pango\cogl-pango.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl-pango +copy ..\..\..\cogl\cogl-object.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-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-material-compat.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl +copy ..\..\..\cogl\cogl-pipeline.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl +copy ..\..\..\cogl\cogl-quaternion.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-path.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl +copy ..\..\..\cogl\cogl-path-functions.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-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-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-swap-chain.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-onscreen-template.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-display.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-version.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl-win32-renderer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl1-context.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl2-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl -copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersion)\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-path.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl +copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl +copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl -mkdir $(CopyDir)\share\cogl-$(CoglApiVersion)\tests -copy ..\..\..\tests\data\valgrind.suppressions $(CopyDir)\share\cogl-$(CoglApiVersion)\tests +mkdir $(CopyDir)\share\cogl-$(ApiVersion)\tests +copy ..\..\..\tests\data\valgrind.suppressions $(CopyDir)\share\cogl-$(ApiVersion)\tests " /> + diff --git a/build/win32/vs9/cogl_sdl.sln b/build/win32/vs9/cogl_sdl.sln index e9bf176c8..83deeedf2 100644 --- a/build/win32/vs9/cogl_sdl.sln +++ b/build/win32/vs9/cogl_sdl.sln @@ -24,11 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-crate", "cogl-crate.vc {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-msaa", "cogl-msaa.vcproj", "{44E864D4-8447-484D-9B16-D5405E0783CF}" - ProjectSection(ProjectDependencies) = postProject - {F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cogl-info", "cogl-info.vcproj", "{CD17F5C8-C860-4A65-8209-4D0B093A3DA3}" ProjectSection(ProjectDependencies) = postProject {F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206} @@ -45,7 +40,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install_sdl", "install_sdl. {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} {F5A43C12-7032-428E-A56A-D294075FA493} = {F5A43C12-7032-428E-A56A-D294075FA493} {0B5D144D-1872-42CD-8437-FFDCDD08C03E} = {0B5D144D-1872-42CD-8437-FFDCDD08C03E} - {44E864D4-8447-484D-9B16-D5405E0783CF} = {44E864D4-8447-484D-9B16-D5405E0783CF} {CD17F5C8-C860-4A65-8209-4D0B093A3DA3} = {CD17F5C8-C860-4A65-8209-4D0B093A3DA3} {F3A80987-5411-43DB-A23B-06F2076E1206} = {F3A80987-5411-43DB-A23B-06F2076E1206} {DE1A2710-04BB-4C3D-90C1-B070E326B1CF} = {DE1A2710-04BB-4C3D-90C1-B070E326B1CF} @@ -92,14 +86,6 @@ Global {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|Win32.Build.0 = Release|Win32 {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|x64.ActiveCfg = Release|x64 {0B5D144D-1872-42CD-8437-FFDCDD08C03E}.Release|x64.Build.0 = Release|x64 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.ActiveCfg = Debug|Win32 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|Win32.Build.0 = Debug|Win32 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.ActiveCfg = Debug|x64 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Debug|x64.Build.0 = Debug|x64 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.ActiveCfg = Release|Win32 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|Win32.Build.0 = Release|Win32 - {44E864D4-8447-484D-9B16-D5405E0783CF}.Release|x64.ActiveCfg = Release|x64 - {44E864D4-8447-484D-9B16-D5405E0783CF}.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