From b7a916e2b1b1ff2175ecd96eef87c5a293c54ff6 Mon Sep 17 00:00:00 2001 From: stpohle Date: Fri, 23 May 2003 21:17:27 +0000 Subject: [PATCH] Configure.in fixed for crosscompiling --- Makefile.am | 4 +++- bomberclone.prj | 4 +++- configure.in | 12 ++++++++---- src/single.c | 4 ++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index c306e35..1f4a523 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ ## If you don't want it to overwrite it, ## Please disable it in the Anjuta project configuration -SUBDIRS = src +SUBDIRS = src bomberclonedocdir = ${prefix}/doc/bomberclone bomberclonedoc_DATA = \ @@ -17,6 +17,8 @@ bomberclonedoc_DATA = \ EXTRA_DIST = bomberclone.prj $(bomberclonedoc_DATA) + + # Copy all the spec files. Of cource, only one is actually used. dist-hook: for specfile in *.spec; do \ diff --git a/bomberclone.prj b/bomberclone.prj index 318fbe7..36008d9 100644 --- a/bomberclone.prj +++ b/bomberclone.prj @@ -19,12 +19,14 @@ dnl Check for SDL case "$target" in - *-*-cygwin* | *-*-mingw32*) + *cygwin* | *mingw32* | *mingw32msvc* ) CFLAGS="$CFLAGS" LIBS="$LIBS -liberty -lwsock32" ;; esac CFLAGS="$CFLAGS -Wall" + +echo "T $target H $host B $buid" >cross-target.txt diff --git a/configure.in b/configure.in index 5cafd70..fb25f87 100644 --- a/configure.in +++ b/configure.in @@ -7,12 +7,17 @@ AC_INIT(configure.in) AM_INIT_AUTOMAKE(bomberclone, 0.9.9) AM_CONFIG_HEADER(config.h) +AC_CANONICAL_HOST +AC_CANONICAL_TARGET + AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_STDC AC_HEADER_STDC dnl Checks for programs. + + dnl Checks for libraries. dnl Check for SDL AM_PATH_SDL(1.1.0, @@ -25,9 +30,11 @@ dnl Check for SDL dnl Checks for header files. + + dnl Checks for typedefs, structures, and compiler characteristics. case "$target" in - *-*-cygwin* | *-*-mingw32*) + *cygwin* | *mingw32* | *mingw32msvc* ) CFLAGS="$CFLAGS" LIBS="$LIBS -liberty -lwsock32" ;; @@ -35,9 +42,6 @@ esac CFLAGS="$CFLAGS -Wall" -dnl Checks for library functions. -dnl Checks for Additional stuffs. - dnl Set PACKAGE SOURCE DIR in config.h. packagesrcdir=`cd $srcdir && pwd` diff --git a/src/single.c b/src/single.c index 3678f4b..59d6767 100644 --- a/src/single.c +++ b/src/single.c @@ -1,4 +1,4 @@ -/* $Id: single.c,v 1.15 2003/05/17 17:11:27 stpohle Exp $ */ +/* $Id: single.c,v 1.16 2003/05/23 21:17:30 stpohle Exp $ */ /* single player */ #include "basic.h" @@ -53,7 +53,7 @@ single_game_new () } bman.players[bman.p_nr].state = PSFM_alife; - player_set_gfx (&bman.players[bman.p_nr], 0); + player_set_gfx (&bman.players[bman.p_nr], 5); bman.last_ex_nr = 1; init_map_tileset ();