Changeset 990Tweet

Timestamp:

May 26, 2006, 9:03:21 AM (17 years ago)

Author:

Sam Hocevar

Message:

• Totally restarted the project. This is just a test.

Location:

ttyvaders/trunk

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/ground.c (added)
• src/ttyvaders.c (added)

ttyvaders/trunk/configure.ac

@@ -15 +15 @@
 
 dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
-dnl now otherwise it might be set in an obscure if statement.
-AC_EGREP_CPP(foo,foo)
+dnl now otherwise it might be set in an obscure if statement. Same thing for
+dnl PKG_PROG_PKG_CONFIG which needs to be called first.
+AC_EGREP_CPP(yes, foo)
+PKG_PROG_PKG_CONFIG()
 
-AC_MSG_CHECKING(for libcaca support)
-video_caca=no
-AC_TRY_COMPILE([
-  #include <caca.h>
-],[ ],[video_caca=yes])
-AC_MSG_RESULT($video_caca)
-if test "$video_caca" = "yes"; then
-  CACA_CFLAGS="${CFLAGS} `caca-config --cflags`"
-  CACA_LIBS="${LIBS} `caca-config --libs`"
-  AC_SUBST(CACA_CFLAGS)
-  AC_SUBST(CACA_LIBS)
-else
-  AC_MSG_ERROR([cannot find libcaca])
+dnl Don't let pkg-config fuck our cross-compilation environment
+m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+if test "$build" != "$host" -a "${PKG_CONFIG_LIBDIR}" = ""; then
+  export PKG_CONFIG_LIBDIR=/dev/null
 fi
+
+CACA="no"
+PKG_CHECK_MODULES(caca, caca,
+ [CACA="yes"],
+ [AC_MSG_RESULT(no)
+  AC_MSG_ERROR([you need libcaca version 0.99 or later])])
 
 # Optimizations

ttyvaders/trunk/src/Makefile.am

@@ -6 +6 @@
 
 ttyvaders_SOURCES = \
-        aliens.c \
-        bonus.c \
-        box.c \
-        ceo.c \
-        collide.c \
-        common.h \
-        explosions.c \
-        intro.c \
-        main.c \
-        overlay.c \
-        player.c \
-        starfield.c \
-        tunnel.c \
-        weapons.c \
+        ttyvaders.c \
+        ground.c \
         $(NULL)
-ttyvaders_CFLAGS = @CACA_CFLAGS@
-ttyvaders_LDADD = @CACA_LIBS@ -lm
+ttyvaders_CFLAGS = `pkg-config --cflags caca`
+ttyvaders_LDFLAGS = `pkg-config --libs caca` -lm