From cfdc1c95eb92c5c0c280457d0df376a051fbe8b1 Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri, 28 Sep 2012 18:45:41 +0800
Subject: Clean up Visual C++ projects

Since commit 7253c5ca (Bug 682071-cogl/cogl-sdl.h: MSVC: Link to SDL when
apps are built), on Visual C++ we link to SDL.lib and SDLmain.lib using
a #pragma comment directive in cogl/cogl-sdl.h, so we no longer need
specific project configs for Cogl programs which build against a Cogl built
with SDL.  This removes those unneeded configs.

Also "install" cogl/cogl-sdl.h when Cogl is built with the SDL winsys, as
it is a needed header
---
 build/win32/vs10/cogl.props | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'build/win32/vs10/cogl.props')

diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 5a1bcb6d..19c817d5 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -50,7 +50,7 @@ gen-enums.bat $(GlibMkEnumsPath)
 cd .\vs10
 
 
-</PreBuildCmd>
+    </PreBuildCmd>
     <CoglDoInstall>
 mkdir $(CopyDir)
 
@@ -196,7 +196,10 @@ copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(CoglApiVersion
 
 copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
 
-</CoglDoInstall>
+    </CoglDoInstall>
+    <CoglDoInstallSDL>
+copy ..\..\..\cogl\cogl-sdl.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+    </CoglDoInstallSDL>
     <GenerateCoglDef>
          echo EXPORTS &gt; $(DefDir)\cogl.def
 
@@ -288,6 +291,9 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio
     <BuildMacro Include="CoglDoInstall">
       <Value>$(CoglDoInstall)</Value>
     </BuildMacro>
+    <BuildMacro Include="CoglDoInstallSDL">
+      <Value>$(CoglDoInstallSDL)</Value>
+    </BuildMacro>
     <BuildMacro Include="GenerateCoglDef">
       <Value>$(GenerateCoglDef)</Value>
     </BuildMacro>
-- 
cgit v1.2.1