[cogl] Visual Studio Projects: Use Custom Build Rules
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] Visual Studio Projects: Use Custom Build Rules
- Date: Fri, 30 Aug 2013 16:50:37 +0000 (UTC)
commit 05630971e0596554582b5d9d137298199860e983
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Sat Aug 31 00:50:18 2013 +0800
Visual Studio Projects: Use Custom Build Rules
Use custom build rules to generate the enumeration sources and the .def
files so that the IDE will regenerate those files upon change and clean
them when a clean up request is requested.
Also make the projects reflect more closely the file layout in the
current source tree
build/win32/vs10/cogl-pango.vcxproj.filtersin | 3 +
build/win32/vs10/cogl-pango.vcxprojin | 36 ++--
build/win32/vs10/cogl.vcxproj.filtersin | 16 ++-
build/win32/vs10/cogl.vcxprojin | 153 +++++++++++----
build/win32/vs9/cogl-pango.vcprojin | 54 ++++--
build/win32/vs9/cogl.vcprojin | 249 ++++++++++++++++++++-----
6 files changed, 381 insertions(+), 130 deletions(-)
---
diff --git a/build/win32/vs10/cogl-pango.vcxproj.filtersin b/build/win32/vs10/cogl-pango.vcxproj.filtersin
index 4e22b74..48d7d45 100644
--- a/build/win32/vs10/cogl-pango.vcxproj.filtersin
+++ b/build/win32/vs10/cogl-pango.vcxproj.filtersin
@@ -13,4 +13,7 @@
<ItemGroup>
#include "coglpango.vs10.sourcefiles.filters"
</ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\..\..\cogl-pango\cogl-pango.symbols"><Filter>Resource
Files</Filter></CustomBuild>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/build/win32/vs10/cogl-pango.vcxprojin b/build/win32/vs10/cogl-pango.vcxprojin
index 673c07a..9698c02 100644
--- a/build/win32/vs10/cogl-pango.vcxprojin
+++ b/build/win32/vs10/cogl-pango.vcxprojin
@@ -82,14 +82,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglPangoDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -110,14 +107,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglPangoDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -138,14 +132,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglPangoDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -165,14 +156,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglPangoDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -184,6 +172,22 @@
#include "coglpango.vs10.sourcefiles"
</ItemGroup>
<ItemGroup>
+ <CustomBuild Include="..\..\..\cogl-pango\cogl-pango.symbols">
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating
$(IntDir)\cogl-pango.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateCoglPangoDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating
$(IntDir)\cogl-pango.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateCoglPangoDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating
$(IntDir)\cogl-pango.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateCoglPangoDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating
$(IntDir)\cogl-pango.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateCoglPangoDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\cogl-pango.def;%(Outputs)</Outputs>
+ </CustomBuild>
+ </ItemGroup>
+ <ItemGroup>
<ResourceCompile Include="..\..\..\cogl-pango\cogl-pango.rc" />
</ItemGroup>
<ItemGroup>
diff --git a/build/win32/vs10/cogl.vcxproj.filtersin b/build/win32/vs10/cogl.vcxproj.filtersin
index 3541a7f..963c238 100644
--- a/build/win32/vs10/cogl.vcxproj.filtersin
+++ b/build/win32/vs10/cogl.vcxproj.filtersin
@@ -19,7 +19,19 @@
<ClCompile Include="..\..\..\cogl\cogl-sdl.c"><Filter>Sources</Filter></ClCompile>
<ClCompile Include="..\..\..\cogl\cogl-win32-renderer.c"><Filter>Sources</Filter></ClCompile>
#include "cogl.vs10.sourcefiles.filters"
- <ClCompile Include="..\..\..\cogl\driver\gl\cogl-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
- <ClCompile
Include="..\..\..\cogl\driver\gl\cogl-texture-driver-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+ <ClCompile
Include="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+ <ClCompile
Include="..\..\..\cogl\driver\gl\gl\cogl-texture-driver-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+ <ClCompile
Include="..\..\..\cogl\driver\gl\cogl-attribute-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+ <ClCompile
Include="..\..\..\cogl\driver\gl\cogl-buffer-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+ <ClCompile
Include="..\..\..\cogl\driver\gl\cogl-clip-stack-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+ <ClCompile
Include="..\..\..\cogl\driver\gl\cogl-framebuffer-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+ <ClCompile
Include="..\..\..\cogl\driver\gl\cogl-texture-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+ <ClCompile
Include="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+ <ClCompile
Include="..\..\..\cogl\driver\gl\cogl-util-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\..\..\cogl\cogl.symbols"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\..\cogl\cogl-enum-types.h.in"><Filter>Resource Files</Filter></CustomBuild>
+ <CustomBuild Include="..\..\..\cogl\cogl-enum-types.c.in"><Filter>Resource Files</Filter></CustomBuild>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin
index de173ef..970901c 100644
--- a/build/win32/vs10/cogl.vcxprojin
+++ b/build/win32/vs10/cogl.vcxprojin
@@ -133,7 +133,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -143,14 +143,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -165,7 +162,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -175,14 +172,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglSDLDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -197,7 +191,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -207,14 +201,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -229,7 +220,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -239,14 +230,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglSDLDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -261,7 +249,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -271,14 +259,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -295,7 +280,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
-
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -305,14 +290,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglSDLDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -328,7 +310,7 @@
</Command>
</PreBuildEvent>
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -336,14 +318,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -359,7 +338,7 @@
</Command>
</PreBuildEvent>
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -367,14 +346,11 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
- <PreLinkEvent>
- <Command>$(GenerateCoglSDLDef)</Command>
- </PreLinkEvent>
<Link>
<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>
@@ -398,12 +374,105 @@
</ClCompile>
<ClCompile Include="..\..\..\cogl\cogl-win32-renderer.c" />
#include "cogl.vs10.sourcefiles"
- <ClCompile Include="..\..\..\cogl\driver\gl\cogl-gl.c" />
- <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-driver-gl.c" />
+ <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c" />
+ <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-texture-driver-gl.c" />
+ <ClCompile Include="..\..\..\cogl\driver\gl\cogl-attribute-gl.c" />
+ <ClCompile Include="..\..\..\cogl\driver\gl\cogl-buffer-gl.c" />
+ <ClCompile Include="..\..\..\cogl\driver\gl\cogl-clip-stack-gl.c" />
+ <ClCompile Include="..\..\..\cogl\driver\gl\cogl-framebuffer-gl.c" />
+ <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-gl.c" />
+ <ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c" />
+ <ClCompile Include="..\..\..\cogl\driver\gl\cogl-util-gl.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <CustomBuild Include="..\..\..\cogl\cogl.symbols">
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Generating
$(IntDir)\cogl.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GenerateCoglSDLDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Generating
$(IntDir)\cogl.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GenerateCoglSDLDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating
$(IntDir)\cogl.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateCoglDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating
$(IntDir)\cogl.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateCoglDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Generating
$(IntDir)\cogl.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GenerateCoglSDLDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Generating
$(IntDir)\cogl.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GenerateCoglSDLDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating
$(IntDir)\cogl.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateCoglDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating
$(IntDir)\cogl.def</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateCoglDef)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\cogl.def;%(Outputs)</Outputs>
+ </CustomBuild>
+ <CustomBuild Include="..\..\..\cogl\cogl-enum-types.h.in">
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Generating
..\..\..\cogl\cogl-enum-types.h</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GenCoglEnumsH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Generating
..\..\..\cogl\cogl-enum-types.h</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GenCoglEnumsH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating
..\..\..\cogl\cogl-enum-types.h</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenCoglEnumsH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating
..\..\..\cogl\cogl-enum-types.h</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenCoglEnumsH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Generating
..\..\..\cogl\cogl-enum-types.h</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GenCoglEnumsH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Generating
..\..\..\cogl\cogl-enum-types.h</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GenCoglEnumsH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating
..\..\..\cogl\cogl-enum-types.h</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenCoglEnumsH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating
..\..\..\cogl\cogl-enum-types.h</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenCoglEnumsH)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl\cogl-enum-types.h;%(Outputs)</Outputs>
+ </CustomBuild>
+ <CustomBuild Include="..\..\..\cogl\cogl-enum-types.c.in">
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">Generating
..\..\..\cogl\cogl-enum-types.c</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">$(GenCoglEnumsC)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">Generating
..\..\..\cogl\cogl-enum-types.c</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">$(GenCoglEnumsC)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug_SDL|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating
..\..\..\cogl\cogl-enum-types.c</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenCoglEnumsC)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating
..\..\..\cogl\cogl-enum-types.c</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenCoglEnumsC)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">Generating
..\..\..\cogl\cogl-enum-types.c</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">$(GenCoglEnumsC)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">Generating
..\..\..\cogl\cogl-enum-types.c</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">$(GenCoglEnumsC)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release_SDL|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating
..\..\..\cogl\cogl-enum-types.c</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenCoglEnumsC)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating
..\..\..\cogl\cogl-enum-types.c</Message>
+ <Command
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenCoglEnumsC)</Command>
+ <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\cogl\cogl-enum-types.c;%(Outputs)</Outputs>
+ </CustomBuild>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\cogl\cogl.rc" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="cogl-path.vcxproj">
+ <Project>{f3a80987-5411-43db-a23b-06f2076e1207}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/build/win32/vs9/cogl-pango.vcprojin b/build/win32/vs9/cogl-pango.vcprojin
index 2bc1590..d4c7a25 100644
--- a/build/win32/vs9/cogl-pango.vcprojin
+++ b/build/win32/vs9/cogl-pango.vcprojin
@@ -41,16 +41,12 @@
DebugInformationFormat="4"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglPangoDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
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"
@@ -78,16 +74,12 @@
DebugInformationFormat="3"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglPangoDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
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"
@@ -116,16 +108,12 @@
DebugInformationFormat="3"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglPangoDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
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"
@@ -152,16 +140,12 @@
DebugInformationFormat="3"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglPangoDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="pangocairo-1.0.lib pango-1.0.lib cairo.lib"
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"
@@ -186,6 +170,36 @@
>
</Filter>
<Filter Name="Resource Files">
+ <File RelativePath="..\..\..\cogl-pango\cogl-pango.symbols">
+ <FileConfiguration Name="Debug|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl-pango.def"
+ CommandLine="$(GenerateCoglPangoDef)
"
+ Outputs="$(IntDir)\cogl-pango.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl-pango.def"
+ CommandLine="$(GenerateCoglPangoDef)
"
+ Outputs="$(IntDir)\cogl-pango.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl-pango.def"
+ CommandLine="$(GenerateCoglPangoDef)
"
+ Outputs="$(IntDir)\cogl-pango.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl-pango.def"
+ CommandLine="$(GenerateCoglPangoDef)
"
+ Outputs="$(IntDir)\cogl-pango.def"
+ />
+ </FileConfiguration>
+ </File>
<File RelativePath="..\..\..\cogl-pango\cogl-pango.rc" />
</Filter>
</Files>
diff --git a/build/win32/vs9/cogl.vcprojin b/build/win32/vs9/cogl.vcprojin
index 2fc03af..f5002a0 100644
--- a/build/win32/vs9/cogl.vcprojin
+++ b/build/win32/vs9/cogl.vcprojin
@@ -35,7 +35,7 @@ $(PreBuildCmd)
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -45,16 +45,12 @@ $(PreBuildCmd)
DebugInformationFormat="4"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib
gmodule-2.0.lib"
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"
@@ -77,7 +73,7 @@ $(PreBuildCmd)
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -87,16 +83,12 @@ $(PreBuildCmd)
DebugInformationFormat="4"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglSDLDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib
gdk_pixbuf-2.0.lib gmodule-2.0.lib"
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"
@@ -118,7 +110,7 @@ $(PreBuildCmd)
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -128,16 +120,12 @@ $(PreBuildCmd)
DebugInformationFormat="3"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib
gmodule-2.0.lib"
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"
@@ -160,7 +148,7 @@ $(PreBuildCmd)
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -170,16 +158,12 @@ $(PreBuildCmd)
DebugInformationFormat="3"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglSDLDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib
gdk_pixbuf-2.0.lib gmodule-2.0.lib"
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"
@@ -202,7 +186,7 @@ $(PreBuildCmd)
<Tool
Name="VCCLCompilerTool"
Optimization="2"
-
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
RuntimeLibrary="2"
@@ -212,16 +196,12 @@ $(PreBuildCmd)
DebugInformationFormat="3"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib
gmodule-2.0.lib"
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"
@@ -247,7 +227,7 @@ $(PreBuildCmd)
<Tool
Name="VCCLCompilerTool"
Optimization="2"
-
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
RuntimeLibrary="2"
@@ -257,16 +237,12 @@ $(PreBuildCmd)
DebugInformationFormat="3"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglSDLDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib
gdk_pixbuf-2.0.lib gmodule-2.0.lib"
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"
@@ -289,7 +265,7 @@ $(PreBuildCmd)
/>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -297,16 +273,12 @@ $(PreBuildCmd)
DebugInformationFormat="3"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib
gmodule-2.0.lib"
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"
@@ -330,7 +302,7 @@ $(PreBuildCmd)
/>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl"
+
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -338,16 +310,12 @@ $(PreBuildCmd)
DebugInformationFormat="3"
/>
<Tool
- Name="VCPreLinkEventTool"
- CommandLine="$(GenerateCoglSDLDef)"
- />
- <Tool
Name="VCLinkerTool"
AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib
gdk_pixbuf-2.0.lib gmodule-2.0.lib"
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"
@@ -379,8 +347,15 @@ $(PreBuildCmd)
<File RelativePath="..\..\..\cogl\cogl-win32-renderer.c" />
#include "cogl.sourcefiles"
<Filter Name="Driver_GL" >
- <File RelativePath="..\..\..\cogl\driver\gl\cogl-gl.c" />
- <File RelativePath="..\..\..\cogl\driver\gl\cogl-texture-driver-gl.c" />
+ <File RelativePath="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c" />
+ <File RelativePath="..\..\..\cogl\driver\gl\gl\cogl-texture-driver-gl.c" />
+ <File RelativePath="..\..\..\cogl\driver\gl\cogl-attribute-gl.c" />
+ <File RelativePath="..\..\..\cogl\driver\gl\cogl-buffer-gl.c" />
+ <File RelativePath="..\..\..\cogl\driver\gl\cogl-clip-stack-gl.c" />
+ <File RelativePath="..\..\..\cogl\driver\gl\cogl-framebuffer-gl.c" />
+ <File RelativePath="..\..\..\cogl\driver\gl\cogl-texture-gl.c" />
+ <File RelativePath="..\..\..\cogl\driver\gl\cogl-texture-2d-gl.c" />
+ <File RelativePath="..\..\..\cogl\driver\gl\cogl-util-gl.c" />
</Filter>
</Filter>
<Filter Name="Headers"
@@ -389,6 +364,180 @@ $(PreBuildCmd)
>
</Filter>
<Filter Name="Resource Files">
+ <File RelativePath="..\..\..\cogl\cogl.symbols">
+ <FileConfiguration Name="Debug|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl.def"
+ CommandLine="$(GenerateCoglDef)"
+ Outputs="$(IntDir)\cogl.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_SDL|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl.def"
+ CommandLine="$(GenerateCoglSDLDef)"
+ Outputs="$(IntDir)\cogl.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl.def"
+ CommandLine="$(GenerateCoglDef)"
+ Outputs="$(IntDir)\cogl.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_SDL|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl.def"
+ CommandLine="$(GenerateCoglSDLDef)"
+ Outputs="$(IntDir)\cogl.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl.def"
+ CommandLine="$(GenerateCoglDef)"
+ Outputs="$(IntDir)\cogl.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_SDL|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl.def"
+ CommandLine="$(GenerateCoglSDLDef)"
+ Outputs="$(IntDir)\cogl.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl.def"
+ CommandLine="$(GenerateCoglDef)"
+ Outputs="$(IntDir)\cogl.def"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_SDL|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating $(IntDir)\cogl.def"
+ CommandLine="$(GenerateCoglSDLDef)"
+ Outputs="$(IntDir)\cogl.def"
+ />
+ </FileConfiguration>
+ </File>
+ <File RelativePath="..\..\..\cogl\cogl-enum-types.h.in">
+ <FileConfiguration Name="Debug|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+ CommandLine="$(GenCoglEnumsH)"
+ Outputs="..\..\..\cogl\cogl-enum-types.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_SDL|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+ CommandLine="$(GenCoglEnumsH)"
+ Outputs="..\..\..\cogl\cogl-enum-types.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+ CommandLine="$(GenCoglEnumsH)"
+ Outputs="..\..\..\cogl\cogl-enum-types.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_SDL|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+ CommandLine="$(GenCoglEnumsH)"
+ Outputs="..\..\..\cogl\cogl-enum-types.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+ CommandLine="$(GenCoglEnumsH)"
+ Outputs="..\..\..\cogl\cogl-enum-types.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_SDL|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+ CommandLine="$(GenCoglEnumsH)"
+ Outputs="..\..\..\cogl\cogl-enum-types.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+ CommandLine="$(GenCoglEnumsH)"
+ Outputs="..\..\..\cogl\cogl-enum-types.h"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_SDL|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.h"
+ CommandLine="$(GenCoglEnumsH)"
+ Outputs="..\..\..\cogl\cogl-enum-types.h"
+ />
+ </FileConfiguration>
+ </File>
+ <File RelativePath="..\..\..\cogl\cogl-enum-types.c.in">
+ <FileConfiguration Name="Debug|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+ CommandLine="$(GenCoglEnumsC)"
+ Outputs="..\..\..\cogl\cogl-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_SDL|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+ CommandLine="$(GenCoglEnumsC)"
+ Outputs="..\..\..\cogl\cogl-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+ CommandLine="$(GenCoglEnumsC)"
+ Outputs="..\..\..\cogl\cogl-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_SDL|Win32">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+ CommandLine="$(GenCoglEnumsC)"
+ Outputs="..\..\..\cogl\cogl-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+ CommandLine="$(GenCoglEnumsC)"
+ Outputs="..\..\..\cogl\cogl-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Debug_SDL|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+ CommandLine="$(GenCoglEnumsC)"
+ Outputs="..\..\..\cogl\cogl-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+ CommandLine="$(GenCoglEnumsC)"
+ Outputs="..\..\..\cogl\cogl-enum-types.c"
+ />
+ </FileConfiguration>
+ <FileConfiguration Name="Release_SDL|x64">
+ <Tool Name="VCCustomBuildTool"
+ Description="Generating ..\..\..\cogl\cogl-enum-types.c"
+ CommandLine="$(GenCoglEnumsC)"
+ Outputs="..\..\..\cogl\cogl-enum-types.c"
+ />
+ </FileConfiguration>
+ </File>
<File RelativePath="..\..\..\cogl\cogl.rc" />
</Filter>
</Files>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
