isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Visual C++ projects Update

Browse Source 
Update SDL build configs as there are now SDL-specific public APIs and
new SDL sources.

(cherry picked from commit 006f9f7c44136fc8524649fb790da7f19cd0dc4d)
This commit is contained in:
Chun-wei Fan 2012-05-14 12:56:52 +08:00 committed by Robert Bragg
parent aa1a4a4349
commit 413862e49e
5 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/win32/vs10/cogl.props
View File

@ -195,6 +195,12 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio
cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT ..\..\..\cogl\cogl.symbols >> ..\..\..\cogl\cogl.def
</GenerateCoglDef>
<GenerateCoglSDLDef>
echo EXPORTS &gt; ..\..\..\cogl\cogl.def
cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT ..\..\..\cogl\cogl.symbols &gt;&gt; ..\..\..\cogl\cogl.def
</GenerateCoglDef> </GenerateCoglDef>
<GenerateCoglPangoDef> <GenerateCoglPangoDef>
echo EXPORTS &gt; ..\..\..\cogl-pango\cogl-pango.def echo EXPORTS &gt; ..\..\..\cogl-pango\cogl-pango.def
@ -272,6 +278,9 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio
<BuildMacro Include="GenerateCoglDef"> <BuildMacro Include="GenerateCoglDef">
<Value>$(GenerateCoglDef)</Value> <Value>$(GenerateCoglDef)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="GenerateCoglSDLDef">
<Value>$(GenerateCoglDef)</Value>
</BuildMacro>
<BuildMacro Include="GenerateCoglPangoDef"> <BuildMacro Include="GenerateCoglPangoDef">
<Value>$(GenerateCoglPangoDef)</Value> <Value>$(GenerateCoglPangoDef)</Value>
</BuildMacro> </BuildMacro>
@ -294,4 +303,4 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio
<Value>$(CoglDllSuffix)</Value> <Value>$(CoglDllSuffix)</Value>
</BuildMacro> </BuildMacro>
</ItemGroup> </ItemGroup>
</Project> </Project>

5
build/win32/vs10/cogl.vcxproj.filtersin
View File

@ -15,8 +15,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-wgl.c"><Filter>Sources</Filter></ClCompile> <ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-wgl.c"><Filter>Sources</Filter></ClCompile>
<ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-sdl.c"><Filter>Sources</Filter></ClCompile> <ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-sdl.c"><Filter>Sources</Filter></ClCompile>
<ClCompile Include="..\..\..\cogl\cogl-win32-renderer.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>
#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\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\cogl-texture-driver-gl.c"><Filter>Sources\Driver_GL</Filter></ClCompile>

14
build/win32/vs10/cogl.vcxprojin
View File

@ -176,7 +176,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile> </ClCompile>
<PreLinkEvent> <PreLinkEvent>
<Command>$(GenerateCoglDef)</Command> <Command>$(GenerateCoglSDLDef)</Command>
</PreLinkEvent> </PreLinkEvent>
<Link> <Link>
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -240,7 +240,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile> </ClCompile>
<PreLinkEvent> <PreLinkEvent>
<Command>$(GenerateCoglDef)</Command> <Command>$(GenerateCoglSDLDef)</Command>
</PreLinkEvent> </PreLinkEvent>
<Link> <Link>
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -306,7 +306,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile> </ClCompile>
<PreLinkEvent> <PreLinkEvent>
<Command>$(GenerateCoglDef)</Command> <Command>$(GenerateCoglSDLDef)</Command>
</PreLinkEvent> </PreLinkEvent>
<Link> <Link>
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -368,7 +368,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile> </ClCompile>
<PreLinkEvent> <PreLinkEvent>
<Command>$(GenerateCoglDef)</Command> <Command>$(GenerateCoglSDLDef)</Command>
</PreLinkEvent> </PreLinkEvent>
<Link> <Link>
<AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>SDL.lib;opengl32.lib;intl.lib;cairo.lib;gdk_pixbuf-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -390,6 +390,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\cogl\cogl-sdl.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</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\cogl-gl.c" />

14
build/win32/vs9/cogl.vcprojin
View File

@ -88,7 +88,7 @@ $(PreBuildCmd)
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
CommandLine="$(GenerateCoglDef)" CommandLine="$(GenerateCoglSDLDef)"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
@ -171,7 +171,7 @@ $(PreBuildCmd)
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
CommandLine="$(GenerateCoglDef)" CommandLine="$(GenerateCoglSDLDef)"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
@ -258,7 +258,7 @@ $(PreBuildCmd)
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
CommandLine="$(GenerateCoglDef)" CommandLine="$(GenerateCoglSDLDef)"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
@ -339,7 +339,7 @@ $(PreBuildCmd)
/> />
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
CommandLine="$(GenerateCoglDef)" CommandLine="$(GenerateCoglSDLDef)"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
@ -370,6 +370,12 @@ $(PreBuildCmd)
<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration> <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
</File> </File>
<File RelativePath="..\..\..\cogl\cogl-sdl.c" >
<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
</File>
<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" >

7
build/win32/vs9/cogl.vsprops
View File

@ -185,6 +185,13 @@ copy ..\..\..\tests\data\valgrind.suppressions $(OutDir)\share\cogl-$(CoglApiVer
cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT ..\..\..\cogl\cogl.symbols &gt;&gt; ..\..\..\cogl\cogl.def&#x0D;&#x0A; cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT ..\..\..\cogl\cogl.symbols &gt;&gt; ..\..\..\cogl\cogl.def&#x0D;&#x0A;
" "
/> />
<UserMacro
Name="GenerateCoglSDLDef"
Value="
echo EXPORTS &gt; ..\..\..\cogl\cogl.def&#x0D;&#x0A;
cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT ..\..\..\cogl\cogl.symbols &gt;&gt; ..\..\..\cogl\cogl.def&#x0D;&#x0A;
"
/>
<UserMacro <UserMacro
Name="GenerateCoglPangoDef" Name="GenerateCoglPangoDef"
Value=" Value="