Changeset 1465


Ignore:
Timestamp:
Jun 13, 2012, 1:36:00 PM (7 years ago)
Author:
sam
Message:

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

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/contrib/libcaca-0.99.beta18/include/caca.h

    r1464 r1465  
    3232#elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT
    3333#   define __extern extern __declspec(dllexport)
    34 #elif defined _WIN32 && !defined __LIBCACA__
     34#elif defined _WIN32 && !defined __LIBCACA__ && !defined CACA_STATIC
    3535#   define __extern extern __declspec(dllimport)
    3636#else
  • trunk/neercs/neercs.vcxproj

    r1457 r1465  
    6363  <PropertyGroup Label="UserMacros" />
    6464  <Import Project="$(SolutionDir)\Lol.Core.Rules.props" />
    65   <ItemDefinitionGroup />
     65  <ItemDefinitionGroup>
     66    <ClCompile>
     67      <AdditionalIncludeDirectories>$(CacaIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     68    </ClCompile>
     69    <Link>
     70      <AdditionalDependencies>$(CacaDeps);%(AdditionalDependencies)</AdditionalDependencies>
     71      <AdditionalLibraryDirectories>$(CacaLibs);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     72    </Link>
     73  </ItemDefinitionGroup>
    6674  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    6775  <ImportGroup Label="ExtensionTargets">
  • trunk/win32/Lol.Core.Vars.props

    r1451 r1465  
    1818    <SdlDeps Condition="'$(Platform)'=='Win32'">SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
    1919    <SdlDeps Condition="'$(Platform)'=='x64'">libSDL.a;libSDLmain.a</SdlDeps>
     20    <Win32Defines>HAVE_SDL_H;USE_SDL;$(Win32Defines)</Win32Defines>
    2021
    2122    <!-- GTK+ & GtkGl -->
     
    2627    <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>
    2728
     29    <!-- libcaca -->
     30    <CacaDir>$(ContribDir)\libcaca-0.99.beta18</CacaDir>
     31    <CacaIncludes>$(CacaDir)\include</CacaIncludes>
     32    <CacaLibs Condition="'$(Platform)'=='Win32'">$(CacaDir)\lib\i686-w64-mingw32</CacaLibs>
     33    <CacaLibs Condition="'$(Platform)'=='x64'">$(CacaDir)\lib\x86_64-w64-mingw32</CacaLibs>
     34    <CacaDeps>libcaca.lib</CacaDeps>
     35    <Win32Defines>CACA_STATIC;$(Win32Defines)</Win32Defines>
     36
    2837    <!-- GDI+ -->
    2938    <GdiDeps>Gdiplus.lib</GdiDeps>
     39    <Win32Defines>USE_GDIPLUS;$(Win32Defines)</Win32Defines>
    3040
    3141    <!-- OpenGL & GLEW -->
     
    3545    <GlLibs Condition="'$(Platform)'=='x64'">$(GlewDir)\lib\x86_64-w64-mingw32</GlLibs>
    3646    <GlDeps>opengl32.lib;glew32.lib</GlDeps>
     47    <Win32Defines Condition="'$(UseOpenGL)'=='true'">HAVE_GL_2X;USE_GLEW;GLEW_STATIC;$(Win32Defines)</Win32Defines>
    3748
    3849    <!-- Direct3D 9 -->
     
    4253    <D3d9Deps Condition="'$(Configuration)'=='Release'">d3d9.lib;d3dx9.lib;xinput.lib</D3d9Deps>
    4354    <D3d9Deps Condition="'$(Configuration)'=='Debug'">d3d9.lib;d3dx9d.lib;xinput.lib</D3d9Deps>
     55    <Win32Defines Condition="'$(UseOpenGL)'=='false'">USE_D3D9;$(Win32Defines)</Win32Defines>
    4456
    45     <Win32Defines Condition="'$(UseOpenGL)'=='true'">HAVE_SDL_H;USE_SDL;USE_GDIPLUS;HAVE_GL_2X;USE_GLEW;GLEW_STATIC</Win32Defines>
    46     <Win32Defines Condition="'$(UseOpenGL)'=='false'">HAVE_SDL_H;USE_SDL;USE_GDIPLUS;USE_D3D9</Win32Defines>
    4757    <XboxDefines></XboxDefines>
    4858  </PropertyGroup>
     
    6474    <BuildMacro Include="GtkLibs"><Value>$(GtkLibs)</Value></BuildMacro>
    6575    <BuildMacro Include="GtkDeps"><Value>$(GtkDeps)</Value></BuildMacro>
     76    <BuildMacro Include="CacaDir"><Value>$(CacaDir)</Value></BuildMacro>
     77    <BuildMacro Include="CacaIncludes"><Value>$(CacaIncludes)</Value></BuildMacro>
     78    <BuildMacro Include="CacaLibs"><Value>$(CacaLibs)</Value></BuildMacro>
     79    <BuildMacro Include="CacaDeps"><Value>$(CacaDeps)</Value></BuildMacro>
    6680    <BuildMacro Include="GdiDeps"><Value>$(GdiDeps)</Value></BuildMacro>
    6781    <BuildMacro Include="GlewDir"><Value>$(GlewDir)</Value></BuildMacro>
Note: See TracChangeset for help on using the changeset viewer.