[cogl/cogl-1.14] Update Visual Studio Project Files
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.14] Update Visual Studio Project Files
- Date: Thu, 7 Mar 2013 03:37:40 +0000 (UTC)
commit 72b25bd09832d67fb22e29fbaac6c699ae822a8e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Mar 7 11:37:32 2013 +0800
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 9f13773..5c80bad 100644
--- a/build/win32/vs10/cogl-crate.vcxproj
+++ b/build/win32/vs10/cogl-crate.vcxproj
@@ -71,7 +71,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -90,7 +90,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
-
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>_DEBUG;COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -114,7 +114,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
-
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
@@ -133,7 +133,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
-
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(CoglApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
<PreprocessorDefinitions>COGL_ENABLE_EXPERIMENTAL_2_0_API;COGL_EXAMPLES_DATA="../share/cogl-$(ApiVersion)/examples-data/";$(BaseBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin
index 673c07a..22888c1 100644
--- a/build/win32/vs10/cogl-pango.vcxprojin
+++ b/build/win32/vs10/cogl-pango.vcxprojin
@@ -89,7 +89,7 @@
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -117,7 +117,7 @@
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
@@ -145,7 +145,7 @@
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +172,7 @@
<AdditionalDependencies>pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl-pango.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 762e809..36220cb 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup Label="UserMacros">
- <GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
- <GlibMkEnumsPath>..\..\..\vs10\$(Platform)</GlibMkEnumsPath>
- <CoglApiVersion>1.0</CoglApiVersion>
+ <VSVer>10</VSVer>
+ <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <GlibEtcInstallRootFromBuildWin32>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRootFromBuildWin32>
+ <ApiVersion>1.0</ApiVersion>
<BaseBuildDefines>_WIN32_WINNT=0x0500;COGL_ENABLE_DEBUG</BaseBuildDefines>
<LibBuildDefines>HAVE_CONFIG_H;COGL_COMPILATION;$(BaseBuildDefines)</LibBuildDefines>
<ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
@@ -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)
</PreBuildCmd>
- <CoglDoInstall>
+<CoglDoInstall>
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
- </CoglDoInstall>
- <CoglDoInstallSDL>
-copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
- </CoglDoInstallSDL>
+</CoglDoInstall>
+<CoglDoInstallSDL>
+copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl
+</CoglDoInstallSDL>
+<DoGenGir>
+set VSVER=$(VSVer)
+
+set CONF=$(Configuration)
+
+set PLAT=$(Platform)
+
+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)
+
+cd ..
+
+call gengir_pango.bat
+
+cd vs$(VSVer)
+</DoGenGir>
<GenerateCoglDef>
echo EXPORTS > $(DefDir)\cogl.def
@@ -229,11 +245,11 @@ copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
</GenerateCoglPangoDef>
<CoglLibtoolCompatibleDllPrefix>lib</CoglLibtoolCompatibleDllPrefix>
- <CoglLibtoolCompatibleDllSuffix>-$(CoglApiVersion)-0</CoglLibtoolCompatibleDllSuffix>
- <CoglSeparateVS10DllPrefix />
- <CoglSeparateVS10DllSuffix>-1-vs10</CoglSeparateVS10DllSuffix>
- <CoglDllPrefix>$(CoglSeparateVS10DllPrefix)</CoglDllPrefix>
- <CoglDllSuffix>$(CoglSeparateVS10DllSuffix)</CoglDllSuffix>
+ <CoglLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</CoglLibtoolCompatibleDllSuffix>
+ <CoglSeparateVSDllPrefix />
+ <CoglSeparateVSDllSuffix>-1-vs$(VSVer)</CoglSeparateVSDllSuffix>
+ <CoglDllPrefix>$(CoglSeparateVSDllPrefix)</CoglDllPrefix>
+ <CoglDllSuffix>$(CoglSeparateVSDllSuffix)</CoglDllSuffix>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>coglprops</_PropertySheetDisplayName>
@@ -262,11 +278,8 @@ copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
<BuildMacro Include="DefDir">
<Value>$(DefDir)</Value>
</BuildMacro>
- <BuildMacro Include="GlibEtcInstallRoot">
- <Value>$(GlibMkEnumsPath)</Value>
- </BuildMacro>
- <BuildMacro Include="CoglApiVersion">
- <Value>$(CoglApiVersion)</Value>
+ <BuildMacro Include="ApiVersion">
+ <Value>$(ApiVersion)</Value>
</BuildMacro>
<BuildMacro Include="BaseBuildDefines">
<Value>$(BaseBuildDefines)</Value>
@@ -319,11 +332,11 @@ copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
<BuildMacro Include="CoglLibtoolCompatibleDllSuffix">
<Value>$(CoglLibtoolCompatibleDllSuffix)</Value>
</BuildMacro>
- <BuildMacro Include="CoglSeparateVS10DllPrefix">
- <Value>$(CoglSeparateVS10DllPrefix)</Value>
+ <BuildMacro Include="CoglSeparateVSDllPrefix">
+ <Value>$(CoglSeparateVSDllPrefix)</Value>
</BuildMacro>
- <BuildMacro Include="CoglSeparateVS10DllSuffix">
- <Value>$(CoglSeparateVS10DllSuffix)</Value>
+ <BuildMacro Include="CoglSeparateVSDllSuffix">
+ <Value>$(CoglSeparateVSDllSuffix)</Value>
</BuildMacro>
<BuildMacro Include="CoglDllPrefix">
<Value>$(CoglDllPrefix)</Value>
diff --git a/build/win32/vs10/cogl.sln b/build/win32/vs10/cogl.sln
index e827a02..006a04b 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 8e865ec..0b3e2c9 100644
--- a/build/win32/vs10/cogl.vcxprojin
+++ b/build/win32/vs10/cogl.vcxprojin
@@ -150,7 +150,7 @@
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -182,7 +182,7 @@
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@@ -214,7 +214,7 @@
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
@@ -246,7 +246,7 @@
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
@@ -278,7 +278,7 @@
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -312,7 +312,7 @@
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -343,7 +343,7 @@
<AdditionalDependencies>opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -374,7 +374,7 @@
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\cogl.def</ModuleDefinitionFile>
- <ImportLibrary>$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib</ImportLibrary>
+ <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index 5c4708a..5b903b9 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -102,10 +102,6 @@
<Project>{f5a43c12-7032-428e-a56a-d294075fa493}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="cogl-msaa.vcxproj">
- <Project>{44e864d4-8447-484d-9b16-d5405e0783cf}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="cogl-info.vcxproj">
<Project>{cd17f5c8-c860-4a65-8209-4d0b093a3da3}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/build/win32/vs9/cogl-crate.vcproj b/build/win32/vs9/cogl-crate.vcproj
index 1e8617e..2912a72 100644
--- a/build/win32/vs9/cogl-crate.vcproj
+++ b/build/win32/vs9/cogl-crate.vcproj
@@ -31,7 +31,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
PreprocessorDefinitions="_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)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -60,7 +60,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
PreprocessorDefinitions="_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)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -94,7 +94,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
-
PreprocessorDefinitions="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)"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
-
PreprocessorDefinitions="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)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/build/win32/vs9/cogl-pango.vcprojin b/build/win32/vs9/cogl-pango.vcprojin
index 2bc1590..44bd7f1 100644
--- a/build/win32/vs9/cogl-pango.vcprojin
+++ b/build/win32/vs9/cogl-pango.vcprojin
@@ -50,7 +50,7 @@
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -87,7 +87,7 @@
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
@@ -125,7 +125,7 @@
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -161,7 +161,7 @@
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\cogl-pango.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
diff --git a/build/win32/vs9/cogl.sln b/build/win32/vs9/cogl.sln
index 32bc814..6dcc899 100644
--- a/build/win32/vs9/cogl.sln
+++ b/build/win32/vs9/cogl.sln
@@ -19,11 +19,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}
@@ -39,7 +34,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
ProjectSection(ProjectDependencies) = postProject
{FE5ABD0F-91E8-4AA5-9C1C-408427D5F768} = {FE5ABD0F-91E8-4AA5-9C1C-408427D5F768}
{F5A43C12-7032-428E-A56A-D294075FA493} = {F5A43C12-7032-428E-A56A-D294075FA493}
- {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}
@@ -78,14 +72,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/vs9/cogl.vcprojin b/build/win32/vs9/cogl.vcprojin
index b1680ec..5469713 100644
--- a/build/win32/vs9/cogl.vcprojin
+++ b/build/win32/vs9/cogl.vcprojin
@@ -54,7 +54,7 @@ $(PreBuildCmd)
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\cogl.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -96,7 +96,7 @@ $(PreBuildCmd)
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\cogl.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
@@ -137,7 +137,7 @@ $(PreBuildCmd)
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\cogl.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
@@ -179,7 +179,7 @@ $(PreBuildCmd)
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\cogl.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
@@ -221,7 +221,7 @@ $(PreBuildCmd)
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\cogl.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -266,7 +266,7 @@ $(PreBuildCmd)
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="$(IntDir)\cogl.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -306,7 +306,7 @@ $(PreBuildCmd)
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\cogl.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
@@ -347,7 +347,7 @@ $(PreBuildCmd)
OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="$(IntDir)\cogl.def"
- ImportLibrary="$(TargetDir)$(ProjectName)-$(CoglApiVersion).lib"
+ ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 153adda..6b75c35 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -18,8 +18,16 @@
AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
/>
<UserMacro
+ Name="VSVer"
+ Value="9"
+ />
+ <UserMacro
Name="GlibEtcInstallRoot"
- Value="..\..\..\..\vs9\$(PlatformName)"
+ Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ />
+ <UserMacro
+ Name="GlibEtcInstallRootFromBuildWin32"
+ Value="..\..\..\vs$(VSVer)\$(PlatformName)"
/>
<UserMacro
Name="CopyDir"
@@ -30,11 +38,7 @@
Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
/>
<UserMacro
- Name="GlibMkEnumsPath"
- Value="..\..\..\vs9\$(PlatformName)"
- />
- <UserMacro
- Name="CoglApiVersion"
+ Name="ApiVersion"
Value="1.0"
/>
<UserMacro
@@ -100,8 +104,8 @@ if not exist ..\..\..\cogl\cogl-gl-header.h copy ..\..\..\cogl\cogl-gl-header.h.
:DONE_CONFIG_H

