Commit 72476f6f authored by Martin Erik Werner's avatar Martin Erik Werner

Imported Upstream version 0.5

parent d3da9327
lierolibre, the gvl library, and the data helper scripts are released under the
BDS-2-Clause License
BDS-2-Clause License.
The original graphics for Liero, the new replacement sounds, and the
configuration variables extracted from the original game are released under
the WTFPL license. Note that the old freeware license in data/LIERO(ENG).TXT
the WTFPL License. Note that the old freeware license in data/LIERO(ENG).TXT
and the information about the old LIERO.EXE and LIERO.SND in data/LICENSE.TXT
no longer applies.
The filesystem code and the lfs header originates from Boost and is licensed
under the Boost Software License 1.0 and under the BSD-2-Clause License.
The type_info header is licensed under the Boost Software License 1.0, and
is included in the gvl library.
The SDL m4 script is LGPLv2.1+.
The autotools content is in part licensed under the BSD-2-Clause license of
The autotools content is in part licensed under the BSD-2-Clause License of
lierolibre, and also under various custom permissive free software licenses.
The content under the BSD-2-Clause license falls under the GPL-2+ if used
outside of lierolibre.
......@@ -40,17 +44,30 @@ Copyright: 1998-1999 Joosa Reikkinen "Mets„nEl„imet"
2012, Martin Erik Werner <martinerikwerner@gmail.com>
License: WTFPL and BSD-2-Clause
Files: src/boostTesting.cpp src/configHelper.* src/configInit.* src/dataPath.*
src/to_string.*
Files: src/argParse.* src/boostTesting.cpp src/configCompat.cpp
src/configHelper.* src/configInit.* src/dataPath.* src/to_string.*
Copyright: 2012, Martin Erik Werner <martinerikwerner@gmail.com>
License: BSD-2-Clause
Files: src/console.* src/exactObjectList.hpp src/fastObjectList.hpp src/lfs.hpp
src/rand.* src/rect.hpp src/sdlmain.cpp src/sfx.* src/sobject.* src/sys.*
Files: src/console.* src/exactObjectList.hpp src/fastObjectList.hpp src/rand.*
src/rect.hpp src/sdlmain.cpp src/sfx.* src/sobject.* src/sys.*
src/text.* src/_build/*
Copyright: 2007-2010, Erik Lindroos <gliptic@gmail.com>
License: BSD-2-Clause
Files: src/filesystem.hpp
Copyright: 2001, Dietmar Kühl
2002, Jan Langer
2002-2003, Beman Dawes
2007-2010, Erik Lindroos
2010, "basro"
License: BSL-1.0 and BSD-2-Clause
Files: src/filesystem.cpp
Copyright: 2002, Jens Maurer
2007-2010, Erik Lindroos
License: BSL-1.0 and BSD-2-Clause
Files: src/binReader.* src/constants.* src/main.cpp src/math.* src/reader.*
Copyright: 2007-2010, Erik Lindroos <gliptic@gmail.com>
2012, Martin Erik Werner <martinerikwerner@gmail.com>
......@@ -66,10 +83,11 @@ License: BSD-2-Clause
Files: data/*
Copyright: 1998-1999 Joosa Reikkinen "Mets„nEl„imet"
License: WTFPL
Comment: Note that the old freeware license in data/LIERO(ENG).TXT no longer
applies.
Comment: Note that the old freeware license in data/LIERO(ENG).TXT and the
information about the old LIERO.EXE and LIERO.SND in data/LICENSE.TXT
no longer applies.
Files: data/sounds/*.wav
Files: data/sounds/*.wav data/LIERO.SND
Copyright: 2012, "sea"
License: WTFPL
......
START_HUMAN_READABLE
The included SDL shared library is licensed under LGPLv2.1+. The source code
for this library is located in "libsrc\SDL-1.2.15".
The statically linked libconfig++ library is licensed under LGPLv2.1+. The
source code for this library is located in "libsrc\libconfig-1.4.8".
The included SDL_mixer shared library is licensed under the Zlib license.
The included Zlib shared library is licensed under the Zlib license.
The included boost_program_options shared library is licensed under the BSL-1.0.
The included MS Visual Studio C++ shared libraries are included under the same
license as lierolibre, namely the BSD-2-Clause license.
END_HUMAN_READABLE
START_MACHINE_READABLE
Files: lierolibre.exe
Copyright: 2007-2010, Erik Lindroos <gliptic@gmail.com>
2010, Mario Carbajal "basro"
2012, Martin Erik Werner <martinerikwerner@gmail.com>
2005-2011 Mark A Lindner
License: BSD-2-Clause
Comment: The LGPL-2.1+ libconfig++ library is statically linked into this binary.
Files: data/lierocfg.txt
Copyright: 1998-1999 Joosa Reikkinen "Mets„nEl„imet"
2012 Martin Erik Werner <martinerikwerner@gmail.com>
License: WTFPL
Files: NEWS.txt
Copyright: 1998-1999 Joosa Reikkinen "Mets„nEl„imet"
2007-2010, Erik Lindroos <gliptic@gmail.com>
2012, Martin Erik Werner <martinerikwerner@gmail.com>
License: WTFPL and BSD-2-Clause
Files: SDL.dll libsrc/SDL-1.2.15/*
Copyright: 1997-2012 Sam Lantinga
License: LGPL-2.1+
Files: libsrc/libconfig-1.4.8/*
Copyright: 2005-2011 Mark A Lindner
License: LGPL-2.1+
Files: SDL_mixer.dll
Copyright: 1997-2012 Sam Lantinga
License: Zlib
Files: boost_program_options.dll
Copyright: Various Boost authors
License: BSL-1.0
END_MACHINE_READABLE
This diff is collapsed.
......@@ -12,11 +12,11 @@ NIXBIN_DIRNAME = $(PACKAGE_DIRNAME)_linux-$(build_cpu)
pkglibexec_PROGRAMS = lierolibre
# It seems it only includes src/../ by default
lierolibre_CPPFLAGS = $(GVL_CPPFLAGS) $(SDL_CPPFLAGS) -I$(srcdir)/src
lierolibre_CPPFLAGS = $(LIBCONFIGXX_CPPFLAGS) $(GVL_CPPFLAGS) $(SDL_CPPFLAGS) -I$(srcdir)/src $(WINDOWS_CPPFLAGS)
lierolibre_CFLAGS = $(LIBCONFIGXX_CFLAGS) $(SDL_MIXER_CFLAGS) $(SDL_CFLAGS) $(RELPATH_CFLAGS)
lierolibre_CXXFLAGS = $(SDL_CXXFLAGS) $(RELPATH_CFLAGS)
lierolibre_LDADD = src/gvl/libgvl.la $(LIBCONFIGXX_LIBS) $(SDL_MIXER_LIBS) $(SDL_LIBS) $(BOOST_PO_LIBS)
lierolibre_LDFLAGS = $(RELPATH_LDFLAGS)
lierolibre_LDFLAGS = $(RELPATH_LDFLAGS) $(WINDOWS_LDFLAGS)
noinst_LTLIBRARIES = src/gvl/libgvl.la
src_gvl_libgvl_la_CFLAGS = $(ZLIB_CFLAGS) $(RELPATH_CFLAGS)
......@@ -41,10 +41,11 @@ dist_bin_SCRIPTS = \
dist_noinst_SCRIPTS = \
autogen.sh \
scripts/cross-compile \
scripts/lierolibre.am \
src/Jamfile \
src/dummy_config.h \
src/gvl/Jamfile \
scripts/lierolibre.am
src/gvl/Jamfile
nodist_man6_MANS = \
man/lierolibre.6 \
......@@ -61,11 +62,8 @@ MANS_TXT = $(nodist_man6_MANS:.6=.txt)
dist_doc_DATA = \
AUTHORS \
ChangeLog \
COPYING \
NEWS \
README \
data/LIERO.TXT \
data/LIEROENG.TXT
README
dist_desktop_DATA = \
data/lierolibre.desktop
......@@ -74,15 +72,13 @@ dist_appicon_DATA = \
data/lierolibre.svg
dist_pkgdata_DATA = \
data/LIERO.CHR \
data/LIERO.DAT \
data/LIERO.OPT \
data/LIERO.SND \
data/NAMES.DAT \
data/liero.cfg
nodist_pkgdata_DATA = \
data/LIERO.CHR \
data/LIERO.SND
MANPAGES_SOURCES = \
man/lierolibre.6.am \
man/lierolibre-extractgfx.6.am \
......@@ -129,21 +125,34 @@ SOUND_SOURCES = \
data/sounds/SHOTGUN.wav \
data/sounds/THROW.wav
WINDOWS_SOURCES = \
scripts/lierolibre-cmd.bat \
src/gvl/_build/Gvl_C++0x.props \
src/gvl/_build/Gvl_IEEE_SEE2.props \
src/gvl/_build/Gvl_Standard_Config.props \
src/gvl/_build/gvl.vcproj \
src/gvl/_build/gvl.vcxproj \
src/gvl/_build/gvl.vcxproj.filters \
windows/visualC/liero.vcproj \
windows/visualC/liero.vcxproj \
windows/visualC/lierolibre.sln
dist_noinst_DATA = \
$(GRAPHICS_SOURCES) \
$(MANPAGES_SOURCES) \
\
\
$(SOUND_SOURCES) \
$(WINDOWS_SOURCES) \
COPYING \
COPYING_winbin \
README.txt \
README_linuxbin \
data/FILE_ID.DIZ \
data/LICENSE.TXT \
\
\
data/LIERO.TXT \
data/LIEROENG.TXT \
data/lierolibre.xpm \
\
\
$(GRAPHICS_SOURCES) \
\
\
$(SOUND_SOURCES)
data/sounds/sounds.txt \
lgpl-2.1.txt
lierolibre_SOURCES = \
src/binReader.cpp \
......@@ -572,14 +581,17 @@ EXTRA_DIST = \
src/gvl/tut/quickcheck/context.hpp \
src/gvl/tut/quickcheck/generator.hpp \
src/gvl/tut/quickcheck/property.hpp \
src/gvl/tut/quickcheck/quickcheck.hpp
src/gvl/tut/quickcheck/quickcheck.hpp \
\
src/boostTesting.cpp
LIB_ARCH_NIXBIN_LIBFILES = \
lib/libz.so.1 \
lib/libcap.so.2 \
lib/libdbus-1.so.3 \
lib/libtinfo.so.5 \
lib/libwrap.so.0 \
lib/libtinfo.so.5
lib/libz.so.1
USR_LIB_ARCH_NIXBIN_LIBFILES = \
lib/libconfig++.so \
......@@ -597,6 +609,7 @@ USR_LIB_ARCH_NIXBIN_LIBFILES = \
lib/libcaca.so.0 \
lib/libsndfile.so.1 \
lib/libasyncns.so.0 \
lib/libogg.so.0 \
lib/libvorbisenc.so.2 \
lib/libxcb.so.1 \
lib/libX11-xcb.so.1 \
......@@ -604,12 +617,8 @@ USR_LIB_ARCH_NIXBIN_LIBFILES = \
USR_LIB_NIXBIN_LIBFILES = \
lib/libboost_program_options.so \
lib/libogg.so.0 \
lib/libmad.so.0
LIB_NIXBIN_LIBFILES = \
lib/libcap.so.2
USR_LIB_ARCH_PA_NIXBIN_LIBFILES = \
lib/libpulsecommon-2.0.so
......@@ -649,7 +658,79 @@ NIXBIN_LIB_DEBS_NOSRC = \
libxcb1 \
zlib1g
.PHONY: clean-local dist-nixbin-dir dist-nixbin-libsrc dist-nixbin dist-nixbin-xz
WINDOWS_LIBS_A = \
windows/libconfig-1.4.8/lib/.libs/libconfig++.a
WINDOWS_LIBS_DLL = \
windows/SDL-1.2.15/build/.libs/SDL.dll \
windows/SDL_mixer-1.2.12/lib/x86/SDL_mixer.dll \
windows/boost-program_options-1.51.0/stage/lib/libboost_program_options.dll \
windows/zlib-1.2.7/zlib1.dll
WINDOWS_LIBS = $(WINDOWS_LIBS_A) $(WINDOWS_LIBS_DLL)
WINDOWS_TXT = AUTHORS COPYING ChangeLog NEWS
if HAS_WINDOWS_LDFLAGS
EXTRA_lierolibre_DEPENDENCIES = $(WINDOWS_LIBS)
endif
windows/boost-program_options-1.51.0/stage/lib/libboost_program_options.dll:
cd windows/boost-program_options-1.51.0/ ;\
./bootstrap.sh ;\
rm -rf stage ;\
rm -rf bin.v2 ;\
./b2 --user-config=tools/build/v2/user-config_i686-w64-mingw32-gcc.jam toolset=gcc-mingw32 target-os=windows variant=release link=shared -sNO_BZIP2=1 -sNO_ZLIB=1 linkflags='-static-libgcc -static-libstdc++' stage/lib/libboost_program_options.dll stage/lib/libboost_program_options.dll.a
windows/zlib-1.2.7/zlib1.dll:
cd windows/zlib-1.2.7/ && \
make -f win32/Makefile.gcc PREFIX=i686-w64-mingw32-
windows/SDL-1.2.15/build/.libs/SDL.dll:
cd windows/SDL-1.2.15/ && \
./configure --host=i686-w64-mingw32 && \
make LDFLAGS='-static-libgcc -static-libstdc++'
windows/libconfig-1.4.8/lib/.libs/libconfig++.a:
cd windows/libconfig-1.4.8/ && \
./configure --host=i686-w64-mingw32 && \
make LDFLAGS='-static-libgcc -static-libstdc++'
if HAS_WINDOWS_LDFLAGS
dist-hook: lierolibre.exe $(WINDOWS_LIBS)
for i in $(WINDOWS_LIBS_DLL) .libs/lierolibre.exe; do \
$(STRIP) $$i -o $(distdir)/$$(basename $$i); \
chmod +x $(distdir)/$$(basename $$i); done
cp scripts/lierolibre-cmd.bat $(distdir)
cp $(distdir)/data/liero.cfg $(distdir)/data/lierocfg.txt
for i in $(WINDOWS_TXT); do \
cp $(distdir)/$$i $(distdir)/$$i.txt; \
sed 's/$$/ /' -i $(distdir)/$$i.txt; done
mkdir $(distdir)/user
mkdir $(distdir)/libsrc
cp -r windows/SDL-1.2.15/ $(distdir)/libsrc/
cp -r windows/libconfig-1.4.8/ $(distdir)/libsrc/
-make -C $(distdir)/libsrc/SDL-1.2.15/ distclean
-make -C $(distdir)/libsrc/libconfig-1.4.8/ distclean
sed '/no longer applies./r COPYING_winbin' -i $(distdir)/COPYING.txt
sed \
-e '/START_MACHINE_READABLE/,/END_MACHINE_READABLE/d' \
-e '/.*_HUMAN_READABLE/d' \
-i $(distdir)/COPYING.txt
sed '/ separate licenses, and not covered under the BSD-2-Clause license/r COPYING_winbin' -i $(distdir)/COPYING.txt
sed \
-e '/START_HUMAN_READABLE/,/END_HUMAN_READABLE/d' \
-e '/.*_MACHINE_READABLE/d' \
-i $(distdir)/COPYING.txt
else
dist-hook:
endif
cp $(distdir)/src/gvl/_build/Gvl_C++0x.props \
"$(distdir)/src/gvl/_build/Gvl C++0x.props"
cp $(distdir)/src/gvl/_build/Gvl_IEEE_SEE2.props \
"$(distdir)/src/gvl/_build/Gvl IEEE SEE2.props"
cp $(distdir)/src/gvl/_build/Gvl_Standard_Config.props \
"$(distdir)/src/gvl/_build/Gvl Standard Config.props"
$(nodist_bin_SCRIPTS): scripts/lierolibre.am
install -d scripts/
......@@ -685,9 +766,10 @@ data/LIERO.SND: $(SOUND_SOURCES)
$(srcdir)/data/sounds/ \
$@
.PHONY: clean-local dist-nixbin-dir dist-nixbin-libcopyright dist-nixbin-libsrc dist-nixbin dist-nixbin-xz
clean-local:
rm -f \
$(nodist_pkgdata_DATA) \
$(nodist_bin_SCRIPTS) \
$(nodist_man6_MANS) \
$(MANS_TXT)
......@@ -745,20 +827,21 @@ dist-nixbin-libcopyright:
dist-nixbin-libsrc:
install -d libsrc/
cd libsrc/ && \
for i in $(NIXBIN_LIB_DEBS); do \
apt-get source --download-only $$i=$$(dpkg -s $$i | sed -n 's/^Version:\ \(.*\)/\1/p') || \
touch 00MISSING_$$i.debsource; done
dist-nixbin-dir: distdir $(pkglibexec_PROGRAMS) $(NIXBIN_LIBFILES) $(nodist_pkgdata_DATA) \
LANG=C apt-get source --download-only \
$$(for i in $(NIXBIN_LIB_DEBS); do \
echo $$i=$$(dpkg -s $$i | \
sed -n 's/^Version:\ \(.*\)/\1/p'); done) 2>&1 >/dev/null | \
sed -n 's/E: Unable to find a source package for \(.*\)/\1/p' | \
xargs -I '{}' touch 00MISSING_'{}'.debsource
dist-nixbin-dir: distdir $(pkglibexec_PROGRAMS) $(NIXBIN_LIBFILES) \
$(MANS_TXT) dist-nixbin-libcopyright dist-nixbin-libsrc
cp -aT $(PACKAGE_DIRNAME) $(NIXBIN_DIRNAME)
cp -a lib/ $(NIXBIN_DIRNAME)
cp -a libsrc/ $(NIXBIN_DIRNAME)
cp -a $(pkglibexec_PROGRAMS) $(NIXBIN_DIRNAME)
cp -a $(nodist_pkgdata_DATA) $(NIXBIN_DIRNAME)/data/
cp -a $(nodist_man6_MANS) $(NIXBIN_DIRNAME)/man/
cp -a $(MANS_TXT) $(NIXBIN_DIRNAME)/man/
cp -a README_linuxbin $(NIXBIN_DIRNAME)
dist-nixbin: dist-nixbin-dir
tar caf $(NIXBIN_DIRNAME).tar.gz $(NIXBIN_DIRNAME)
......
This diff is collapsed.
lierolibre NEWS - History of user-visible changes.
Version 0.4 - May 2012, by Martin Erik Werner
Version 0.5 - November 2012, by Martin Erik Werner
* Fixed packgfx and packlev scripts to work with newer ImageMagick
* Fixed the packsounds script so that it won't fail with non-english shell
* Removed unused fullscreen resolution extension menu options
* Fixed default keybind Right Alt not working on Linux
* Fixed extended controls being empty if loaded from non-extended LIERO.DAT
+ Closes: http://code.google.com/p/liero/issues/detail?id=3
* Changed windows homedir name from "settings" to "user"
* Pre-packed LIERO.CHR and LIERO.SND are now included in the source release
* Enabled cross-compilation from Linux for Windows
Version 0.4 - June 2012, by Martin Erik Werner
* Fixed a bug where the EXE file path would not be set
* Updated CFG file with variable name corrections
+ New CFG files (v1) will be written with correct names
......
lierolibre is an old-school earthworm action game. It is a direct fork of Liero
(OpenLiero).
Features:
* 2 worms, 40 weapons, great playability, two game modes: Kill'em All
and Game of Tag, plus AI-players without true intelligence!
* Dat nostalgia
* Extensions via a hidden F1 menu
+ Replays
+ Game controller support
+ Powerlevel palettes
* Ability to write game variables to plain text files
* Ability to load game variables from both EXE and plain text files
* New freely licensed audio
To switch between different window sizes, use F6, F7 and F8, to switch to
fullscreen, use F5 or Alt+Enter.
The copied file 'user\lierocfg.txt' is a plain text file containing all the
game variables, this file is intented to be modified, go wild! Some things are
likely to not work (make the game refuse to start, or crash) though:
! Appending/Deleting elements
! Changing integers to strings, strings to integers, etc.
! Changing the sine and cosine tables
To use custom levels place the .lev files in the 'user' directory.
In order to make lierolibre load and write files differently you will need to
use the command line, to start a command line prompt in the lierolibre
directory run the lierolibre-cmd.bat script.
The available command-line options for lierolibre are:
-f [ --file ] arg read game variables from file or directory
-d [ --dir ] arg load game data from separate directory
-w [ --write ] arg write game variables to file
-v [ --sdlvideo ] arg set the SDL_VIDEODRIVER environment variable
-h [ --help ] print this help message
In addition, positional arguments are automatically assigned to file, dir, and
write, in that order, hence executing
lierolibre.exe foo.txt foodir bar.txt
is equivalent to
lierolibre.exe -f foo.txt -d foodir -w bar.txt
To extract the game variables from a modded LIERO.EXE file, use
lierolibre.exe -f path\to\LIERO.EXE -d path\to\data -w mod.txt
Note that the -d option can be omitted if the data files are in the same
directory as the LIERO.EXE file (and named correctly).
To load a custom game variables text file use
lierolibre.exe -f path\to\mod.txt -d path\to\data
Again, if the data files are in the same directory as mod.txt, the -d option
can be omitted.
Please report bugs at https://bugs.launchpad.net/lierolibre/+filebug
For more information visit the Launchpad page:
https://launchpad.net/lierolibre
The binary linux release includes a lib/ directory with most of the libs needed
to run lierolibre, it is compiled with the relative path option to allow the
game to find these libraries.
With luck it will work in your case, if not, compiling from source is usually
more likely to produce a working result.
Source code for the libraries which require it are available in the libsrc/
directory.
License texts for all included libraries are available in the lib/ directory.
# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
......@@ -180,6 +180,192 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
# Configure paths for SDL
# Sam Lantinga 9/21/99
# stolen from Manish Singh
# stolen back from Frank Belew
# stolen from Manish Singh
# Shamelessly stolen from Owen Taylor
# serial 1
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
dnl
AC_DEFUN([AM_PATH_SDL],
[dnl
dnl Get the cflags and libraries from the sdl-config script
dnl
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
sdl_prefix="$withval", sdl_prefix="")
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
sdl_exec_prefix="$withval", sdl_exec_prefix="")
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
, enable_sdltest=yes)
if test x$sdl_exec_prefix != x ; then
sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
fi
fi
if test x$sdl_prefix != x ; then
sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_prefix/bin/sdl-config
fi
fi
as_save_PATH="$PATH"
if test "x$prefix" != xNONE; then
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
fi
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
PATH="$as_save_PATH"
min_sdl_version=ifelse([$1], ,0.11.0,$1)
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
no_sdl=""
if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes
else
SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_sdltest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_CXXFLAGS="$CXXFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
dnl
dnl Now check if the installed SDL is sufficiently new. (Also sanity
dnl checks the results of sdl-config to some extent
dnl
rm -f conf.sdltest
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "SDL.h"
char*
my_strdup (char *str)
{
char *new_str;
if (str)
{
new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
strcpy (new_str, str);
}
else
new_str = NULL;
return new_str;
}
int main (int argc, char *argv[])
{
int major, minor, micro;
char *tmp_version;
/* This hangs on some systems (?)
system ("touch conf.sdltest");
*/
{ FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = my_strdup("$min_sdl_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_sdl_version");
exit(1);
}
if (($sdl_major_version > major) ||
(($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
(($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
printf("*** best to upgrade to the required version.\n");
printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
printf("*** to point to the correct copy of sdl-config, and remove the file\n");
printf("*** config.cache before re-running configure\n");
return 1;
}
}
],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_sdl" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$SDL_CONFIG" = "no" ; then
echo "*** The sdl-config script installed by SDL could not be found"
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the SDL_CONFIG environment variable to the"
echo "*** full path to sdl-config."
else
if test -f conf.sdltest ; then
:
else
echo "*** Could not run SDL test program, checking why..."
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include "SDL.h"
int main(int argc, char *argv[])
{ return 0; }
#undef main
#define main K_and_R_C_main
], [ return 0; ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong"
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
SDL_CFLAGS=""
SDL_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
rm -f conf.sdltest
])
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
# Foundation, Inc.
#
......@@ -198,7 +384,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.3], [],
m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -214,7 +400,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.3])dnl
[AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
......@@ -1169,4 +1355,3 @@ m4_include([src/m4/ltoptions.m4])
m4_include([src/m4/ltsugar.m4])
m4_include([src/m4/ltversion.m4])
m4_include([src/m4/lt~obsolete.m4])
m4_include([src/m4/sdl.m4])
This diff is collapsed.
AC_PREREQ([2.59])
AC_INIT([lierolibre C++], [0.4], [martinerikwerner@gmail.com], [lierolibre], [https://gitorious.org/lierolibre])
AC_INIT([lierolibre C++], [0.5], [martinerikwerner@gmail.com], [lierolibre], [https://gitorious.org/lierolibre])
AC_CONFIG_SRCDIR([src/worm.cpp])
AC_CONFIG_MACRO_DIR([src/m4])
AC_CONFIG_AUX_DIR([src/build-aux])
......@@ -23,7 +23,7 @@ AC_PROG_MAKE_SET
AC_CHECK_PROG(HAS_SOX, sox, yes)
if test x"$HAS_SOX" != x"yes" ; then
AC_MSG_WARN(SoX not found, you will need this to build the sound data!)
AC_MSG_WARN([SoX not found, you will need this to build the sound data!])
fi
AC_CHECK_PROG(HAS_IM, convert, yes)
......@@ -36,7 +36,7 @@ BOOST_PO_LIBS=""
AC_LANG_PUSH([C++])
AC_CHECK_HEADER([boost/program_options.hpp],
[BOOST_PO_LIBS="-lboost_program_options"],
[AC_MSG_WARN(boost_program_options header not found, you will need this to compile lierolibre!)])
[AC_MSG_WARN([boost_program_options header not found, you will need this to compile lierolibre!])])
AC_LANG_POP([C++])
AC_SUBST(BOOST_PO_LIBS)
......@@ -57,17 +57,35 @@ PKG_CHECK_MODULES([SDL_MIXER], [SDL_mixer],
# Fall back on a quite stupid header check if pkg-config doesn't work
# (pkg-config for SDL_mixer is relatively new)
AS_IF([test "x$pkgcSDLM" = "xno"], [
AS_IF([test x"$pkgcSDLM" = x"no"], [
AC_CHECK_HEADERS([SDL/SDL_mixer.h],
[SDL_MIXER_CFLAGS="-D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL"],
[AC_MSG_WARN(SDL_mixer headers not found, you will need this to compile lierolibre!)])
[AC_MSG_WARN([SDL_mixer headers not found, you will need this to compile lierolibre!])])
AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio,
[SDL_MIXER_LIBS="-lSDL_mixer -lSDL"],
[AC_MSG_WARN(SDL_mixer library not found, you will need this to link lierolibre!)])
[AC_MSG_WARN([SDL_mixer library not found, you will need this to link lierolibre!])])
])
PKG_CHECK_MODULES([ZLIB], [zlib])
AC_ARG_ENABLE([windows-includes],
[AS_HELP_STRING([--enable-windows-includes],
[use includes from local folder ./windows/include/])],
[WINDOWS_CPPFLAGS='-I./windows/include/'])
AC_SUBST([WINDOWS_CPPFLAGS])
# Search paths for embedded windows libraries, force libconfig++ static
# (I've been unable to link stdc++ and gcc_s statically in a shared
# libconfig++-9.dll)
AC_ARG_ENABLE([windows-libraries],
[AS_HELP_STRING([--enable-windows-libraries],
[compile and use libraries from local folder ./windows/include/, and force static linking for libconfig++])],
[WINDOWS_LDFLAGS='-Lwindows/boost-program_options-1.51.0/stage/lib -Lwindows/zlib-1.2.7 -Lwindows/SDL-1.2.15/build/.libs -Lwindows/libconfig-1.4.8/lib/.libs/ -Lwindows/SDL_mixer-1.2.12/lib/x86/ -lboost_program_options -static-libgcc -static-libstdc++'; LIBCONFIGXX_CPPFLAGS="-DLIBCONFIGXX_STATIC"; LIBCONFIGXX_LIBS="windows/libconfig-1.4.8/lib/.libs/libconfig++.a"])
AC_SUBST([WINDOWS_LDFLAGS])
AC_SUBST([LIBCONFIGXX_CPPFLAGS])
AC_SUBST([LIBCONFIGXX_LIBS])
AM_CONDITIONAL([HAS_WINDOWS_LDFLAGS], [test "$WINDOWS_LDFLAGS"])
# Get libgvl library and include locations
AC_ARG_WITH([gvl-include-path],
[AS_HELP_STRING([--with-gvl-include-path],
......@@ -88,7 +106,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h fenv.h float.h limits.h malloc.h netdb.h n
AC_LANG_PUSH([C++])
AC_CHECK_HEADERS([tut/tut.hpp tut/tut_reporter.hpp