diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props index 9497f2776..981f5487d 100644 --- a/build/win32/vs10/cogl.props +++ b/build/win32/vs10/cogl.props @@ -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 + </GenerateCoglDef> + <GenerateCoglSDLDef> + echo EXPORTS > ..\..\..\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 >> ..\..\..\cogl\cogl.def + </GenerateCoglDef> <GenerateCoglPangoDef> echo EXPORTS > ..\..\..\cogl-pango\cogl-pango.def @@ -272,6 +278,9 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio <BuildMacro Include="GenerateCoglDef"> <Value>$(GenerateCoglDef)</Value> </BuildMacro> + <BuildMacro Include="GenerateCoglSDLDef"> + <Value>$(GenerateCoglDef)</Value> + </BuildMacro> <BuildMacro Include="GenerateCoglPangoDef"> <Value>$(GenerateCoglPangoDef)</Value> </BuildMacro> @@ -294,4 +303,4 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio <Value>$(CoglDllSuffix)</Value> </BuildMacro> </ItemGroup> -</Project> \ No newline at end of file +</Project> diff --git a/build/win32/vs10/cogl.vcxproj.filtersin b/build/win32/vs10/cogl.vcxproj.filtersin index cb77de19f..3541a7f91 100644 --- a/build/win32/vs10/cogl.vcxproj.filtersin +++ b/build/win32/vs10/cogl.vcxproj.filtersin @@ -15,8 +15,9 @@ </ItemGroup> <ItemGroup> <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\cogl-win32-renderer.c"><Filter>Sources</Filter></ClCompile> + <ClCompile Include="..\..\..\cogl\winsys\cogl-winsys-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> #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> diff --git a/build/win32/vs10/cogl.vcxprojin b/build/win32/vs10/cogl.vcxprojin index 0ead8549b..a541d617b 100644 --- a/build/win32/vs10/cogl.vcxprojin +++ b/build/win32/vs10/cogl.vcxprojin @@ -176,7 +176,7 @@ <DebugInformationFormat>EditAndContinue</DebugInformationFormat> </ClCompile> <PreLinkEvent> - <Command>$(GenerateCoglDef)</Command> + <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> @@ -240,7 +240,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <PreLinkEvent> - <Command>$(GenerateCoglDef)</Command> + <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> @@ -306,7 +306,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <PreLinkEvent> - <Command>$(GenerateCoglDef)</Command> + <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> @@ -368,7 +368,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <PreLinkEvent> - <Command>$(GenerateCoglDef)</Command> + <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> @@ -390,6 +390,12 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> </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" /> #include "cogl.vs10.sourcefiles" <ClCompile Include="..\..\..\cogl\driver\gl\cogl-gl.c" /> diff --git a/build/win32/vs9/cogl.vcprojin b/build/win32/vs9/cogl.vcprojin index 8a8cb8271..e924f7024 100644 --- a/build/win32/vs9/cogl.vcprojin +++ b/build/win32/vs9/cogl.vcprojin @@ -88,7 +88,7 @@ $(PreBuildCmd) /> <Tool Name="VCPreLinkEventTool" - CommandLine="$(GenerateCoglDef)" + CommandLine="$(GenerateCoglSDLDef)" /> <Tool Name="VCLinkerTool" @@ -171,7 +171,7 @@ $(PreBuildCmd) /> <Tool Name="VCPreLinkEventTool" - CommandLine="$(GenerateCoglDef)" + CommandLine="$(GenerateCoglSDLDef)" /> <Tool Name="VCLinkerTool" @@ -258,7 +258,7 @@ $(PreBuildCmd) /> <Tool Name="VCPreLinkEventTool" - CommandLine="$(GenerateCoglDef)" + CommandLine="$(GenerateCoglSDLDef)" /> <Tool Name="VCLinkerTool" @@ -339,7 +339,7 @@ $(PreBuildCmd) /> <Tool Name="VCPreLinkEventTool" - CommandLine="$(GenerateCoglDef)" + CommandLine="$(GenerateCoglSDLDef)" /> <Tool Name="VCLinkerTool" @@ -370,6 +370,12 @@ $(PreBuildCmd) <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-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" /> #include "cogl.sourcefiles" <Filter Name="Driver_GL" > diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops index ef4de04f5..bc6aa6329 100644 --- a/build/win32/vs9/cogl.vsprops +++ b/build/win32/vs9/cogl.vsprops @@ -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 >> ..\..\..\cogl\cogl.def
 " /> + <UserMacro + Name="GenerateCoglSDLDef" + Value=" + echo EXPORTS > ..\..\..\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 >> ..\..\..\cogl\cogl.def
 + " + /> <UserMacro Name="GenerateCoglPangoDef" Value="