diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2013-03-01 15:46:41 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2013-03-01 15:58:46 +0800 |
commit | 1ddf5e30c1060ecfa28b458bb2e50104a091c9df (patch) | |
tree | a8b764da70457814b13250b30f134f322937af5a /build | |
parent | a131b697d982da5406f11ae72552d1a10fca6fa6 (diff) | |
download | cogl-1ddf5e30c1060ecfa28b458bb2e50104a091c9df.tar.gz |
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
Diffstat (limited to 'build')
-rw-r--r-- | build/win32/vs10/cogl.vcxproj.filtersin | 11 | ||||
-rw-r--r-- | build/win32/vs10/cogl.vcxprojin | 27 | ||||
-rw-r--r-- | build/win32/vs9/cogl.vcprojin | 27 |
3 files changed, 43 insertions, 22 deletions
diff --git a/build/win32/vs10/cogl.vcxproj.filtersin b/build/win32/vs10/cogl.vcxproj.filtersin index 3541a7f9..e9529147 100644 --- a/build/win32/vs10/cogl.vcxproj.filtersin +++ b/build/win32/vs10/cogl.vcxproj.filtersin @@ -19,7 +19,14 @@ <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> </Project>
\ No newline at end of file diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin index de173efe..8e865ec1 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> @@ -165,7 +165,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> @@ -197,7 +197,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> @@ -229,7 +229,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> @@ -261,7 +261,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> @@ -295,7 +295,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> @@ -328,7 +328,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> @@ -359,7 +359,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> @@ -398,8 +398,15 @@ </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> <ResourceCompile Include="..\..\..\cogl\cogl.rc" /> diff --git a/build/win32/vs9/cogl.vcprojin b/build/win32/vs9/cogl.vcprojin index 2fc03af6..b1680ecc 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" @@ -77,7 +77,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" @@ -118,7 +118,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" @@ -160,7 +160,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" @@ -202,7 +202,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" @@ -247,7 +247,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" @@ -289,7 +289,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" @@ -330,7 +330,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" @@ -379,8 +379,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" |