Fix Cogl Visual Studio Projects

Some GL driver sources were moved and added, so these sources and paths
must be added/changed in the Cogl projects
This commit is contained in:
Chun-wei Fan 2013-03-01 15:46:41 +08:00
parent a131b697d9
commit 1ddf5e30c1
3 changed files with 43 additions and 22 deletions

View File

@ -19,7 +19,14 @@
<ClCompile Include="..\..\..\cogl\cogl-sdl.c"><Filter>Sources</Filter></ClCompile> <ClCompile Include="..\..\..\cogl\cogl-sdl.c"><Filter>Sources</Filter></ClCompile>
<ClCompile Include="..\..\..\cogl\cogl-win32-renderer.c"><Filter>Sources</Filter></ClCompile> <ClCompile Include="..\..\..\cogl\cogl-win32-renderer.c"><Filter>Sources</Filter></ClCompile>
#include "cogl.vs10.sourcefiles.filters" #include "cogl.vs10.sourcefiles.filters"
<ClCompile Include="..\..\..\cogl\driver\gl\cogl-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\cogl-texture-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>
</Project> </Project>

View File

@ -133,7 +133,7 @@
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <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> <PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -165,7 +165,7 @@
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <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> <PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -197,7 +197,7 @@
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <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> <PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -229,7 +229,7 @@
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <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> <PreprocessorDefinitions>$(DebugLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -261,7 +261,7 @@
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <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> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -295,7 +295,7 @@
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <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> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -328,7 +328,7 @@
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <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> <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader> <PrecompiledHeader>
@ -359,7 +359,7 @@
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
<ClCompile> <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> <PreprocessorDefinitions>$(ReleaseLibBuildDefines);$(CoglBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader> <PrecompiledHeader>
@ -398,8 +398,15 @@
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\cogl\cogl-win32-renderer.c" /> <ClCompile Include="..\..\..\cogl\cogl-win32-renderer.c" />
#include "cogl.vs10.sourcefiles" #include "cogl.vs10.sourcefiles"
<ClCompile Include="..\..\..\cogl\driver\gl\cogl-gl.c" /> <ClCompile Include="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c" />
<ClCompile Include="..\..\..\cogl\driver\gl\cogl-texture-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>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\..\..\cogl\cogl.rc" /> <ResourceCompile Include="..\..\..\cogl\cogl.rc" />

View File

@ -35,7 +35,7 @@ $(PreBuildCmd)
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" 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)" PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -77,7 +77,7 @@ $(PreBuildCmd)
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" 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)" PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -118,7 +118,7 @@ $(PreBuildCmd)
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" 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)" PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -160,7 +160,7 @@ $(PreBuildCmd)
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" 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)" PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglBuildDefines)"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -202,7 +202,7 @@ $(PreBuildCmd)
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl" AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)" PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -247,7 +247,7 @@ $(PreBuildCmd)
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl" AdditionalIncludeDirectories="..\..\..\cogl\tesselator;..\..\..\cogl\winsys;..\..\..\cogl\driver\gl;..\..\..\cogl\driver\gl\gl"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)" PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -289,7 +289,7 @@ $(PreBuildCmd)
/> />
<Tool <Tool
Name="VCCLCompilerTool" 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)" PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -330,7 +330,7 @@ $(PreBuildCmd)
/> />
<Tool <Tool
Name="VCCLCompilerTool" 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)" PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglBuildDefines)"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -379,8 +379,15 @@ $(PreBuildCmd)
<File RelativePath="..\..\..\cogl\cogl-win32-renderer.c" /> <File RelativePath="..\..\..\cogl\cogl-win32-renderer.c" />
#include "cogl.sourcefiles" #include "cogl.sourcefiles"
<Filter Name="Driver_GL" > <Filter Name="Driver_GL" >
<File RelativePath="..\..\..\cogl\driver\gl\cogl-gl.c" /> <File RelativePath="..\..\..\cogl\driver\gl\gl\cogl-driver-gl.c" />
<File RelativePath="..\..\..\cogl\driver\gl\cogl-texture-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> </Filter>
<Filter Name="Headers" <Filter Name="Headers"