diff -Nru cytadela-1.0.1/ChangeLog cytadela-1.1.0/ChangeLog --- cytadela-1.0.1/ChangeLog 2010-06-29 19:35:18.000000000 +0000 +++ cytadela-1.1.0/ChangeLog 2013-01-15 22:30:21.000000000 +0000 @@ -1,3 +1,23 @@ +Cytadela 1.1.0: + * New features: + * added a setting for changing the screen mode between + fullscreen and windowed mode (under Video Options) + + * Bugfixes: + * fog rendering on systems with Mesa OpenGL drivers and + on Windows systems with Intel graphic cards + * it was impossible to go back to the menu after watching + the outro to the very end + +Cytadela 1.0.2: + * Changes: + * added support for 1080p and 720p HD resolutions + * video files (intro and outro) are now encoded in WebM + for smaller file sizes (and better quality) + + * Bugfixes: + * intro and outro not working with libvlc 1.2 + Cytadela 1.0.1: * Changes: * adapted to libVLC 1.1 (finally runs on MacOS X) diff -Nru cytadela-1.0.1/Makefile.in cytadela-1.1.0/Makefile.in --- cytadela-1.0.1/Makefile.in 2010-05-04 19:36:10.000000000 +0000 +++ cytadela-1.1.0/Makefile.in 2013-01-15 15:36:45.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,6 +70,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -65,9 +87,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -96,6 +120,8 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -193,7 +219,7 @@ all: all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -397,13 +423,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -435,7 +458,11 @@ $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir @@ -443,7 +470,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -474,6 +501,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -483,7 +512,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -493,6 +522,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -521,8 +551,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -553,10 +591,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -643,15 +686,15 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-generic distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ + dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-generic distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am diff -Nru cytadela-1.0.1/NEWS cytadela-1.1.0/NEWS --- cytadela-1.0.1/NEWS 2010-05-03 12:39:39.000000000 +0000 +++ cytadela-1.1.0/NEWS 2013-01-15 23:29:39.000000000 +0000 @@ -1,9 +1,7 @@ -Cytadela 1.0 +Cytadela 1.1.0 -Exactly four years after the initial public release, version 0.6, the final version is at last made available. - -This version brings just the intro and outro movies and fixes equipment flickering bug present on some 32 bit systems. - -This is the last version I'm publishing - from now on there won't be any improvements or bug fixes from my side. But as you know, the code is available under the GNU GPLv3 license, so it shouldn't be a big deal. - -Enjoy. +This version includes: +- A new setting under Video Options that allows choosing between fullscreen and windowed mode +- A workaround for the fog rendering bug on floors and ceilings (present on systems with Mesa OpenGL drivers and + on Windows systems with Intel graphic cards) +- A fix for a bug that made it impossible to go back to the menu after watching the outro to the very end diff -Nru cytadela-1.0.1/aclocal.m4 cytadela-1.1.0/aclocal.m4 --- cytadela-1.0.1/aclocal.m4 2010-05-03 07:52:51.000000000 +0000 +++ cytadela-1.1.0/aclocal.m4 2013-01-13 15:50:50.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- 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 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,18 +14,21 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -34,7 +38,7 @@ [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.1], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,19 +54,21 @@ # 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.1])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]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -144,14 +150,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -191,6 +197,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -255,7 +262,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -320,10 +327,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -545,12 +555,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -682,12 +695,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -710,13 +726,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -724,13 +741,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -806,12 +823,14 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -834,13 +853,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -849,13 +868,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -877,10 +896,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -Nru cytadela-1.0.1/configure cytadela-1.1.0/configure --- cytadela-1.0.1/configure 2010-05-03 16:06:29.000000000 +0000 +++ cytadela-1.1.0/configure 2013-01-15 14:58:16.000000000 +0000 @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for cytadela 1.0. +# Generated by GNU Autoconf 2.69 for cytadela 1.0. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -89,6 +87,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -133,6 +132,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -166,7 +190,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -211,14 +236,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -316,10 +352,18 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -356,19 +400,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -441,6 +485,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -475,16 +523,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -496,28 +544,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -530,7 +558,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -608,6 +636,7 @@ am__fastdepCXX_FALSE am__fastdepCXX_TRUE CXXDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -761,8 +790,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -807,7 +837,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -833,7 +863,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1037,7 +1067,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1053,7 +1083,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1083,8 +1113,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1092,7 +1122,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1102,7 +1132,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1110,13 +1140,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1139,7 +1169,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1153,8 +1183,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1169,9 +1197,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1210,11 +1238,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1254,7 +1282,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1396,9 +1424,9 @@ if $ac_init_version; then cat <<\_ACEOF cytadela configure 1.0 -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.69 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1442,7 +1470,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_cxx_try_compile @@ -1480,7 +1508,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1506,7 +1534,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1517,7 +1545,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1530,10 +1558,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1569,7 +1597,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1596,7 +1624,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1605,7 +1633,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1646,7 +1674,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1660,7 +1688,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1678,7 +1706,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1709,7 +1737,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1723,7 +1751,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1732,7 +1760,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by cytadela $as_me 1.0, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1842,11 +1870,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1880,11 +1906,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1897,11 +1921,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -1915,11 +1937,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -1974,7 +1994,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -1989,7 +2014,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2065,7 +2094,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2082,16 +2111,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2120,7 +2155,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2140,7 +2175,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2207,11 +2242,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2233,7 +2268,7 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2243,7 +2278,7 @@ # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2297,7 +2332,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2309,7 +2344,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2337,7 +2372,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2349,7 +2384,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2390,7 +2425,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2400,7 +2435,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2441,7 +2476,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2453,7 +2488,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2481,7 +2516,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2489,7 +2524,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2523,7 +2558,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2569,11 +2604,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2596,7 +2631,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then : +if ${ac_cv_prog_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -2608,7 +2643,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2640,7 +2675,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : +if ${ac_cv_prog_ac_ct_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -2652,7 +2687,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2803,9 +2838,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C++ compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C++ compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2847,8 +2881,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -2905,9 +2939,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C++ compiled programs. +as_fn_error $? "cannot run C++ compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -2918,7 +2952,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2958,8 +2992,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -2969,7 +3003,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : +if ${ac_cv_cxx_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3006,7 +3040,7 @@ ac_save_CXXFLAGS=$CXXFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then : +if ${ac_cv_prog_cxx_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag @@ -3139,6 +3173,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3154,7 +3189,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3163,6 +3198,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3222,7 +3258,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -3282,7 +3318,7 @@ set dummy sdl-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_SDLCONFIG+set}" = set; then : +if ${ac_cv_prog_SDLCONFIG+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$SDLCONFIG"; then @@ -3294,7 +3330,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_SDLCONFIG=""yes"" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3323,7 +3359,7 @@ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" else - as_fn_error "SDL library is required" "$LINENO" 5 + as_fn_error $? "SDL library is required" "$LINENO" 5 fi ac_ext=c @@ -3336,7 +3372,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3348,7 +3384,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3376,7 +3412,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3388,7 +3424,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3429,7 +3465,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3441,7 +3477,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3469,7 +3505,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3482,7 +3518,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3528,7 +3564,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3540,7 +3576,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3572,7 +3608,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3584,7 +3620,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3626,8 +3662,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3656,7 +3692,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3693,7 +3729,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3771,7 +3807,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3780,8 +3816,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3870,7 +3905,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3879,6 +3914,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3938,7 +3974,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -4006,7 +4042,7 @@ CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -4036,7 +4072,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4052,11 +4088,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4095,7 +4131,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4111,18 +4147,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -4134,7 +4170,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4148,7 +4184,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4183,7 +4219,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4197,7 +4233,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4214,7 +4250,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4249,7 +4285,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4264,7 +4300,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4381,8 +4417,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4396,8 +4431,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4412,8 +4446,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4428,8 +4461,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4442,7 +4474,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glLoadIdentity in -lGL" >&5 $as_echo_n "checking for glLoadIdentity in -lGL... " >&6; } -if test "${ac_cv_lib_GL_glLoadIdentity+set}" = set; then : +if ${ac_cv_lib_GL_glLoadIdentity+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4476,7 +4508,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glLoadIdentity" >&5 $as_echo "$ac_cv_lib_GL_glLoadIdentity" >&6; } -if test "x$ac_cv_lib_GL_glLoadIdentity" = x""yes; then : +if test "x$ac_cv_lib_GL_glLoadIdentity" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBGL 1 _ACEOF @@ -4489,7 +4521,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluCheckExtension in -lGLU" >&5 $as_echo_n "checking for gluCheckExtension in -lGLU... " >&6; } -if test "${ac_cv_lib_GLU_gluCheckExtension+set}" = set; then : +if ${ac_cv_lib_GLU_gluCheckExtension+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4523,7 +4555,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluCheckExtension" >&5 $as_echo "$ac_cv_lib_GLU_gluCheckExtension" >&6; } -if test "x$ac_cv_lib_GLU_gluCheckExtension" = x""yes; then : +if test "x$ac_cv_lib_GLU_gluCheckExtension" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBGLU 1 _ACEOF @@ -4536,7 +4568,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libvlc_new in -lvlc" >&5 $as_echo_n "checking for libvlc_new in -lvlc... " >&6; } -if test "${ac_cv_lib_vlc_libvlc_new+set}" = set; then : +if ${ac_cv_lib_vlc_libvlc_new+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4570,7 +4602,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vlc_libvlc_new" >&5 $as_echo "$ac_cv_lib_vlc_libvlc_new" >&6; } -if test "x$ac_cv_lib_vlc_libvlc_new" = x""yes; then : +if test "x$ac_cv_lib_vlc_libvlc_new" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBVLC 1 _ACEOF @@ -4648,10 +4680,21 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -4703,6 +4746,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -4726,19 +4770,19 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - as_fn_error "conditional \"am__fastdepCXX\" was never defined. + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -4839,6 +4883,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4884,19 +4929,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -5034,16 +5079,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -5092,7 +5137,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -5103,28 +5148,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -5146,7 +5179,7 @@ # values after options handling. ac_log=" This file was extended by cytadela $as_me 1.0, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5203,10 +5236,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ cytadela config.status 1.0 -configured by $0, generated by GNU Autoconf 2.65, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -5224,11 +5257,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -5250,6 +5288,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -5260,7 +5299,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -5280,7 +5319,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -5319,7 +5358,7 @@ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -5341,9 +5380,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -5351,12 +5391,13 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -5373,12 +5414,12 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -5387,18 +5428,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -5406,7 +5447,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -5454,7 +5495,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -5486,21 +5527,29 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -5518,7 +5567,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -5537,7 +5586,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -5546,7 +5595,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -5572,8 +5621,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -5709,23 +5758,24 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -5841,7 +5891,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -5862,7 +5912,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff -Nru cytadela-1.0.1/cytadela.dev cytadela-1.1.0/cytadela.dev --- cytadela-1.0.1/cytadela.dev 2010-06-29 19:40:36.000000000 +0000 +++ cytadela-1.1.0/cytadela.dev 2013-01-15 22:54:09.000000000 +0000 @@ -421,20 +421,20 @@ [VersionInfo] Major=1 -Minor=0 -Release=1 +Minor=1 +Release=0 Build=0 LanguageID=1033 CharsetID=1252 CompanyName= -FileVersion=1.0.1 +FileVersion=1.1.0 FileDescription=Cytadela - a conversion of an Amiga game InternalName=cytadela -LegalCopyright=(C) 2003-2010 Tomasz Kazmierczak, (C) 2006 Kamil Pawlowski, (C) 2009 Marcin Sekalski, (C) 2009-2010 Tomasz Wisniewski +LegalCopyright=(C) 2003-2013 Tomasz Kazmierczak, (C) 2006 Kamil Pawlowski, (C) 2009 Marcin Sekalski, (C) 2009-2010 Tomasz Wisniewski LegalTrademarks= OriginalFilename=cytadela.exe ProductName=cytadela -ProductVersion=1.0.1 +ProductVersion=1.1.0 AutoIncBuildNr=0 [Unit41] diff -Nru cytadela-1.0.1/cytadela_private.h cytadela-1.1.0/cytadela_private.h --- cytadela-1.0.1/cytadela_private.h 2010-06-29 19:40:55.000000000 +0000 +++ cytadela-1.1.0/cytadela_private.h 2013-01-15 22:54:06.000000000 +0000 @@ -5,19 +5,19 @@ #define CYTADELA_PRIVATE_H /* VERSION DEFINITIONS */ -#define VER_STRING "1.0.1.0" +#define VER_STRING "1.1.0.0" #define VER_MAJOR 1 -#define VER_MINOR 0 -#define VER_RELEASE 1 +#define VER_MINOR 1 +#define VER_RELEASE 0 #define VER_BUILD 0 #define COMPANY_NAME "" -#define FILE_VERSION "1.0.1" +#define FILE_VERSION "1.1.0" #define FILE_DESCRIPTION "Cytadela - a conversion of an Amiga game" #define INTERNAL_NAME "cytadela" -#define LEGAL_COPYRIGHT "(C) 2003-2010 Tomasz Kazmierczak, (C) 2006 Kamil Pawlowski, (C) 2009 Marcin Sekalski, (C) 2009-2010 Tomasz Wisniewski" +#define LEGAL_COPYRIGHT "(C) 2003-2013 Tomasz Kazmierczak, (C) 2006 Kamil Pawlowski, (C) 2009 Marcin Sekalski, (C) 2009-2010 Tomasz Wisniewski" #define LEGAL_TRADEMARKS "" #define ORIGINAL_FILENAME "cytadela.exe" #define PRODUCT_NAME "cytadela" -#define PRODUCT_VERSION "1.0.1" +#define PRODUCT_VERSION "1.1.0" #endif /*CYTADELA_PRIVATE_H*/ diff -Nru cytadela-1.0.1/cytadela_private.rc cytadela-1.1.0/cytadela_private.rc --- cytadela-1.0.1/cytadela_private.rc 2010-06-29 19:41:36.000000000 +0000 +++ cytadela-1.1.0/cytadela_private.rc 2013-01-15 22:54:06.000000000 +0000 @@ -3,14 +3,14 @@ #include // include for version info constants -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "cytadela.ico" +#include "cytadela_private.rc" // // TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS... // 1 VERSIONINFO -FILEVERSION 1,0,0,0 -PRODUCTVERSION 1,0,0,0 +FILEVERSION 1,1,0,0 +PRODUCTVERSION 1,1,0,0 FILETYPE VFT_APP { BLOCK "StringFileInfo" @@ -18,14 +18,14 @@ BLOCK "040904E4" { VALUE "CompanyName", "" - VALUE "FileVersion", "1.0.1" + VALUE "FileVersion", "1.1.0" VALUE "FileDescription", "Cytadela - a conversion of an Amiga game" VALUE "InternalName", "cytadela" - VALUE "LegalCopyright", "(C) 2003-2010 Tomasz Kazmierczak, (C) 2006 Kamil Pawlowski, (C) 2009 Marcin Sekalski, (C) 2009-2010 Tomasz Wisniewski" + VALUE "LegalCopyright", "(C) 2003-2013 Tomasz Kazmierczak, (C) 2006 Kamil Pawlowski, (C) 2009 Marcin Sekalski, (C) 2009-2010 Tomasz Wisniewski" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "cytadela.exe" VALUE "ProductName", "cytadela" - VALUE "ProductVersion", "1.0.1" + VALUE "ProductVersion", "1.1.0" } } BLOCK "VarFileInfo" diff -Nru cytadela-1.0.1/data/Makefile.am cytadela-1.1.0/data/Makefile.am --- cytadela-1.0.1/data/Makefile.am 2010-05-04 19:35:57.000000000 +0000 +++ cytadela-1.1.0/data/Makefile.am 2013-01-13 15:51:44.000000000 +0000 @@ -4,7 +4,7 @@ objdir = $(datadir)/cytadela/obj texdir = $(datadir)/cytadela/tex iconsdir = $(datadir)/cytadela/icons -localedir = $(datadir)/cytadela/locale +localesdir = $(datadir)/cytadela/locale fontsdir = $(datadir)/cytadela/tex/fonts soundsdir = $(datadir)/cytadela/sounds videodir = $(datadir)/cytadela/video @@ -120,7 +120,7 @@ icons/cytadela.png \ icons/cytadela.xpm -dist_locale_DATA = \ +dist_locales_DATA = \ locale/CZECH.loc \ locale/ENGLISH.loc \ locale/FRENCH.loc \ @@ -162,7 +162,7 @@ sounds/fire.wav dist_video_DATA = \ -video/intro_pl.ogv \ -video/intro_en.ogv \ -video/outro_pl.ogv \ -video/outro_en.ogv +video/intro_pl.webm \ +video/intro_en.webm \ +video/outro_pl.webm \ +video/outro_en.webm diff -Nru cytadela-1.0.1/data/Makefile.in cytadela-1.1.0/data/Makefile.in --- cytadela-1.0.1/data/Makefile.in 2010-05-04 19:36:10.000000000 +0000 +++ cytadela-1.1.0/data/Makefile.in 2013-01-15 15:36:45.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,7 +52,7 @@ subdir = data DIST_COMMON = $(dist_doc_DATA) $(dist_docimages_DATA) \ $(dist_docstyle_DATA) $(dist_fonts_DATA) $(dist_icons_DATA) \ - $(dist_locale_DATA) $(dist_music_DATA) $(dist_obj_DATA) \ + $(dist_locales_DATA) $(dist_music_DATA) $(dist_obj_DATA) \ $(dist_sounds_DATA) $(dist_tex_DATA) $(dist_video_DATA) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -47,6 +64,11 @@ CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -68,14 +90,20 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docimagesdir)" \ "$(DESTDIR)$(docstyledir)" "$(DESTDIR)$(fontsdir)" \ - "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(localedir)" \ + "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(localesdir)" \ "$(DESTDIR)$(musicdir)" "$(DESTDIR)$(objdir)" \ "$(DESTDIR)$(soundsdir)" "$(DESTDIR)$(texdir)" \ "$(DESTDIR)$(videodir)" DATA = $(dist_doc_DATA) $(dist_docimages_DATA) $(dist_docstyle_DATA) \ - $(dist_fonts_DATA) $(dist_icons_DATA) $(dist_locale_DATA) \ + $(dist_fonts_DATA) $(dist_icons_DATA) $(dist_locales_DATA) \ $(dist_music_DATA) $(dist_obj_DATA) $(dist_sounds_DATA) \ $(dist_tex_DATA) $(dist_video_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -154,7 +182,7 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -localedir = $(datadir)/cytadela/locale +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -177,6 +205,7 @@ objdir = $(datadir)/cytadela/obj texdir = $(datadir)/cytadela/tex iconsdir = $(datadir)/cytadela/icons +localesdir = $(datadir)/cytadela/locale fontsdir = $(datadir)/cytadela/tex/fonts soundsdir = $(datadir)/cytadela/sounds videodir = $(datadir)/cytadela/video @@ -291,7 +320,7 @@ icons/cytadela.png \ icons/cytadela.xpm -dist_locale_DATA = \ +dist_locales_DATA = \ locale/CZECH.loc \ locale/ENGLISH.loc \ locale/FRENCH.loc \ @@ -333,10 +362,10 @@ sounds/fire.wav dist_video_DATA = \ -video/intro_pl.ogv \ -video/intro_en.ogv \ -video/outro_pl.ogv \ -video/outro_en.ogv +video/intro_pl.webm \ +video/intro_en.webm \ +video/outro_pl.webm \ +video/outro_en.webm all: all-am @@ -373,8 +402,11 @@ $(am__aclocal_m4_deps): install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -388,13 +420,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) install-dist_docimagesDATA: $(dist_docimages_DATA) @$(NORMAL_INSTALL) - test -z "$(docimagesdir)" || $(MKDIR_P) "$(DESTDIR)$(docimagesdir)" @list='$(dist_docimages_DATA)'; test -n "$(docimagesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docimagesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docimagesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -408,13 +441,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_docimages_DATA)'; test -n "$(docimagesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docimagesdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docimagesdir)" && rm -f $$files + dir='$(DESTDIR)$(docimagesdir)'; $(am__uninstall_files_from_dir) install-dist_docstyleDATA: $(dist_docstyle_DATA) @$(NORMAL_INSTALL) - test -z "$(docstyledir)" || $(MKDIR_P) "$(DESTDIR)$(docstyledir)" @list='$(dist_docstyle_DATA)'; test -n "$(docstyledir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docstyledir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docstyledir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -428,13 +462,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_docstyle_DATA)'; test -n "$(docstyledir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docstyledir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docstyledir)" && rm -f $$files + dir='$(DESTDIR)$(docstyledir)'; $(am__uninstall_files_from_dir) install-dist_fontsDATA: $(dist_fonts_DATA) @$(NORMAL_INSTALL) - test -z "$(fontsdir)" || $(MKDIR_P) "$(DESTDIR)$(fontsdir)" @list='$(dist_fonts_DATA)'; test -n "$(fontsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(fontsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(fontsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -448,13 +483,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_fonts_DATA)'; test -n "$(fontsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(fontsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(fontsdir)" && rm -f $$files + dir='$(DESTDIR)$(fontsdir)'; $(am__uninstall_files_from_dir) install-dist_iconsDATA: $(dist_icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(dist_icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -468,33 +504,35 @@ @$(NORMAL_UNINSTALL) @list='$(dist_icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(iconsdir)" && rm -f $$files -install-dist_localeDATA: $(dist_locale_DATA) + dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) +install-dist_localesDATA: $(dist_locales_DATA) @$(NORMAL_INSTALL) - test -z "$(localedir)" || $(MKDIR_P) "$(DESTDIR)$(localedir)" - @list='$(dist_locale_DATA)'; test -n "$(localedir)" || list=; \ + @list='$(dist_locales_DATA)'; test -n "$(localesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(localesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(localesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(localedir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(localedir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(localesdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(localesdir)" || exit $$?; \ done -uninstall-dist_localeDATA: +uninstall-dist_localesDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_locale_DATA)'; test -n "$(localedir)" || list=; \ + @list='$(dist_locales_DATA)'; test -n "$(localesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(localedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(localedir)" && rm -f $$files + dir='$(DESTDIR)$(localesdir)'; $(am__uninstall_files_from_dir) install-dist_musicDATA: $(dist_music_DATA) @$(NORMAL_INSTALL) - test -z "$(musicdir)" || $(MKDIR_P) "$(DESTDIR)$(musicdir)" @list='$(dist_music_DATA)'; test -n "$(musicdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(musicdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(musicdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -508,13 +546,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_music_DATA)'; test -n "$(musicdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(musicdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(musicdir)" && rm -f $$files + dir='$(DESTDIR)$(musicdir)'; $(am__uninstall_files_from_dir) install-dist_objDATA: $(dist_obj_DATA) @$(NORMAL_INSTALL) - test -z "$(objdir)" || $(MKDIR_P) "$(DESTDIR)$(objdir)" @list='$(dist_obj_DATA)'; test -n "$(objdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(objdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(objdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -528,13 +567,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_obj_DATA)'; test -n "$(objdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(objdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(objdir)" && rm -f $$files + dir='$(DESTDIR)$(objdir)'; $(am__uninstall_files_from_dir) install-dist_soundsDATA: $(dist_sounds_DATA) @$(NORMAL_INSTALL) - test -z "$(soundsdir)" || $(MKDIR_P) "$(DESTDIR)$(soundsdir)" @list='$(dist_sounds_DATA)'; test -n "$(soundsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(soundsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(soundsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -548,13 +588,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_sounds_DATA)'; test -n "$(soundsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(soundsdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(soundsdir)" && rm -f $$files + dir='$(DESTDIR)$(soundsdir)'; $(am__uninstall_files_from_dir) install-dist_texDATA: $(dist_tex_DATA) @$(NORMAL_INSTALL) - test -z "$(texdir)" || $(MKDIR_P) "$(DESTDIR)$(texdir)" @list='$(dist_tex_DATA)'; test -n "$(texdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(texdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(texdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -568,13 +609,14 @@ @$(NORMAL_UNINSTALL) @list='$(dist_tex_DATA)'; test -n "$(texdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(texdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(texdir)" && rm -f $$files + dir='$(DESTDIR)$(texdir)'; $(am__uninstall_files_from_dir) install-dist_videoDATA: $(dist_video_DATA) @$(NORMAL_INSTALL) - test -z "$(videodir)" || $(MKDIR_P) "$(DESTDIR)$(videodir)" @list='$(dist_video_DATA)'; test -n "$(videodir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(videodir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(videodir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -588,9 +630,7 @@ @$(NORMAL_UNINSTALL) @list='$(dist_video_DATA)'; test -n "$(videodir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(videodir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(videodir)" && rm -f $$files + dir='$(DESTDIR)$(videodir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -632,7 +672,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docimagesdir)" "$(DESTDIR)$(docstyledir)" "$(DESTDIR)$(fontsdir)" "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(localedir)" "$(DESTDIR)$(musicdir)" "$(DESTDIR)$(objdir)" "$(DESTDIR)$(soundsdir)" "$(DESTDIR)$(texdir)" "$(DESTDIR)$(videodir)"; do \ + for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docimagesdir)" "$(DESTDIR)$(docstyledir)" "$(DESTDIR)$(fontsdir)" "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(localesdir)" "$(DESTDIR)$(musicdir)" "$(DESTDIR)$(objdir)" "$(DESTDIR)$(soundsdir)" "$(DESTDIR)$(texdir)" "$(DESTDIR)$(videodir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -645,10 +685,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -682,7 +727,7 @@ install-data-am: install-dist_docDATA install-dist_docimagesDATA \ install-dist_docstyleDATA install-dist_fontsDATA \ - install-dist_iconsDATA install-dist_localeDATA \ + install-dist_iconsDATA install-dist_localesDATA \ install-dist_musicDATA install-dist_objDATA \ install-dist_soundsDATA install-dist_texDATA \ install-dist_videoDATA @@ -731,7 +776,7 @@ uninstall-am: uninstall-dist_docDATA uninstall-dist_docimagesDATA \ uninstall-dist_docstyleDATA uninstall-dist_fontsDATA \ - uninstall-dist_iconsDATA uninstall-dist_localeDATA \ + uninstall-dist_iconsDATA uninstall-dist_localesDATA \ uninstall-dist_musicDATA uninstall-dist_objDATA \ uninstall-dist_soundsDATA uninstall-dist_texDATA \ uninstall-dist_videoDATA @@ -743,7 +788,7 @@ install install-am install-data install-data-am \ install-dist_docDATA install-dist_docimagesDATA \ install-dist_docstyleDATA install-dist_fontsDATA \ - install-dist_iconsDATA install-dist_localeDATA \ + install-dist_iconsDATA install-dist_localesDATA \ install-dist_musicDATA install-dist_objDATA \ install-dist_soundsDATA install-dist_texDATA \ install-dist_videoDATA install-dvi install-dvi-am install-exec \ @@ -755,7 +800,7 @@ pdf-am ps ps-am uninstall uninstall-am uninstall-dist_docDATA \ uninstall-dist_docimagesDATA uninstall-dist_docstyleDATA \ uninstall-dist_fontsDATA uninstall-dist_iconsDATA \ - uninstall-dist_localeDATA uninstall-dist_musicDATA \ + uninstall-dist_localesDATA uninstall-dist_musicDATA \ uninstall-dist_objDATA uninstall-dist_soundsDATA \ uninstall-dist_texDATA uninstall-dist_videoDATA diff -Nru cytadela-1.0.1/data/doc/Doc_en.html cytadela-1.1.0/data/doc/Doc_en.html --- cytadela-1.0.1/data/doc/Doc_en.html 2010-06-29 19:30:23.000000000 +0000 +++ cytadela-1.1.0/data/doc/Doc_en.html 2013-01-15 22:31:09.000000000 +0000 @@ -23,7 +23,7 @@

    -
  • Copyright © 2007, 2008, 2009, 2010 Tomasz Kaźmierczak
    • +
  • Copyright © 2007, 2008, 2009, 2010, 2013 Tomasz Kaźmierczak

@@ -33,11 +33,11 @@

Cytadela

-

Version 1.0.1

+

Version 1.1.0

project homepage

    -
  • Copyright © 2003-2010 Tomasz Kaźmierczak
    • +
  • Copyright © 2003-2013 Tomasz Kaźmierczak
  • Copyright © 2006 Kamil Pawłowski
  • Copyright © 2009 Marcin Sękalski
  • Copyright © 2009-2010 Tomasz Wiśniewski
    • @@ -135,7 +135,7 @@
  • GLU: 1.2
    • -
  • VLC: 1.1
    • +
  • VLC: 1.2

    • If you are unsure about the OpenGL version that your graphics card's driver supports you can check it after compiling the Citadel - at startup the program checks for the GL version and displays an information about it. @@ -143,7 +143,7 @@

    1.2 Hardware requirements

      -
    • About 160 MB of hard disk space
      • +
    • About 100 MB of hard disk space
    • OpenGL compatible graphics card (as described in software requirements)
    • A sound card (not required, but is highly recommended)
    @@ -157,11 +157,6 @@

  • -Intel graphics cards and fog rendering - when using newer (!) graphics drivers the fog is being rendered improperly on floors and ceilings. -

    -
    • -
  • -

    Music in menu and SDL_mixer - some distributions of SDL_mixer library are compiled without .mod format support (without libmikmod support). In such case the Citadel won't run because the music in menu is in .mod files. To solve the problem you can download the SDL_mixer's source code and compile it with the mikmod support.

    @@ -300,7 +295,7 @@

  • OPTIONS - here you can change some game options:
    • DIFFICULTY: HARD/EASY
      • -
    • GFX OPTIONS - in this submenu you can set the in-game screen size
      • +
    • GFX OPTIONS - in this submenu you can set the in-game screen size and choose between fullscreen and windowed mode
    • SPEED SETTINGS - in this submenu you can set the mouse speed
    • AUDIO SETTINGS - in this submenu turn the sound on or off
    diff -Nru cytadela-1.0.1/data/doc/Doc_fr.html cytadela-1.1.0/data/doc/Doc_fr.html --- cytadela-1.0.1/data/doc/Doc_fr.html 2010-06-29 19:30:54.000000000 +0000 +++ cytadela-1.1.0/data/doc/Doc_fr.html 2013-01-15 22:31:45.000000000 +0000 @@ -23,7 +23,7 @@

      -
    • Copyright © 2007, 2008, 2009, 2010 Tomasz Kaźmierczak
      • +
    • Copyright © 2007, 2008, 2009, 2010, 2013 Tomasz Kaźmierczak
    • Traduction française: © 2007 Patrick 'NightWolf' David
    @@ -34,11 +34,11 @@

    Cytadela

    -

    Version 1.0.1

    +

    Version 1.1.0

    Page d'accueil du projet

      -
    • Copyright © 2003-2010 Tomasz Kaźmierczak
      • +
    • Copyright © 2003-2013 Tomasz Kaźmierczak
    • Copyright © 2006 Kamil Pawłowski
    • Copyright © 2009 Marcin Sękalski
    • Copyright © 2009-2010 Tomasz Wiśniewski
      • @@ -136,7 +136,7 @@
  • GLU: 1.2
    • -
  • VLC: 1.1
    • +
  • VLC: 1.2

    • Si vous n'êtes pas certain de la version d'OpenGL supportée par le pilote de votre carte graphique, vous pourrez la vérifier après compilation de The Citadel - au démarrage, le programme vérifie la version d'OpenGL et affiche diverses informations à son propos. @@ -144,7 +144,7 @@

    1.2 Configuration matérielle

      -
    • Environ 160 MB d'espace disque
      • +
    • Environ 100 MB d'espace disque
    • Carte graphique compatible OpenGL (telle que décrite dans la configuration logicielle)
    • Carte son (non nécessaire, mais chaudement recommandée)
    @@ -158,11 +158,6 @@

  • -Intel graphics cards and fog rendering - when using newer (!) graphics drivers the fog is being rendered improperly on floors and ceilings. -

    -
    • -
  • -

    Musique dans les menus et SDL_mixer - certaines distributions de la bibliothèque SDL_mixer sont compilées sans le support du format .mod (sans support de libmikmod). Dans ce cas, The Citadel ne se lancera pas, car la musique dans les menus est au format .mod. Pour résoudre ce problème, vous pouvez télécharger le code source de SDL_mixer et le compiler avec le support mikmod.

    @@ -301,7 +296,7 @@

  • OPTIONS - ici vous pouvez modifier quelques options de jeu:
    • MODE FACILE / DIFFICILE
      • -
    • OPTIONS GRAPH. - dans ce sous-menu, vous pouvez modifier la taille de l'écran en jeu
      • +
    • OPTIONS GRAPH. - dans ce sous-menu, vous pouvez modifier la taille de l'écran en jeu; you can also choose between fullscreen and windowed mode
    • RÉGLER VITESSE - dans ce sous-menu, vous pouvez modifier les vitesses de la souris
    • AUDIO SETTINGS - in this submenu turn the sound on or off
    diff -Nru cytadela-1.0.1/data/doc/Doc_pl.html cytadela-1.1.0/data/doc/Doc_pl.html --- cytadela-1.0.1/data/doc/Doc_pl.html 2010-06-29 19:31:23.000000000 +0000 +++ cytadela-1.1.0/data/doc/Doc_pl.html 2013-01-15 22:32:01.000000000 +0000 @@ -23,7 +23,7 @@

      -
    • Copyright © 2007, 2008, 2009, 2010 Tomasz Kaźmierczak
      • +
    • Copyright © 2007, 2008, 2009, 2010, 2013 Tomasz Kaźmierczak
    • Niektóre części dokumentacji pochodzą z dokumentacji oryginalnej Cytadeli, autorstwa Virtual Design
    @@ -36,11 +36,11 @@

    Cytadela

    -

    Wersja 1.0.1

    +

    Wersja 1.1.0

    strona domowa projektu

      -
    • Copyright © 2003-2010 Tomasz Kaźmierczak
      • +
    • Copyright © 2003-2013 Tomasz Kaźmierczak
    • Copyright © 2006 Kamil Pawłowski
    • Copyright © 2009 Marcin Sękalski
    • Copyright © 2009-2010 Tomasz Wiśniewski
      • @@ -140,7 +140,7 @@
  • GLU: 1.2
    • -
  • VLC: 1.1
    • +
  • VLC: 1.2

    • Jeśli nie masz pewności co do wersji OpenGL obsługiwanej przez sterownik twojej karty graficznej, możesz ją sprawdzić po skompilowaniu Cytadeli - na starcie program sprawdza sterownik OpenGL i wyświetla o nim informację. @@ -148,7 +148,7 @@

    1.2 Wymagania sprzętowe

      -
    • Około 160 MB miejsca na dysku
      • +
    • Około 100 MB miejsca na dysku
    • Karta graficzna zgodna z OpenGL (jak podano w wymaganiach programowych)
    • Karta dźwiękowa (nie wymagana, ale wysoce zalecana)
    @@ -162,11 +162,6 @@

  • -Karty graficzne Intel i renderowanie mgły - w przypadku korzystania z nowszych (!) sterowników mgła jest renderowana niepoprawnie na suficie i podłodze. -

    -
    • -
  • -

    Muzyka w menu i SDL_mixer - niektóre dystrybucje biblioteki SDL_mixer są kompilowane bez obsługi plików muzycznych w formacie .mod (bez obsługi libmikmod). W takim przypadku Cytadela nie uruchomi się, ponieważ muzyka w menu przechowywana jest w plikach .mod. By rozwiązać ten problem możesz ściągnąć źródła biblioteki SDL_mixer i skompilować je z obsługą mikmod.

    @@ -301,7 +296,7 @@

  • OPCJE - tu możesz zmienić niektóre opcje gry:
    • TRUDNOŚĆ: DUŻA/MAŁA
      • -
    • OPCJE GRAFICZNE - w tym podmenu możesz zmienić rozmiar ekranu w grze
      • +
    • OPCJE GRAFICZNE - w tym podmenu możesz zmienić rozmiar ekranu w grze oraz wybrać tryb pełnoekranowy lub okienkowy
    • USTAWIENIA SZYBKOŚCI - w tym podmenu możesz ustawić szybkość myszy
    • OPCJE DŹWIĘKU - w tym podmenu możesz włączyć lub wyłączyć dźwięk w grze
    diff -Nru cytadela-1.0.1/data/locale/CZECH.loc cytadela-1.1.0/data/locale/CZECH.loc --- cytadela-1.0.1/data/locale/CZECH.loc 2008-10-22 20:44:12.000000000 +0000 +++ cytadela-1.1.0/data/locale/CZECH.loc 2013-01-15 10:43:58.000000000 +0000 @@ -132,6 +132,8 @@ #129@ANO #130@NE #131@AUDIO SETTINGS +#132@FULLSCREEN +#133@WINDOWED *form 098 to 124 every number can have more than one text *they actually MUST HAVE at least 2 texts!! diff -Nru cytadela-1.0.1/data/locale/ENGLISH.loc cytadela-1.1.0/data/locale/ENGLISH.loc --- cytadela-1.0.1/data/locale/ENGLISH.loc 2008-10-22 20:42:03.000000000 +0000 +++ cytadela-1.1.0/data/locale/ENGLISH.loc 2013-01-15 10:38:51.000000000 +0000 @@ -132,6 +132,8 @@ #129@YES #130@NO #131@AUDIO SETTINGS +#132@FULLSCREEN +#133@WINDOWED *form 098 to 124 every number can have more than one text *they actually MUST HAVE at least 2 texts!! diff -Nru cytadela-1.0.1/data/locale/FRENCH.loc cytadela-1.1.0/data/locale/FRENCH.loc --- cytadela-1.0.1/data/locale/FRENCH.loc 2008-10-22 20:44:40.000000000 +0000 +++ cytadela-1.1.0/data/locale/FRENCH.loc 2013-01-15 10:44:11.000000000 +0000 @@ -132,6 +132,8 @@ #129@OUI #130@NON #131@AUDIO SETTINGS +#132@FULLSCREEN +#133@WINDOWED *form 098 to 124 every number can have more than one text *they actually MUST HAVE at least 2 texts!! diff -Nru cytadela-1.0.1/data/locale/GERMAN.loc cytadela-1.1.0/data/locale/GERMAN.loc --- cytadela-1.0.1/data/locale/GERMAN.loc 2008-10-22 20:45:18.000000000 +0000 +++ cytadela-1.1.0/data/locale/GERMAN.loc 2013-01-15 10:44:54.000000000 +0000 @@ -133,6 +133,8 @@ #129@JA #130@NEIN #131@AUDIO OPTIONEN +#132@FULLSCREEN +#133@WINDOWED *form 098 to 124 every number can have more than one text *they actually MUST HAVE at least 2 texts!! Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Centrum.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Centrum.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Centrum.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Centrum.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Elektrownia1.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Elektrownia1.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Elektrownia1.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Elektrownia1.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Elektrownia2.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Elektrownia2.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Elektrownia2.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Elektrownia2.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Elektrownia3.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Elektrownia3.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Elektrownia3.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Elektrownia3.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Hangar1.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Hangar1.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Hangar1.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Hangar1.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Hangar2.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Hangar2.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Hangar2.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Hangar2.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Hangar3.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Hangar3.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Hangar3.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Hangar3.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Kanaly1.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Kanaly1.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Kanaly1.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Kanaly1.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Kanaly2.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Kanaly2.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Kanaly2.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Kanaly2.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Kanaly3.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Kanaly3.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Kanaly3.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Kanaly3.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/KanalyT.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/KanalyT.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/KanalyT.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/KanalyT.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Laboratoria1.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Laboratoria1.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Laboratoria1.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Laboratoria1.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Laboratoria2.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Laboratoria2.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Laboratoria2.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Laboratoria2.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Laboratoria3.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Laboratoria3.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Laboratoria3.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Laboratoria3.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/LaboratoriaT.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/LaboratoriaT.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/LaboratoriaT.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/LaboratoriaT.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Magazyny1.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Magazyny1.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Magazyny1.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Magazyny1.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Magazyny2.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Magazyny2.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Magazyny2.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Magazyny2.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Magazyny3.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Magazyny3.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Magazyny3.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Magazyny3.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/MagazynyT1.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/MagazynyT1.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/MagazynyT1.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/MagazynyT1.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/MagazynyT2.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/MagazynyT2.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/MagazynyT2.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/MagazynyT2.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Podziemia1.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Podziemia1.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Podziemia1.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Podziemia1.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Podziemia2.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Podziemia2.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Podziemia2.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Podziemia2.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/PodziemiaT.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/PodziemiaT.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/PodziemiaT.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/PodziemiaT.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Wiezienie1.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Wiezienie1.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Wiezienie1.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Wiezienie1.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Wiezienie2.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Wiezienie2.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Wiezienie2.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Wiezienie2.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Wiezienie3.3dg and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Wiezienie3.3dg differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/obj/Wiezienie3.3dg.cmf and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/obj/Wiezienie3.3dg.cmf differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/video/intro_en.ogv and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/video/intro_en.ogv differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/video/intro_en.webm and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/video/intro_en.webm differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/video/intro_pl.ogv and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/video/intro_pl.ogv differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/video/intro_pl.webm and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/video/intro_pl.webm differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/video/outro_en.ogv and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/video/outro_en.ogv differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/video/outro_en.webm and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/video/outro_en.webm differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/video/outro_pl.ogv and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/video/outro_pl.ogv differ Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/data/video/outro_pl.webm and /tmp/FAwR1SxgCP/cytadela-1.1.0/data/video/outro_pl.webm differ diff -Nru cytadela-1.0.1/debian/changelog cytadela-1.1.0/debian/changelog --- cytadela-1.0.1/debian/changelog 2011-08-30 03:21:29.000000000 +0000 +++ cytadela-1.1.0/debian/changelog 2013-01-19 11:49:19.000000000 +0000 @@ -1,10 +1,18 @@ -cytadela (1.0.1-1ubuntu1) oneiric; urgency=low +cytadela (1.1.0-1) experimental; urgency=low - * Add 01_fix_lib_order_for_linking.diff to resolve FTBFS. - (LP: #770900) - * debian/{control,rules}: Use dh-autoreconf + * New upstream release + * Bump Standards-Version to 3.9.3 + * Fix lintian helper-templates-in-copyright (Author(s) -> Authors) + * Add a savegame in the source package for testing purposes - -- Daniel T Chen Mon, 29 Aug 2011 23:14:55 -0400 + -- Sylvain Beucler Sat, 19 Jan 2013 12:49:18 +0100 + +cytadela (1.0.1-2) unstable; urgency=low + + * Fix intro and outro videos playback that broke with newer libVLC + (Closes: #698489) + + -- Sylvain Beucler Sat, 19 Jan 2013 12:02:15 +0100 cytadela (1.0.1-1) unstable; urgency=low diff -Nru cytadela-1.0.1/debian/control cytadela-1.1.0/debian/control --- cytadela-1.0.1/debian/control 2011-08-30 03:21:57.000000000 +0000 +++ cytadela-1.1.0/debian/control 2013-01-19 11:36:12.000000000 +0000 @@ -1,11 +1,10 @@ Source: cytadela Section: contrib/games Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Games Team +Maintainer: Debian Games Team Uploaders: Sylvain Beucler -Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, libsdl-mixer1.2-dev, mesa-common-dev, libglu1-mesa-dev, libvlc-dev (>= 1.1), dh-autoreconf -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, libsdl-mixer1.2-dev, mesa-common-dev, libglu1-mesa-dev, libvlc-dev (>= 2.0) +Standards-Version: 3.9.3 Homepage: http://cytadela.sf.net/ Vcs-Git: git://git.debian.org/git/pkg-games/cytadela.git Vcs-Browser: http://git.debian.org/?p=pkg-games/cytadela.git diff -Nru cytadela-1.0.1/debian/copyright cytadela-1.1.0/debian/copyright --- cytadela-1.0.1/debian/copyright 2010-07-02 19:16:41.000000000 +0000 +++ cytadela-1.1.0/debian/copyright 2013-01-19 11:37:48.000000000 +0000 @@ -34,7 +34,7 @@ in 'main' as soon as the original data goes in 'main'. -Upstream Author(s): +Upstream Authors: Tomasz Kaźmierczak Kamil Pawłowski @@ -52,7 +52,7 @@ Copyright: - Copyright (C) 2003-2010 Tomasz Kaźmierczak + Copyright (C) 2003-2013 Tomasz Kaźmierczak Copyright (C) 2006 Kamil Pawłowski Copyright (C) 2009 Marcin Sękalski Copyright (C) 2009 Tomasz Wiśniewski @@ -85,6 +85,6 @@ The Debian packaging is: - Copyright (C) 2010 Sylvain Beucler + Copyright (C) 2010, 2013 Sylvain Beucler and is licensed under the GPL version 3, see above. diff -Nru cytadela-1.0.1/debian/patches/01_fix_lib_order_for_linking.diff cytadela-1.1.0/debian/patches/01_fix_lib_order_for_linking.diff --- cytadela-1.0.1/debian/patches/01_fix_lib_order_for_linking.diff 2011-08-30 03:20:34.000000000 +0000 +++ cytadela-1.1.0/debian/patches/01_fix_lib_order_for_linking.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -Index: cytadela-1.0.1/src/Makefile.am -=================================================================== ---- cytadela-1.0.1.orig/src/Makefile.am 2011-08-29 23:20:16.000000000 -0400 -+++ cytadela-1.0.1/src/Makefile.am 2011-08-29 23:20:30.000000000 -0400 -@@ -9,5 +9,5 @@ - CCytadelaMain.cpp CCytadelaMenu.cpp CytadelaSaveFile.cpp CInfoText.cpp \ - COGLClass.cpp CSDLClass.cpp farread.cpp GameControl.cpp \ - Localization.cpp UsableItem.cpp videoplayer.cpp main.cpp --cytadela_LDFLAGS = $(SDL_LIBS) -lGL -lGLU -lvlc -+cytadela_LDADD = $(SDL_LIBS) -lGL -lGLU -lvlc - DEFS = -DDATADIR=\"$(datadir)/cytadela\" diff -Nru cytadela-1.0.1/debian/patches/series cytadela-1.1.0/debian/patches/series --- cytadela-1.0.1/debian/patches/series 2011-08-30 03:20:09.000000000 +0000 +++ cytadela-1.1.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -01_fix_lib_order_for_linking.diff diff -Nru cytadela-1.0.1/debian/rules cytadela-1.1.0/debian/rules --- cytadela-1.0.1/debian/rules 2011-08-30 03:14:50.000000000 +0000 +++ cytadela-1.1.0/debian/rules 2013-01-13 21:43:36.000000000 +0000 @@ -18,7 +18,7 @@ %: - dh $@ --with autoreconf + dh $@ override_dh_auto_configure: dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games diff -Nru cytadela-1.0.1/debian/source/include-binaries cytadela-1.1.0/debian/source/include-binaries --- cytadela-1.0.1/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ cytadela-1.1.0/debian/source/include-binaries 2013-01-19 11:53:34.000000000 +0000 @@ -0,0 +1 @@ +debian/tests/sav diff -Nru cytadela-1.0.1/debian/tests/README cytadela-1.1.0/debian/tests/README --- cytadela-1.0.1/debian/tests/README 1970-01-01 00:00:00.000000000 +0000 +++ cytadela-1.1.0/debian/tests/README 2013-01-19 11:48:35.000000000 +0000 @@ -0,0 +1,3 @@ +Put this savegame in '~/.cytadela/sav'. + +In particular, slot 3 allows testing the ending video playback. Binary files /tmp/tTycKDGYQJ/cytadela-1.0.1/debian/tests/sav and /tmp/FAwR1SxgCP/cytadela-1.1.0/debian/tests/sav differ diff -Nru cytadela-1.0.1/src/CCytadelaConfig.cpp cytadela-1.1.0/src/CCytadelaConfig.cpp --- cytadela-1.0.1/src/CCytadelaConfig.cpp 2009-03-28 10:10:55.000000000 +0000 +++ cytadela-1.1.0/src/CCytadelaConfig.cpp 2013-01-15 10:26:51.000000000 +0000 @@ -1,9 +1,6 @@ /* File name: CCytadelaConfig.cpp - Copyright: (C) 2006 - 2008 Tomasz Kazmierczak - - Creation date: 14.09.2006 17:27 - Last modification date: 22.10.2008 + Copyright: (C) 2006 - 2013 Tomasz Kazmierczak This file is part of Cytadela @@ -226,6 +223,14 @@ mAudioStatus = false; else mAudioStatus = true; + //get the fullscreen status + entry.setName("fullscreen"); + text[0] = 0; + entry.readValue(text, configuration, sizeof(text)); + if(strcmp(text, "no") == 0) + mFullScreen = false; + else mFullScreen = true; + mInitialized = true; } @@ -244,6 +249,7 @@ configFile << "mouse_speed=" << mMouseSpeed << ';' << endl; configFile << "language=\"" << mLocalization << "\";" << endl; configFile << "audio=" << (mAudioStatus ? "\"yes\"" : "\"no\"") << ';' << endl; + configFile << "fullscreen=" << (mFullScreen ? "\"yes\"" : "\"no\"") << ';' << endl; configFile.close(); } @@ -261,7 +267,7 @@ assert(mInitialized); if(strlen(localization) < FILENAME_MAX) - sprintf(mLocalization, localization); + sprintf(mLocalization, "%s", localization); } void CCytadelaConfig::setNextGameSpeed() diff -Nru cytadela-1.0.1/src/CCytadelaConfig.h cytadela-1.1.0/src/CCytadelaConfig.h --- cytadela-1.0.1/src/CCytadelaConfig.h 2009-03-28 10:10:59.000000000 +0000 +++ cytadela-1.1.0/src/CCytadelaConfig.h 2013-01-15 10:06:27.000000000 +0000 @@ -1,9 +1,6 @@ /* File name: CCytadelaConfig.h - Copyright: (C) 2006 - 2008 Tomasz Kazmierczak - - Creation date: 14.09.2006 17:29 - Last modification date: 22.10.2008 + Copyright: (C) 2006 - 2013 Tomasz Kazmierczak This file is part of Cytadela @@ -36,6 +33,7 @@ float mMouseSpeed; char mLocalization[FILENAME_MAX]; bool mDifficult; + bool mFullScreen; //other variables //game speed related int32_t mGameSpeedSetting; @@ -66,12 +64,14 @@ float getGameSpeed() { return mGameSpeed; } float getMouseSpeed() { return mMouseSpeed; } bool getAudioStatus() { return mAudioStatus; } + bool isFullScreen() { return mFullScreen; } //set settings void setScreenSize(int32_t width, int32_t height); void setLocalization(char *localization); void setDifficult(bool status) { mDifficult = status; } bool changeAudioStatus() { mAudioStatus = not mAudioStatus; return mAudioStatus; } + bool toggleFullScreen() { mFullScreen = not mFullScreen; return mFullScreen; } //other functions void setNextGameSpeed(); diff -Nru cytadela-1.0.1/src/CCytadelaMain.cpp cytadela-1.1.0/src/CCytadelaMain.cpp --- cytadela-1.0.1/src/CCytadelaMain.cpp 2010-05-03 10:32:27.000000000 +0000 +++ cytadela-1.1.0/src/CCytadelaMain.cpp 2013-01-15 10:51:31.000000000 +0000 @@ -1,6 +1,6 @@ /* File name: CCytadelaMain.cpp - Copyright: (C) 2005 - 2010 Tomasz Kazmierczak + Copyright: (C) 2005 - 2013 Tomasz Kazmierczak This file is part of Cytadela @@ -156,7 +156,7 @@ fprintf(stdout, "------------------------------------------------------------\n"); fprintf(stdout, "Reading the OpenGL vrsion and extensions... \n"); //switch to OpenGL mode to check the version - if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, MODE_3D)) { + if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, CSDLClass::Mode3D)) { fprintf(stdout, "\nError: Could not initialize OpenGL!\nExiting...\n"); return false; } @@ -168,7 +168,11 @@ fprintf(stdout, "Done\n"); fprintf(stdout, "Switching to 2D video mode... "); //now switch to the 2D mode - if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, MODE_2D)) { + CSDLClass::ScreenMode smode; + if(CCytadelaConfig::instance()->isFullScreen()) + smode = CSDLClass::FullScreen; + else smode = CSDLClass::Windowed; + if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, CSDLClass::Mode2D, smode)) { fprintf(stdout, "\nError: Could not initialize SDL Video mode!\nExiting...\n"); return false; } @@ -357,7 +361,7 @@ return false; } if(key == SDLK_RETURN) { - sprintf(localizationName, entryNames[chosenLocalization].c_str()); + sprintf(localizationName, "%s", entryNames[chosenLocalization].c_str()); break; } if(key == SDLK_UP) { @@ -586,7 +590,7 @@ mSDL->playMusic(-1); //display text char text[40]; - sprintf(text, mSaveNames[mLevel]); + sprintf(text, "%s", mSaveNames[mLevel]); char levelNum = text[strlen(text) - 1]; text[strlen(text) - 1] = 0; sprintf(text, "%s%s %c %s!", text, mLocalization->getText(LOC_END_LEVEL), @@ -977,8 +981,8 @@ bool ok; if(strcmp(mLocalization->getCurrentLocalization(), CYTADELA_DEFAULT_LOCALIZATION) == 0) - ok = mSDL->playVideo("video/intro_pl.ogv", true, true); - else ok = mSDL->playVideo("video/intro_en.ogv", true, true); + ok = mSDL->playVideo("video/intro_pl.webm", true, true); + else ok = mSDL->playVideo("video/intro_en.webm", true, true); if(not ok) return false; @@ -1001,8 +1005,8 @@ bool ok; if(strcmp(mLocalization->getCurrentLocalization(), CYTADELA_DEFAULT_LOCALIZATION) == 0) - ok = mSDL->playVideo("video/outro_pl.ogv", false, false); - else ok = mSDL->playVideo("video/outro_en.ogv", false, false); + ok = mSDL->playVideo("video/outro_pl.webm", false, false); + else ok = mSDL->playVideo("video/outro_en.webm", false, false); if(not ok) return false; @@ -1165,8 +1169,8 @@ //check the configuration that might have changed in the menu const int32_t *screenSize = config->getScreenSize(); mState.difficult = config->isDifficult(); - if(not mSDL->switchVideoMode(screenSize[0], screenSize[1], MODE_3D)) { - if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, MODE_2D)) + if(not mSDL->switchVideoMode(screenSize[0], screenSize[1], CSDLClass::Mode3D)) { + if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, CSDLClass::Mode2D)) break; //display information about the error that occured if(not errorScreen("ERROR WHILE SETTING VIDEO MODE!")) @@ -1175,7 +1179,7 @@ } if(not openGL.initOGL(screenSize[0], screenSize[1])) { openGL.freeOGL(); - if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, MODE_2D)) + if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, CSDLClass::Mode2D)) break; //display information about the error that occured if(not errorScreen("ERROR WHILE INITIALIZING OPENGL!")) @@ -1186,7 +1190,7 @@ not game.runGame(mLevels[mLevel], &mState)) { game.freeGame(); openGL.freeOGL(); - if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, MODE_2D)) + if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, CSDLClass::Mode2D)) break; //display information about the error that occured if(not errorScreen(game.getLastErrorDesc())) @@ -1195,7 +1199,7 @@ } game.freeGame(); openGL.freeOGL(); - if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, MODE_2D)) + if(not mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, CSDLClass::Mode2D)) break; mSDL->blackScreen(); diff -Nru cytadela-1.0.1/src/CCytadelaMenu.cpp cytadela-1.1.0/src/CCytadelaMenu.cpp --- cytadela-1.0.1/src/CCytadelaMenu.cpp 2010-06-29 19:35:55.000000000 +0000 +++ cytadela-1.1.0/src/CCytadelaMenu.cpp 2013-01-15 10:54:45.000000000 +0000 @@ -1,6 +1,6 @@ /* File name: CCytadelaMenu.cpp - Copyright: (C) 2004 - 2010 Tomasz Kazmierczak + Copyright: (C) 2004 - 2013 Tomasz Kazmierczak This file is part of Cytadela (an example of how NOT to design in-game menu) @@ -32,26 +32,26 @@ //menu texts and text positions //MAIN MENU const char *text = mLocalization->getText(LOC_MENU_START); - sprintf(mMenuTexts[MENU_MAIN][0], text); + sprintf(mMenuTexts[MENU_MAIN][0], "%s", text); mMenuTextsXOffs[MENU_MAIN][0] = 120 - (strlen(text) * 8); text = mLocalization->getText(LOC_MENU_LOAD); - sprintf(mMenuTexts[MENU_MAIN][1], text); + sprintf(mMenuTexts[MENU_MAIN][1], "%s", text); mMenuTextsXOffs[MENU_MAIN][1] = 120 - (strlen(text) * 8); text = mLocalization->getText(LOC_MENU_OPTIONS); - sprintf(mMenuTexts[MENU_MAIN][2], text); + sprintf(mMenuTexts[MENU_MAIN][2], "%s", text); mMenuTextsXOffs[MENU_MAIN][2] = 120 - (strlen(text) * 8); text = mLocalization->getText(LOC_MENU_TRAINING); - sprintf(mMenuTexts[MENU_MAIN][3], text); + sprintf(mMenuTexts[MENU_MAIN][3], "%s", text); mMenuTextsXOffs[MENU_MAIN][3] = 120 - (strlen(text) * 8); mMenuTexts[MENU_MAIN][4][0] = 0; mMenuTextsXOffs[MENU_MAIN][4] = 0; text = mLocalization->getText(LOC_MENU_INFO); - sprintf(mMenuTexts[MENU_MAIN][5], text); + sprintf(mMenuTexts[MENU_MAIN][5], "%s", text); mMenuTextsXOffs[MENU_MAIN][5] = 120 - (strlen(text) * 8); //LOAD MENU @@ -61,7 +61,7 @@ mMenuTexts[MENU_LOAD][i][0] = 0; } text = mLocalization->getText(LOC_MENU_MENU); - sprintf(mMenuTexts[MENU_LOAD][5], text); + sprintf(mMenuTexts[MENU_LOAD][5], "%s", text); mMenuTextsXOffs[MENU_LOAD][5] = 120 - (strlen(text) * 8); //OPTIONS menu @@ -69,47 +69,47 @@ mMenuTexts[MENU_SETTINGS][0][0] = 0; text = mLocalization->getText(LOC_MENU_VIDEO_OPTIONS); - sprintf(mMenuTexts[MENU_SETTINGS][1], text); + sprintf(mMenuTexts[MENU_SETTINGS][1], "%s", text); mMenuTextsXOffs[MENU_SETTINGS][1] = 120 - (strlen(text) * 8); text = mLocalization->getText(LOC_MENU_SPEED_SETTINGS); - sprintf(mMenuTexts[MENU_SETTINGS][2], text); + sprintf(mMenuTexts[MENU_SETTINGS][2], "%s", text); mMenuTextsXOffs[MENU_SETTINGS][2] = 120 - (strlen(text) * 8); text = mLocalization->getText(LOC_MENU_AUDIO_SETTINGS); - sprintf(mMenuTexts[MENU_SETTINGS][3], text); + sprintf(mMenuTexts[MENU_SETTINGS][3], "%s", text); mMenuTextsXOffs[MENU_SETTINGS][3] = 120 - (strlen(text) * 8); mMenuTextsXOffs[MENU_SETTINGS][4] = 0; mMenuTexts[MENU_SETTINGS][4][0] = 0; text = mLocalization->getText(LOC_MENU_MENU); - sprintf(mMenuTexts[MENU_SETTINGS][5], text); + sprintf(mMenuTexts[MENU_SETTINGS][5], "%s", text); mMenuTextsXOffs[MENU_SETTINGS][5] = 120 - (strlen(text) * 8); //TRAINING MENU text = mLocalization->getText(LOC_MENU_TRAINING_1); - sprintf(mMenuTexts[MENU_TRAINING][0], text); + sprintf(mMenuTexts[MENU_TRAINING][0], "%s", text); mMenuTextsXOffs[MENU_TRAINING][0] = 120 - (strlen(text) * 8); text = mLocalization->getText(LOC_MENU_TRAINING_2); - sprintf(mMenuTexts[MENU_TRAINING][1], text); + sprintf(mMenuTexts[MENU_TRAINING][1], "%s", text); mMenuTextsXOffs[MENU_TRAINING][1] = 120 - (strlen(text) * 8); text = mLocalization->getText(LOC_MENU_TRAINING_3); - sprintf(mMenuTexts[MENU_TRAINING][2], text); + sprintf(mMenuTexts[MENU_TRAINING][2], "%s", text); mMenuTextsXOffs[MENU_TRAINING][2] = 120 - (strlen(text) * 8); text = mLocalization->getText(LOC_MENU_TRAINING_4); - sprintf(mMenuTexts[MENU_TRAINING][3], text); + sprintf(mMenuTexts[MENU_TRAINING][3], "%s", text); mMenuTextsXOffs[MENU_TRAINING][3] = 120 - (strlen(text) * 8); text = mLocalization->getText(LOC_MENU_TRAINING_5); - sprintf(mMenuTexts[MENU_TRAINING][4], text); + sprintf(mMenuTexts[MENU_TRAINING][4], "%s", text); mMenuTextsXOffs[MENU_TRAINING][4] = 120 - (strlen(text) * 8); text = mLocalization->getText(LOC_MENU_MENU); - sprintf(mMenuTexts[MENU_TRAINING][5], text); + sprintf(mMenuTexts[MENU_TRAINING][5], "%s", text); mMenuTextsXOffs[MENU_TRAINING][5] = 120 - (strlen(text) * 8); //GFX OPTIONS menu @@ -118,7 +118,7 @@ mMenuTexts[MENU_VIDEO][i][0] = 0; } text = mLocalization->getText(LOC_MENU_MENU); - sprintf(mMenuTexts[MENU_VIDEO][5], text); + sprintf(mMenuTexts[MENU_VIDEO][5], "%s", text); mMenuTextsXOffs[MENU_VIDEO][5] = 120 - (strlen(text) * 8); //GAME SPEED menu @@ -127,7 +127,7 @@ mMenuTexts[MENU_GAME_SPEED][i][0] = 0; } text = mLocalization->getText(LOC_MENU_MENU); - sprintf(mMenuTexts[MENU_GAME_SPEED][5], text); + sprintf(mMenuTexts[MENU_GAME_SPEED][5], "%s", text); mMenuTextsXOffs[MENU_GAME_SPEED][5] = 120 - (strlen(text) * 8); //AUDIO SETTINGS menu @@ -136,14 +136,14 @@ mMenuTexts[MENU_AUDIO][i][0] = 0; } text = mLocalization->getText(LOC_MENU_MENU); - sprintf(mMenuTexts[MENU_AUDIO][5], text); + sprintf(mMenuTexts[MENU_AUDIO][5], "%s", text); mMenuTextsXOffs[MENU_AUDIO][5] = 120 - (strlen(text) * 8); //set the info texts static const char *defaultLang = " ...CYTADELA...\n" -" WERSJA 1.0.1\n" -" COPYRIGHT (C) 2003-2010 TOMASZ KAxMIERCZAK\n" +" WERSJA 1.1.0\n" +" COPYRIGHT (C) 2003-2013 TOMASZ KAxMIERCZAK\n" " COPYRIGHT (C) 2006 KAMIL PAWlOWSKI\n" " COPYRIGHT (C) 2009 MARCIN SeKALSKI\n" " COPYRIGHT (C) 2009 TOMASZ WIsNIEWSKI\n\n" @@ -208,8 +208,8 @@ static const char *otherLang = " ...CYTADELA...\n" -" VERSION 1.0.1\n" -" COPYRIGHT (C) 2003-2010 TOMASZ KAxMIERCZAK\n" +" VERSION 1.1.0\n" +" COPYRIGHT (C) 2003-2013 TOMASZ KAxMIERCZAK\n" " COPYRIGHT (C) 2006 KAMIL PAWlOWSKI\n" " COPYRIGHT (C) 2009 MARCIN SeKALSKI\n" " COPYRIGHT (C) 2009 TOMASZ WIsNIEWSKI\n\n" @@ -302,7 +302,7 @@ //fill the LOAD menu with savenames for(int32_t i = 0; i < 5; ++i) - sprintf(mMenuTexts[MENU_LOAD][i], saveNames[i]); + sprintf(mMenuTexts[MENU_LOAD][i], "%s", saveNames[i]); //fill the config-dependant menu positions //OPTIONS MENU @@ -311,13 +311,19 @@ if(mConfig->isDifficult()) text = mLocalization->getText(LOC_MENU_DIFFICULTY_HARD); else text = mLocalization->getText(LOC_MENU_DIFFICULTY_EASY); - sprintf(mMenuTexts[MENU_SETTINGS][0], text); + sprintf(mMenuTexts[MENU_SETTINGS][0], "%s", text); mMenuTextsXOffs[MENU_SETTINGS][0] = 120 - (strlen(text) * 8); //screen size const int32_t *screenSize = mConfig->getScreenSize(); sprintf(textBuffer, "%dX%d", screenSize[0], screenSize[1]); - sprintf(mMenuTexts[MENU_VIDEO][0], textBuffer); + sprintf(mMenuTexts[MENU_VIDEO][0], "%s", textBuffer); mMenuTextsXOffs[MENU_VIDEO][0] = 120 - (strlen(textBuffer) * 8); + //fullscreen setting + if(mConfig->isFullScreen()) + text = mLocalization->getText(LOC_MENU_FULLSCREEN); + else text = mLocalization->getText(LOC_MENU_WINDOWED); + sprintf(mMenuTexts[MENU_VIDEO][1], "%s", text); + mMenuTextsXOffs[MENU_VIDEO][1] = 120 - (strlen(text) * 8); //SPEED SETTINGS menu //get the game speed setting from the config - not used any more @@ -334,7 +340,7 @@ //audio settings bool audio = mConfig->getAudioStatus(); - sprintf(mMenuTexts[MENU_AUDIO][0], audio ? mLocalization->getText(LOC_YES) : mLocalization->getText(LOC_NO)); + sprintf(mMenuTexts[MENU_AUDIO][0], "%s", audio ? mLocalization->getText(LOC_YES) : mLocalization->getText(LOC_NO)); mMenuTextsXOffs[MENU_AUDIO][0] = 120 - (strlen(mMenuTexts[MENU_AUDIO][0]) * 8); //at the begining we are in main menu on the first position @@ -427,7 +433,7 @@ text = mLocalization->getText(LOC_MENU_DIFFICULTY_HARD); else text = mLocalization->getText(LOC_MENU_DIFFICULTY_EASY); - sprintf(mMenuTexts[MENU_SETTINGS][0], text); + sprintf(mMenuTexts[MENU_SETTINGS][0], "%s", text); mMenuTextsXOffs[MENU_SETTINGS][0] = 120 - (strlen(text) * 8); updateMenuScreen(); break; @@ -476,6 +482,8 @@ case MENU_VIDEO: { if(mSelItem == 0) changeScreenSize(); + if(mSelItem == 1) + toggleFullScreen(); if(mSelItem == 5) { mMenu = MENU_SETTINGS; mSelItem = 1; @@ -557,6 +565,21 @@ updateMenuScreen(); } +void CCytadelaMenu::toggleFullScreen() +{ + const char *text; + if(mConfig->toggleFullScreen()) { + mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, CSDLClass::Mode2D, CSDLClass::FullScreen); + text = mLocalization->getText(LOC_MENU_FULLSCREEN); + } else { + mSDL->switchVideoMode(CSDL_DEFAULT_SCREEN_W, CSDL_DEFAULT_SCREEN_H, CSDLClass::Mode2D, CSDLClass::Windowed); + text = mLocalization->getText(LOC_MENU_WINDOWED); + } + sprintf(mMenuTexts[MENU_VIDEO][1], "%s", text); + mMenuTextsXOffs[MENU_VIDEO][1] = 120 - (strlen(text) * 8); + updateMenuScreen(); +} + void CCytadelaMenu::changeGameSpeed() { mConfig->setNextGameSpeed(); @@ -578,7 +601,7 @@ void CCytadelaMenu::changeAudioStatus() { bool audio = mConfig->changeAudioStatus(); - sprintf(mMenuTexts[MENU_AUDIO][0], audio ? mLocalization->getText(LOC_YES) : mLocalization->getText(LOC_NO)); + sprintf(mMenuTexts[MENU_AUDIO][0], "%s", audio ? mLocalization->getText(LOC_YES) : mLocalization->getText(LOC_NO)); mMenuTextsXOffs[MENU_AUDIO][0] = 120 - (strlen(mMenuTexts[MENU_AUDIO][0]) * 8); updateMenuScreen(); diff -Nru cytadela-1.0.1/src/CCytadelaMenu.h cytadela-1.1.0/src/CCytadelaMenu.h --- cytadela-1.0.1/src/CCytadelaMenu.h 2009-05-24 17:22:57.000000000 +0000 +++ cytadela-1.1.0/src/CCytadelaMenu.h 2013-01-15 09:50:33.000000000 +0000 @@ -1,9 +1,6 @@ /* File name: CCytadelaMenu.h - Copyright: (C) 2004 - 2008 Tomasz Kazmierczak - - Creation date: 24.08.2004 - Last modification date: 20.11.2008 + Copyright: (C) 2004 - 2013 Tomasz Kazmierczak This file is part of Cytadela (an example of how NOT to design in-game menu) @@ -100,6 +97,7 @@ void initInfo(); void displayInfo(); void changeScreenSize(); + void toggleFullScreen(); void changeGameSpeed(); void changeMouseSpeed(); void changeAudioStatus(); diff -Nru cytadela-1.0.1/src/COGLClass.cpp cytadela-1.1.0/src/COGLClass.cpp --- cytadela-1.0.1/src/COGLClass.cpp 2009-11-01 19:12:53.000000000 +0000 +++ cytadela-1.1.0/src/COGLClass.cpp 2013-01-15 22:52:40.000000000 +0000 @@ -1,9 +1,6 @@ /* File name: COGLClass.cpp - Copyright: (C) 2005 - 2009 Tomasz Kazmierczak - - Creation date: 18.07.2005 15:48 - Last modification date: 01.11.2009 + Copyright: (C) 2005 - 2013 Tomasz Kazmierczak This file is part of Cytadela @@ -63,7 +60,7 @@ //fog glEnable(GL_FOG); glFogi(GL_FOG_MODE, GL_EXP2); - glFogf(GL_FOG_DENSITY, 0.0006f); + glFogf(GL_FOG_DENSITY, 0.0007f); float color[] = {0.188f, 0.188f, 0.188f, 1.0f}; glFogfv(GL_FOG_COLOR, color); glHint(GL_FOG_HINT, GL_NICEST); @@ -404,23 +401,24 @@ void COGLClass::drawMeshes() { //floor and celling (render 'em here 'cause they wouldn't pass the visiblity test - //in some cases and they should be visible always); they will be re-rendered in - //the opaque meshes rendering loop, but it's ok - MeshBase3Dg *base = mObjects->meshes[0]->getBase(); + //in some cases and they should be visible always) + MeshBase3Dg *floorBase = mObjects->meshes[0]->getBase(); setTextures(mObjects->meshes[0]); - glVertexPointer(3, GL_FLOAT, 0, base->getVCoordsStream()); - glDrawArrays(GL_TRIANGLES, 0, base->getTriansQuantity() * 3); + glVertexPointer(3, GL_FLOAT, 0, floorBase->getVCoordsStream()); + glDrawArrays(GL_TRIANGLES, 0, floorBase->getTriansQuantity() * 3); - base = mObjects->meshes[1]->getBase(); + MeshBase3Dg *ceilingBase = mObjects->meshes[1]->getBase(); setTextures(mObjects->meshes[1]); - glVertexPointer(3, GL_FLOAT, 0, base->getVCoordsStream()); - glDrawArrays(GL_TRIANGLES, 0, base->getTriansQuantity() * 3); + glVertexPointer(3, GL_FLOAT, 0, ceilingBase->getVCoordsStream()); + glDrawArrays(GL_TRIANGLES, 0, ceilingBase->getTriansQuantity() * 3); for(Mesh3DgList::iterator i = mOpaqueMeshes.begin(); i != mOpaqueMeshes.end(); i++) { Mesh3Dg *mesh = *i; + MeshBase3Dg *base = mesh->getBase(); + if(base == floorBase or base == ceilingBase) + continue; if(not mesh->getProperty(MRP_HAS_BASE) or not mesh->getProperty(MRP_RENDERABLE)) continue; - base = mesh->getBase(); //visiblity test const Point3Dg *firstVertexCoords = base->getVCoordsStream(); //move back the camera cords a little to avoid culling objects that are @@ -451,7 +449,7 @@ Mesh3Dg *mesh = *i; if(not mesh->getProperty(MRP_HAS_BASE) or not mesh->getProperty(MRP_RENDERABLE)) continue; - base = mesh->getBase(); + MeshBase3Dg *base = mesh->getBase(); //visiblity test const Point3Dg *firstVertexCoords = base->getVCoordsStream(); float fVx = mesh->translation.r4c1 + firstVertexCoords->x - (mX - 110.0f * mSin); @@ -924,7 +922,7 @@ if(osdTextLen + newChars > 127) return; mIncomingChars += newChars; - sprintf(&mOSDText[osdTextLen], text); + sprintf(&mOSDText[osdTextLen], "%s", text); mTextScrollSpeed = 0.4f; } diff -Nru cytadela-1.0.1/src/CSDLClass.cpp cytadela-1.1.0/src/CSDLClass.cpp --- cytadela-1.0.1/src/CSDLClass.cpp 2010-05-05 17:37:40.000000000 +0000 +++ cytadela-1.1.0/src/CSDLClass.cpp 2013-01-15 10:50:44.000000000 +0000 @@ -1,6 +1,6 @@ /* File name: CSDLClass.cpp - Copyright: (C) 2005 - 2010 Tomasz Kazmierczak + Copyright: (C) 2005 - 2013 Tomasz Kazmierczak This file is part of Cytadela @@ -33,7 +33,7 @@ CSDLClass::CSDLClass() : mScreen(0), mJoystick(0), mMusic(0), mAudioAvailable(false), mAudioEnabled(true), mLoadedSoundsCount(0), mMenuMouseXPos(0), mMenuMouseYPos(0), mLastMouseInputTime(0), mLastJoyInputTime(0), mScreenSizesCount(0), - mScreenSizes(0) + mScreenSizes(0), mScreenMode(FullScreen) { memset(mSounds, 0, sizeof(mSounds)); } @@ -66,12 +66,14 @@ {{"800", "600"}, {800, 600}, true}, {{"1024", "768"}, {1024, 768}, true}, {{"1152", "864"}, {1152, 864}, true}, + {{"1280", "720"}, {1280, 720}, true}, {{"1280", "800"}, {1280, 800}, true}, {{"1280", "960"}, {1280, 960}, true}, {{"1280", "1024"}, {1280, 1024}, true}, {{"1366", "768"}, {1366, 768}, true}, {{"1600", "1024"}, {1600, 1024}, true}, {{"1600", "1200"}, {1600, 1200}, true}, + {{"1920", "1080"}, {1920, 1080}, true}, {{"1920", "1200"}, {1920, 1200}, true}, {{"2048", "1536"}, {2048, 1536}, true}}; bool anySizeAvailable = false; @@ -95,10 +97,7 @@ } mScreenSizes = sizes; -#if not defined(DEBUG) SDL_ShowCursor(SDL_DISABLE); - SDL_WM_GrabInput(SDL_GRAB_ON); -#endif //if there is a joystick then we enable it's events and open it mJoystick = 0; @@ -118,20 +117,21 @@ return true; } -bool CSDLClass::switchVideoMode(int32_t width, int32_t height, VideoMode mode) +bool CSDLClass::switchVideoMode(int32_t width, int32_t height, VideoMode vmode, ScreenMode smode) { -#if defined(DEBUG) + if(smode != NoChange) + mScreenMode = smode; + uint32_t flags = SDL_HWSURFACE; -#else - uint32_t flags = SDL_HWSURFACE | SDL_FULLSCREEN; -#endif + if(mScreenMode == FullScreen) + flags |= SDL_FULLSCREEN; - switch(mode) { - case MODE_2D: { + switch(vmode) { + case Mode2D: { flags |= SDL_DOUBLEBUF; break; } - case MODE_3D: { + case Mode3D: { //attribs for OGL SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); diff -Nru cytadela-1.0.1/src/CSDLClass.h cytadela-1.1.0/src/CSDLClass.h --- cytadela-1.0.1/src/CSDLClass.h 2010-05-03 10:07:01.000000000 +0000 +++ cytadela-1.1.0/src/CSDLClass.h 2013-01-15 10:50:02.000000000 +0000 @@ -1,6 +1,6 @@ /* File name: CSDLClass.h - Copyright: (C) 2005 - 2010 Tomasz Kazmierczak + Copyright: (C) 2005 - 2013 Tomasz Kazmierczak This file is part of Cytadela @@ -34,11 +34,6 @@ #define CSDL_LOAD_SOUND_FAILED -1 #define CSDL_AUDIO_NOT_INITIALIZED -2 -enum VideoMode { - MODE_2D, //2D hw surface - MODE_3D //OpenGL -}; - class ScreenSize { public: const char *resolutionString[2]; @@ -91,6 +86,10 @@ #define MAX_SOUNDS_COUNT 25 class CSDLClass { +public: + enum VideoMode { Mode2D, Mode3D }; + enum ScreenMode { FullScreen, Windowed, NoChange }; + private: SDL_Surface *mScreen; SDL_Joystick *mJoystick; @@ -104,8 +103,9 @@ uint32_t mLastMouseInputTime; uint32_t mLastJoyInputTime; - int32_t mScreenSizesCount; - ScreenSize *mScreenSizes; + int32_t mScreenSizesCount; + ScreenSize *mScreenSizes; + ScreenMode mScreenMode; CSDLClass(); ~CSDLClass() { free(); } @@ -117,7 +117,7 @@ //init/free bool init(); void free(); - bool switchVideoMode(int32_t width, int32_t height, VideoMode mode); + bool switchVideoMode(int32_t width, int32_t height, VideoMode vmode, ScreenMode smode = NoChange); //input void delayInput(); diff -Nru cytadela-1.0.1/src/Localization.cpp cytadela-1.1.0/src/Localization.cpp --- cytadela-1.0.1/src/Localization.cpp 2009-03-28 10:12:59.000000000 +0000 +++ cytadela-1.1.0/src/Localization.cpp 2013-01-15 10:27:49.000000000 +0000 @@ -1,9 +1,6 @@ /* File name: Localization.cpp - Copyright: (C) 2006 - 2008 Tomasz Kazmierczak - - Creation date: 02.06.2006 - Last modification date: 22.10.2008 + Copyright: (C) 2006 - 2013 Tomasz Kazmierczak This file is part of Cytadela @@ -75,6 +72,10 @@ mLocalizedTexts[LOC_MENU_DIFFICULTY_EASY] = "TRUDNOsc MAlA"; if(not mLocalizationAvailable[LOC_MENU_VIDEO_OPTIONS]) mLocalizedTexts[LOC_MENU_VIDEO_OPTIONS] = "OPCJE GRAFICZNE"; + if(not mLocalizationAvailable[LOC_MENU_FULLSCREEN]) + mLocalizedTexts[LOC_MENU_FULLSCREEN] = "PElNY EKRAN"; + if(not mLocalizationAvailable[LOC_MENU_WINDOWED]) + mLocalizedTexts[LOC_MENU_WINDOWED] = "OKNO"; if(not mLocalizationAvailable[LOC_MENU_SPEED_SETTINGS]) mLocalizedTexts[LOC_MENU_SPEED_SETTINGS] = "UST. SZYBKOsCI"; @@ -591,7 +592,7 @@ //chosen language setDefaultLocalization(); //set the current localization name - sprintf(mCurrentLocalization, localization); + sprintf(mCurrentLocalization, "%s", localization); return true; } diff -Nru cytadela-1.0.1/src/Localization.h cytadela-1.1.0/src/Localization.h --- cytadela-1.0.1/src/Localization.h 2009-03-28 10:13:02.000000000 +0000 +++ cytadela-1.1.0/src/Localization.h 2013-01-15 10:38:21.000000000 +0000 @@ -1,9 +1,6 @@ /* File name: Localization.h - Copyright: (C) 2006 - 2008 Tomasz Kazmierczak - - Creation date: 02.06.2006 - Last modification date: 22.10.2008 + Copyright: (C) 2006 - 2013 Tomasz Kazmierczak This file is part of Cytadela @@ -169,6 +166,8 @@ LOC_YES, LOC_NO, LOC_MENU_AUDIO_SETTINGS, + LOC_MENU_FULLSCREEN, + LOC_MENU_WINDOWED, LOCALIZED_TEXTS_COUNT } LocalizedTexts; diff -Nru cytadela-1.0.1/src/Makefile.am cytadela-1.1.0/src/Makefile.am --- cytadela-1.0.1/src/Makefile.am 2010-05-03 09:13:41.000000000 +0000 +++ cytadela-1.1.0/src/Makefile.am 2013-01-15 15:36:22.000000000 +0000 @@ -9,5 +9,5 @@ CCytadelaMain.cpp CCytadelaMenu.cpp CytadelaSaveFile.cpp CInfoText.cpp \ COGLClass.cpp CSDLClass.cpp farread.cpp GameControl.cpp \ Localization.cpp UsableItem.cpp videoplayer.cpp main.cpp -cytadela_LDFLAGS = $(SDL_LIBS) -lGL -lGLU -lvlc +cytadela_LDADD = $(SDL_LIBS) -lGL -lGLU -lvlc DEFS = -DDATADIR=\"$(datadir)/cytadela\" diff -Nru cytadela-1.0.1/src/Makefile.in cytadela-1.1.0/src/Makefile.in --- cytadela-1.0.1/src/Makefile.in 2010-05-04 19:36:10.000000000 +0000 +++ cytadela-1.1.0/src/Makefile.in 2013-01-15 15:36:45.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,9 +72,8 @@ farread.$(OBJEXT) GameControl.$(OBJEXT) Localization.$(OBJEXT) \ UsableItem.$(OBJEXT) videoplayer.$(OBJEXT) main.$(OBJEXT) cytadela_OBJECTS = $(am_cytadela_OBJECTS) -cytadela_LDADD = $(LDADD) -cytadela_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(cytadela_LDFLAGS) $(LDFLAGS) -o $@ +am__DEPENDENCIES_1 = +cytadela_DEPENDENCIES = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -69,6 +85,11 @@ -o $@ SOURCES = $(cytadela_SOURCES) DIST_SOURCES = $(cytadela_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -177,7 +198,7 @@ COGLClass.cpp CSDLClass.cpp farread.cpp GameControl.cpp \ Localization.cpp UsableItem.cpp videoplayer.cpp main.cpp -cytadela_LDFLAGS = $(SDL_LIBS) -lGL -lGLU -lvlc +cytadela_LDADD = $(SDL_LIBS) -lGL -lGLU -lvlc all: all-am .SUFFIXES: @@ -214,8 +235,11 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p; \ @@ -249,9 +273,9 @@ clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -cytadela$(EXEEXT): $(cytadela_OBJECTS) $(cytadela_DEPENDENCIES) +cytadela$(EXEEXT): $(cytadela_OBJECTS) $(cytadela_DEPENDENCIES) $(EXTRA_cytadela_DEPENDENCIES) @rm -f cytadela$(EXEEXT) - $(cytadela_LINK) $(cytadela_OBJECTS) $(cytadela_LDADD) $(LIBS) + $(CXXLINK) $(cytadela_OBJECTS) $(cytadela_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -477,10 +501,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru cytadela-1.0.1/src/main.cpp cytadela-1.1.0/src/main.cpp --- cytadela-1.0.1/src/main.cpp 2009-10-18 16:07:56.000000000 +0000 +++ cytadela-1.1.0/src/main.cpp 2013-01-17 19:13:33.000000000 +0000 @@ -1,12 +1,9 @@ /* File name: main.cpp - Copyright: (C) 2005 - 2009 Tomasz Kazmierczak + Copyright: (C) 2005 - 2013 Tomasz Kazmierczak Copyright: (C) 2006 Kamil Pawlowski Copyright: (C) 2009 Tomasz Wisniewski - Creation date: 27.07.2005 - Last modification date: 17.06.2009 - This file is part of Cytadela * This program is free software; you can redistribute it and/or modify * @@ -32,6 +29,7 @@ #include #include #include +#include #if defined(__APPLE__) #include @@ -39,7 +37,7 @@ #endif #ifndef DATADIR - #define DATADIR "" + #define DATADIR "./" #endif using namespace std; @@ -47,26 +45,35 @@ bool handleArgs(int argc, char *argv[]) { if(argc > 1 and (strcmp(argv[1], "-v") == 0 or strcmp(argv[1], "--version") == 0)) { - fprintf(stdout, "Cytadela, version 1.0\n"); + fprintf(stdout, "Cytadela, version 1.1.0\n"); return false; } return true; } -void changeToDataDirectory() +bool changeToDataDirectory() { + int result = 0; + char dataDir[FILENAME_MAX] = {0}; #if defined(__APPLE__) CFURLRef resourceURL = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle()); - char resourcePath[4096]; - CFURLGetFileSystemRepresentation((__CFURL*)resourceURL, TRUE, (UInt8*)resourcePath, 4096); - chdir(resourcePath); + CFURLGetFileSystemRepresentation((__CFURL*)resourceURL, TRUE, (UInt8*)dataDir, FILENAME_MAX); + result = chdir(dataDir); CFRelease(resourceURL); #else FILE *file = fopen("obj/PodziemiaT.3dg", "rb"); if(file != 0) fclose(file); - else chdir(DATADIR); + else { + snprintf(dataDir, FILENAME_MAX, "%s", DATADIR); + result = chdir(dataDir); + } #endif + if(result != 0) { + fprintf(stderr, "ERROR: could not open the data directory \"%s\": %s\n", dataDir, strerror(errno)); + return false; + } + return true; } bool getSysDirectoryPath(string &path) @@ -84,13 +91,13 @@ // directories as soon as such finction is added to the C/C++ language #if defined(__WIN32__) if(-1 == mkdir(path.c_str())) { - fprintf(stderr, "ERROR: could not create \"%s\" directory\n", path.c_str()); + fprintf(stderr, "ERROR: could not create \"%s\" directory: %s\n", path.c_str(), strerror(errno)); perror(path.c_str()); return false; } #else if(-1 == mkdir(path.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)) { - fprintf(stderr, "ERROR: could not create \"%s\" directory\n", path.c_str()); + fprintf(stderr, "ERROR: could not create \"%s\" directory: %s\n", path.c_str(), strerror(errno)); perror(path.c_str()); return false; } @@ -109,7 +116,10 @@ return 0; //set current directory to data directory - changeToDataDirectory(); + if(not changeToDataDirectory()) { + fprintf(stdout, "Abnormal program termination\n"); + return 1; + } CSDLClass *sdl = CSDLClass::instance(); //first we initialize SDL diff -Nru cytadela-1.0.1/src/videoplayer.cpp cytadela-1.1.0/src/videoplayer.cpp --- cytadela-1.0.1/src/videoplayer.cpp 2010-06-29 19:28:59.000000000 +0000 +++ cytadela-1.1.0/src/videoplayer.cpp 2013-01-14 21:50:35.000000000 +0000 @@ -1,7 +1,7 @@ /* libSDL and libVLC sample code * Copyright © 2008 Sam Hocevar - Copyright (c) 2010 Tomasz Kazmierczak + Copyright (c) 2010, 2013 Tomasz Kazmierczak Copyright (c) 2010 Tomasz Wisniewski Modified the original code by Sam Hocevar in order to adapt to the game and relicensed from Do What The Fuck You Want To Public License to GNU GPLv3 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -37,55 +38,56 @@ struct ctx { - SDL_Surface *surf; - SDL_mutex *mutex; + SDL_Surface *surf; + SDL_mutex *mutex; }; -static void lock(struct ctx *ctx, void **pp_ret) +static void *lock(void *data, void **p_pixels) { - SDL_LockMutex(ctx->mutex); - SDL_LockSurface(ctx->surf); - *pp_ret = ctx->surf->pixels; + struct ctx *ctx = (struct ctx *)data; + + SDL_LockMutex(ctx->mutex); + SDL_LockSurface(ctx->surf); + *p_pixels = ctx->surf->pixels; + return NULL; /* picture identifier, not needed here */ } -static void unlock(struct ctx *ctx) +static void unlock(void *data, void *id, void *const *p_pixels) { - SDL_UnlockSurface(ctx->surf); - SDL_UnlockMutex(ctx->mutex); + struct ctx *ctx = (struct ctx *)data; + + SDL_UnlockSurface(ctx->surf); + SDL_UnlockMutex(ctx->mutex); + + assert(id == NULL); /* picture identifier, not needed here */ +} + +static void display(void *data, void *id) +{ + /* VLC wants to display the video */ + (void) data; + assert(id == NULL); } bool play(const char *filename, SDL_Surface *screen, bool offOnFinish, bool audio) { - char clock[64], cunlock[64], cdata[64]; - char width[32], height[32], pitch[32]; - char chroma[8]; - libvlc_instance_t *libvlc; - libvlc_media_t *m; - libvlc_media_player_t *mp; - char const *vlc_argv[] = - { - "-q", - //"-vvvvv", - //"--plugin-path", VLC_TREE "/modules", - "--ignore-config", /* Don't use VLC's config files */ - audio ? "" : "--noaudio", - "--vout", "vmem", - "--vmem-width", width, - "--vmem-height", height, - "--vmem-pitch", pitch, - "--vmem-chroma", chroma, - "--vmem-lock", clock, - "--vmem-unlock", cunlock, - "--vmem-data", cdata, - "--no-video-title-show" - }; - int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv); - - SDL_Surface *empty; - SDL_Event event; - SDL_Rect rect; + libvlc_instance_t *libvlc; + libvlc_media_t *m; + libvlc_media_player_t *mp; + char const *vlc_argv[] = + { + "--ignore-config", /* Don't use VLC's config files */ + audio ? "" : "--noaudio", + "--no-xlib", /* tell VLC to not use Xlib */ + "--no-video-title-show" + }; + int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv); + + SDL_Surface *empty; + SDL_Event event; + SDL_Rect rect; - struct ctx ctx; + struct ctx ctx; empty = SDL_CreateRGBSurface(SDL_SWSURFACE, VIDEOWIDTH, VIDEOHEIGHT, screen->format->BitsPerPixel, 0, 0, 0, 0); @@ -108,96 +110,89 @@ aMask = 0xFF000000; #endif ctx.surf = SDL_CreateRGBSurface(SDL_SWSURFACE, VIDEOWIDTH, VIDEOHEIGHT, - screen->format->BitsPerPixel, rMask, gMask, bMask, aMask); - - ctx.mutex = SDL_CreateMutex(); + screen->format->BitsPerPixel, rMask, gMask, bMask, aMask); - /* - * Initialise libVLC - */ - sprintf(clock, "%lld", (long long int)(intptr_t)lock); - sprintf(cunlock, "%lld", (long long int)(intptr_t)unlock); - sprintf(cdata, "%lld", (long long int)(intptr_t)&ctx); - sprintf(width, "%i", VIDEOWIDTH); - sprintf(height, "%i", VIDEOHEIGHT); - sprintf(pitch, "%i", VIDEOWIDTH*screen->format->BytesPerPixel); - sprintf(chroma, "RV%i", screen->format->BitsPerPixel); - - libvlc = libvlc_new(vlc_argc, vlc_argv); - m = libvlc_media_new_location(libvlc, filename); + ctx.mutex = SDL_CreateMutex(); + /* + * Initialise libVLC + */ + libvlc = libvlc_new(vlc_argc, vlc_argv); + m = libvlc_media_new_path(libvlc, filename); mp = libvlc_media_player_new_from_media(m); - libvlc_media_release(m); + libvlc_media_release(m); + libvlc_video_set_callbacks(mp, lock, unlock, display, &ctx); + char format[40]; + sprintf(format, "RV%d", screen->format->BitsPerPixel); + libvlc_video_set_format(mp, format, VIDEOWIDTH, VIDEOHEIGHT, VIDEOWIDTH*(screen->format->BitsPerPixel / 8)); libvlc_media_player_play(mp); /* - * Main loop - */ + * Main loop + */ rect.w = 0; - rect.h = 0; - rect.x = (int)((screen->w - VIDEOWIDTH) / 2); - rect.y = (int)((screen->h - VIDEOHEIGHT) / 2); - - bool done = false; - while(not done) - { - int action = 0; - - /* Keys: enter, escape (quit) */ - while( SDL_PollEvent( &event ) ) - { - switch(event.type) - { - case SDL_QUIT: - done = true; - break; - case SDL_KEYDOWN: - action = event.key.keysym.sym; - break; - } - } - - switch(action) - { - case SDLK_ESCAPE: - case SDLK_RETURN: + rect.h = 0; + rect.x = (int)((screen->w - VIDEOWIDTH) / 2); + rect.y = (int)((screen->h - VIDEOHEIGHT) / 2); + + while(true) { + int action = 0; + bool stop = false; + /* Keys: enter, escape (quit) */ + while(SDL_PollEvent(&event)) { + switch(event.type) { + case SDL_QUIT: + stop = true; + break; + case SDL_KEYDOWN: + action = event.key.keysym.sym; + break; + } + } + if(stop) + break; + + switch(action) { + case SDLK_ESCAPE: + case SDLK_RETURN: case SDLK_KP_ENTER: - done = true; - break; - case ' ': + stop = true; + break; + case ' ': libvlc_media_player_pause(mp); break; - } + } + if(stop) + break; - /* Blitting the surface does not prevent it from being locked and - * written to by another thread, so we use this additional mutex. */ - SDL_LockMutex(ctx.mutex); - SDL_BlitSurface(ctx.surf, NULL, screen, &rect); - SDL_UnlockMutex(ctx.mutex); + /* Blitting the surface does not prevent it from being locked and + * written to by another thread, so we use this additional mutex. */ + SDL_LockMutex(ctx.mutex); + SDL_BlitSurface(ctx.surf, NULL, screen, &rect); + SDL_UnlockMutex(ctx.mutex); - SDL_Flip(screen); - SDL_Delay(10); + SDL_Flip(screen); + SDL_Delay(10); - SDL_BlitSurface(empty, NULL, screen, &rect); + SDL_BlitSurface(empty, NULL, screen, &rect); libvlc_state_t state = libvlc_media_player_get_state(mp); - if(state == libvlc_Ended) - done = offOnFinish; - } - - /* - * Stop stream and clean up libVLC - */ - libvlc_media_player_stop(mp); - - libvlc_media_player_release(mp); - libvlc_release(libvlc); - - SDL_DestroyMutex(ctx.mutex); - SDL_FreeSurface(ctx.surf); - SDL_FreeSurface(empty); + if(state == libvlc_Ended and offOnFinish) + break; + } + + /* + * Stop stream and clean up libVLC + */ + libvlc_media_player_stop(mp); + libvlc_media_player_release(mp); + libvlc_release(libvlc); + + SDL_DestroyMutex(ctx.mutex); + SDL_FreeSurface(ctx.surf); + SDL_FreeSurface(empty); - return true; + return true; }