Changeset 990 for ttyvaders


Ignore:
Timestamp:
May 26, 2006, 9:03:21 AM (14 years ago)
Author:
Sam Hocevar
Message:
  • Totally restarted the project. This is just a test.
Location:
ttyvaders/trunk
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • ttyvaders/trunk/configure.ac

    r365 r990  
    1515
    1616dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
    17 dnl now otherwise it might be set in an obscure if statement.
    18 AC_EGREP_CPP(foo,foo)
     17dnl now otherwise it might be set in an obscure if statement. Same thing for
     18dnl PKG_PROG_PKG_CONFIG which needs to be called first.
     19AC_EGREP_CPP(yes, foo)
     20PKG_PROG_PKG_CONFIG()
    1921
    20 AC_MSG_CHECKING(for libcaca support)
    21 video_caca=no
    22 AC_TRY_COMPILE([
    23   #include <caca.h>
    24 ],[ ],[video_caca=yes])
    25 AC_MSG_RESULT($video_caca)
    26 if test "$video_caca" = "yes"; then
    27   CACA_CFLAGS="${CFLAGS} `caca-config --cflags`"
    28   CACA_LIBS="${LIBS} `caca-config --libs`"
    29   AC_SUBST(CACA_CFLAGS)
    30   AC_SUBST(CACA_LIBS)
    31 else
    32   AC_MSG_ERROR([cannot find libcaca])
     22dnl Don't let pkg-config fuck our cross-compilation environment
     23m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
     24if test "$build" != "$host" -a "${PKG_CONFIG_LIBDIR}" = ""; then
     25  export PKG_CONFIG_LIBDIR=/dev/null
    3326fi
     27
     28CACA="no"
     29PKG_CHECK_MODULES(caca, caca,
     30 [CACA="yes"],
     31 [AC_MSG_RESULT(no)
     32  AC_MSG_ERROR([you need libcaca version 0.99 or later])])
    3433
    3534# Optimizations
  • ttyvaders/trunk/src/Makefile.am

    r365 r990  
    66
    77ttyvaders_SOURCES = \
    8         aliens.c \
    9         bonus.c \
    10         box.c \
    11         ceo.c \
    12         collide.c \
    13         common.h \
    14         explosions.c \
    15         intro.c \
    16         main.c \
    17         overlay.c \
    18         player.c \
    19         starfield.c \
    20         tunnel.c \
    21         weapons.c \
     8        ttyvaders.c \
     9        ground.c \
    2210        $(NULL)
    23 ttyvaders_CFLAGS = @CACA_CFLAGS@
    24 ttyvaders_LDADD = @CACA_LIBS@ -lm
     11ttyvaders_CFLAGS = `pkg-config --cflags caca`
     12ttyvaders_LDFLAGS = `pkg-config --libs caca` -lm
    2513
Note: See TracChangeset for help on using the changeset viewer.