Changeset 1465 for trunk/win32/Lol.Core.Vars.propsTweet

Timestamp:

Jun 13, 2012, 1:36:00 PM (9 years ago)

Author:

sam

Message:

build: add a new libcaca Windows build and add the proper MSBuild rules
to link with it.

File:

• trunk/win32/Lol.Core.Vars.props (modified) (5 diffs)

trunk/win32/Lol.Core.Vars.props

@@ -18 +18 @@
     <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 -->
@@ -26 +27 @@
     <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 -->
@@ -35 +45 @@
     <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 -->
@@ -42 +53 @@
     <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>
@@ -64 +74 @@
     <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>