From 07449fce39d6c2fdcd66e6dd0ecd3c960b45e3c5 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Wed, 13 Jun 2012 11:36:00 +0000
Subject: [PATCH] build: add a new libcaca Windows build and add the proper
 MSBuild rules to link with it.

---
 win32/Lol.Core.Vars.props | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/win32/Lol.Core.Vars.props b/win32/Lol.Core.Vars.props
index dfad59d8..5e426898 100644
--- a/win32/Lol.Core.Vars.props
+++ b/win32/Lol.Core.Vars.props
@@ -17,6 +17,7 @@
     <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-w64-mingw32</SdlLibs>
     <SdlDeps Condition="'$(Platform)'=='Win32'">SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
     <SdlDeps Condition="'$(Platform)'=='x64'">libSDL.a;libSDLmain.a</SdlDeps>
+    <Win32Defines>HAVE_SDL_H;USE_SDL;$(Win32Defines)</Win32Defines>
 
     <!-- GTK+ & GtkGl -->
     <GtkDir>$(ContribDir)\gtk-2.22.1</GtkDir>
@@ -25,8 +26,17 @@
     <GtkLibs>$(GtkDir)\lib;$(GtkDir)\bin;$(GtkGlDir)\lib</GtkLibs>
     <GtkDeps>gobject-2.0.lib;gthread-2.0.lib;glib-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;gtkgl-2.0.lib</GtkDeps>
 
+    <!-- libcaca -->
+    <CacaDir>$(ContribDir)\libcaca-0.99.beta18</CacaDir>
+    <CacaIncludes>$(CacaDir)\include</CacaIncludes>
+    <CacaLibs Condition="'$(Platform)'=='Win32'">$(CacaDir)\lib\i686-w64-mingw32</CacaLibs>
+    <CacaLibs Condition="'$(Platform)'=='x64'">$(CacaDir)\lib\x86_64-w64-mingw32</CacaLibs>
+    <CacaDeps>libcaca.lib</CacaDeps>
+    <Win32Defines>CACA_STATIC;$(Win32Defines)</Win32Defines>
+
     <!-- GDI+ -->
     <GdiDeps>Gdiplus.lib</GdiDeps>
+    <Win32Defines>USE_GDIPLUS;$(Win32Defines)</Win32Defines>
 
     <!-- OpenGL & GLEW -->
     <GlewDir>$(ContribDir)\glew-1.7.0</GlewDir>
@@ -34,6 +44,7 @@
     <GlLibs Condition="'$(Platform)'=='Win32'">$(GlewDir)\lib\i686-w64-mingw32</GlLibs>
     <GlLibs Condition="'$(Platform)'=='x64'">$(GlewDir)\lib\x86_64-w64-mingw32</GlLibs>
     <GlDeps>opengl32.lib;glew32.lib</GlDeps>
+    <Win32Defines Condition="'$(UseOpenGL)'=='true'">HAVE_GL_2X;USE_GLEW;GLEW_STATIC;$(Win32Defines)</Win32Defines>
 
     <!-- Direct3D 9 -->
     <D3d9Includes>$(DXSDK_DIR)\Include</D3d9Includes>
@@ -41,9 +52,8 @@
     <D3d9Libs Condition="'$(Platform)'=='x64'">$(DXSDK_DIR)\Lib\x64</D3d9Libs>
     <D3d9Deps Condition="'$(Configuration)'=='Release'">d3d9.lib;d3dx9.lib;xinput.lib</D3d9Deps>
     <D3d9Deps Condition="'$(Configuration)'=='Debug'">d3d9.lib;d3dx9d.lib;xinput.lib</D3d9Deps>
+    <Win32Defines Condition="'$(UseOpenGL)'=='false'">USE_D3D9;$(Win32Defines)</Win32Defines>
 
-    <Win32Defines Condition="'$(UseOpenGL)'=='true'">HAVE_SDL_H;USE_SDL;USE_GDIPLUS;HAVE_GL_2X;USE_GLEW;GLEW_STATIC</Win32Defines>
-    <Win32Defines Condition="'$(UseOpenGL)'=='false'">HAVE_SDL_H;USE_SDL;USE_GDIPLUS;USE_D3D9</Win32Defines>
     <XboxDefines></XboxDefines>
   </PropertyGroup>
   <PropertyGroup />
@@ -63,6 +73,10 @@
     <BuildMacro Include="GtkIncludes"><Value>$(GtkIncludes)</Value></BuildMacro>
     <BuildMacro Include="GtkLibs"><Value>$(GtkLibs)</Value></BuildMacro>
     <BuildMacro Include="GtkDeps"><Value>$(GtkDeps)</Value></BuildMacro>
+    <BuildMacro Include="CacaDir"><Value>$(CacaDir)</Value></BuildMacro>
+    <BuildMacro Include="CacaIncludes"><Value>$(CacaIncludes)</Value></BuildMacro>
+    <BuildMacro Include="CacaLibs"><Value>$(CacaLibs)</Value></BuildMacro>
+    <BuildMacro Include="CacaDeps"><Value>$(CacaDeps)</Value></BuildMacro>
     <BuildMacro Include="GdiDeps"><Value>$(GdiDeps)</Value></BuildMacro>
     <BuildMacro Include="GlewDir"><Value>$(GlewDir)</Value></BuildMacro>
     <BuildMacro Include="GlIncludes"><Value>$(GlIncludes)</Value></BuildMacro>