Changeset 178


Ignore:
Timestamp:
Aug 28, 2010, 7:19:14 PM (10 years ago)
Author:
sam
Message:

Proper detection of libcaca and libpipi.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r115 r178  
    6868fi
    6969
    70 if test "${enable_debug}" = "yes"; then
    71   AC_DEFINE(DEBUG, 1, Define to 1 to activate debug)
     70
     71# Use libcaca? (required for font generation)
     72ac_cv_my_have_caca="no"
     73PKG_CHECK_MODULES(CACA, caca >= 0.99.beta17, [ac_cv_my_have_caca="yes"], [:])
     74if test "${ac_cv_my_have_caca}" != "no"; then
     75  AC_DEFINE(USE_CACA, 1, Define to 1 to use libcaca)
    7276fi
     77AM_CONDITIONAL(USE_CACA, test "${ac_cv_my_have_caca}" != "no")
     78
     79
     80# Use libpipi? (required for video recording)
     81ac_cv_my_have_pipi="no"
     82PKG_CHECK_MODULES(PIPI, pipi, [ac_cv_my_have_pipi="yes"], [:])
     83if test "${ac_cv_my_have_pipi}" != "no"; then
     84  AC_DEFINE(USE_PIPI, 1, Define to 1 to use libpipi)
     85fi
     86AM_CONDITIONAL(USE_PIPI, test "${ac_cv_my_have_pipi}" != "no")
     87
    7388
    7489if test "${enable_release}" = "yes"; then
  • trunk/gfx/font/Makefile.am

    r92 r178  
    11
     2if USE_CACA
    23all: ascii.png
    34
     
    78clean:
    89        rm -f ascii.png
     10endif
    911
  • trunk/src/Makefile.am

    r162 r178  
    1515
    1616test_map_SOURCES = test-map.cpp sdlinput.cpp sdlinput.h
    17 test_map_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`
     17test_map_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image` @PIPI_CFLAGS@
    1818test_map_LDADD = libcommon.a
    19 test_map_LDFLAGS = `pkg-config --libs sdl gl SDL_image` -lpipi
     19test_map_LDFLAGS = `pkg-config --libs sdl gl SDL_image` @PIPI_LIBS@
    2020
    2121editor_SOURCES = gtk/editor.cpp gtk/glmapview.cpp gtk/glmapview.h
  • trunk/src/debugrecord.cpp

    r171 r178  
    1111#include <cstring>
    1212
    13 #if defined HAVE_PIPI_H
     13#if defined USE_PIPI
    1414#   include <pipi.h>
    1515#endif
     
    2929    char const *path;
    3030    int width, height;
    31 #if defined HAVE_PIPI_H
     31#if defined USE_PIPI
    3232    pipi_sequence_t *sequence;
    3333#endif
     
    4444    data->width = 0;
    4545    data->height = 0;
    46 #if defined HAVE_PIPI_H
     46#if defined USE_PIPI
    4747    data->sequence = NULL;
    4848#endif
     
    7171        data->height = height;
    7272
    73 #if defined HAVE_PIPI_H
     73#if defined USE_PIPI
    7474        if (data->sequence)
    7575            pipi_close_sequence(data->sequence);
     
    7979    }
    8080
    81 #if defined HAVE_PIPI_H
     81#if defined USE_PIPI
    8282    if (data->sequence)
    8383    {
  • trunk/tools/Makefile.am

    r97 r178  
    11
    2 noinst_PROGRAMS = make-font
     2noinst_PROGRAMS = $(make_font)
    33
    44make_font_SOURCES = make-font.cpp
    5 make_font_CXXFLAGS = `pkg-config --cflags caca`
    6 make_font_LDFLAGS = `pkg-config --libs caca`
     5make_font_CXXFLAGS = @CACA_CFLAGS@
     6make_font_LDFLAGS = @CACA_LIBS@
    77
     8if USE_CACA
     9make_font = make-font
     10endif
     11
Note: See TracChangeset for help on using the changeset viewer.