cd ..

-gen-enums.bat $(GlibMkEnumsPath)

-cd .\vs9

+gen-enums.bat $(GlibEtcInstallRootFromBuildWin32)

+cd .\vs$(VSVer)

"
/>
@@ -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

"
/>
<UserMacro
Name="CoglDoInstallSDL"
Value="
-copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(ApiVersion)\cogl

+ "
+ />
+ <UserMacro
+ Name="DoGenGir"
+ Value="
+set VSVER=$(VSVer)

+set CONF=$(ConfigurationName)

+set PLAT=$(PlatformName)

+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)

+
+cd ..

+call gengir_cogl.bat

+cd vs$(VSVer)

"
/>
<UserMacro
@@ -226,24 +243,24 @@ copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl�
/>
<UserMacro
Name="CoglLibtoolCompatibleDllSuffix"
- Value="-$(CoglApiVersion)-0"
+ Value="-$(ApiVersion)-0"
/>
<UserMacro
- Name="CoglSeparateVS9DllPrefix"
+ Name="CoglSeparateVSDllPrefix"
Value=""
/>
<UserMacro
- Name="CoglSeparateVS9DllSuffix"
- Value="-1-vs9"
+ Name="CoglSeparateVSDllSuffix"
+ Value="-1-vs$(VSVER)"
/>
<!-- Change these two to GlibLibtoolCompatibleDllPrefix and
GlibLibtoolCompatibleDllSuffix if that is what you want -->
<UserMacro
Name="CoglDllPrefix"
- Value="$(CoglSeparateVS9DllPrefix)"
+ Value="$(CoglSeparateVSDllPrefix)"
/>
<UserMacro
Name="CoglDllSuffix"
- Value="$(CoglSeparateVS9DllSuffix)"
+ Value="$(CoglSeparateVSDllSuffix)"
/>
</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/cogl_sdl.sln b/build/win32/vs9/cogl_sdl.sln
index e9bf176..83deeed 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
