Changeset 1485


Ignore:
Timestamp:
Jun 17, 2012, 12:09:06 AM (7 years ago)
Author:
sam
Message:

build: MinGW compilation fixes, rename libcaca.lib to caca.lib so that
g++ understands -lcaca directly; also add -DCACA_STATIC to the default flags.

Location:
trunk
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/build/lol-build

    r1464 r1485  
    3333__init__()
    3434{
    35     top_srcdir=$(dirname "$0")/..
    36     cd $top_srcdir
     35    top_srcdir="$(dirname "$0")/.."
     36    cd "$top_srcdir"
    3737    top_srcdir="`pwd`"
    3838
     
    4747bootstrap()
    4848{
    49     cd $top_srcdir
     49    cd "$top_srcdir"
    5050    case "$platform" in
    5151        ios-arm)
     
    6363configure()
    6464{
    65     cd $top_srcdir
     65    cd "$top_srcdir"
    6666    case "$platform" in
    6767        windows-i386)
     
    153153            GTK_LIBS="$GTK_LIBS -lglib-2.0 -lgthread-2.0 -lgobject-2.0"
    154154
    155             CPPFLAGS="$CPPFLAGS -L$PWD/contrib/libcaca-0.99.beta18/include"
     155            CPPFLAGS="$CPPFLAGS -L$PWD/contrib/libcaca-0.99.beta18/include -DCACA_STATIC"
    156156
    157157            PATH="$PATH" PKG_CONFIG_PATH="$PKG_CONFIG_PATH" ./configure $HOSTFLAGS $BUILDFLAGS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" GTK_LIBS="$GTK_LIBS"
     
    165165build()
    166166{
    167     cd $top_srcdir
     167    cd "$top_srcdir"
    168168    case "$platform" in
    169169        ios-arm)
     
    184184check()
    185185{
    186     cd $top_srcdir
     186    cd "$top_srcdir"
    187187    case "$platform" in
    188188        ios-arm)
     
    215215clean()
    216216{
    217     cd $top_srcdir
     217    cd "$top_srcdir"
    218218    case "$platform" in
    219219        ios-arm)
  • trunk/configure.ac

    r1449 r1485  
    115115
    116116dnl Are we on a Direct3D 9 platform?
    117 ac_cv_my_have_d3d9="no"
    118 AC_CHECK_HEADERS(d3d9.h, [ac_cv_my_have_d3d9="yes"])
    119 if test "${ac_cv_my_have_d3d9}" != "no"; then
    120   D3D_LIBS="${D3D_LIBS} -ld3d9 -ld3dx9 -lxinput"
    121   AC_DEFINE(USE_D3D9, 1, Define to 1 to use DirectX 9)
    122 fi
    123 AM_CONDITIONAL(USE_D3D9, test "${ac_cv_my_have_d3d9}" != "no")
     117#ac_cv_my_have_d3d9="no"
     118#AC_CHECK_HEADERS(d3d9.h, [ac_cv_my_have_d3d9="yes"])
     119#if test "${ac_cv_my_have_d3d9}" != "no"; then
     120#  D3D_LIBS="${D3D_LIBS} -ld3d9 -ld3dx9 -lxinput"
     121#  AC_DEFINE(USE_D3D9, 1, Define to 1 to use DirectX 9)
     122#fi
     123#AM_CONDITIONAL(USE_D3D9, test "${ac_cv_my_have_d3d9}" != "no")
    124124
    125125
  • trunk/neercs/Makefile.am

    r1479 r1485  
    1111    video/postfx.lolfx video/radial.lolfx video/simple.lolfx \
    1212    video/text.lolfx
    13 neercs_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
     13neercs_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@ @CACA_CFLAGS@
    1414neercs_LDADD =
    1515neercs_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@ @CACA_LIBS@
  • trunk/win32/Lol.Core.Vars.props

    r1465 r1485  
    3232    <CacaLibs Condition="'$(Platform)'=='Win32'">$(CacaDir)\lib\i686-w64-mingw32</CacaLibs>
    3333    <CacaLibs Condition="'$(Platform)'=='x64'">$(CacaDir)\lib\x86_64-w64-mingw32</CacaLibs>
    34     <CacaDeps>libcaca.lib</CacaDeps>
     34    <CacaDeps>caca.lib</CacaDeps>
    3535    <Win32Defines>CACA_STATIC;$(Win32Defines)</Win32Defines>
    3636
Note: See TracChangeset for help on using the changeset viewer.