This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository berusky.
commit b3d0d08ac9d78de2bc9213fb0bd8169fca898615 Author: Markus Koschany <[email protected]> Date: Sun Oct 8 15:33:18 2017 +0200 New upstream version 1.7.1 --- ChangeLog | 4 + Makefile.am | 2 + Makefile.in | 243 +++++----- TODO | 9 + aclocal.m4 | 416 ++++++++++------- autogen.sh | 159 +++++++ berusky.prj | 157 +++++++ configure | 95 +++- configure.in | 4 +- po/Makefile.in.in | 22 +- po/berusky.pot | 1287 --------------------------------------------------- setup-gettext | 201 ++++++++ src/2d_graph.cpp | 10 +- src/2d_graph.h | 4 +- src/Makefile.in | 250 ++++++---- src/berusky_gui.cpp | 13 +- src/defines.h | 23 +- src/editor.cpp | 43 +- src/editor.h | 4 +- src/ini.cpp | 6 +- src/level_active.h | 2 +- src/main.cpp | 11 +- src/portability.h | 10 +- src/profile.cpp | 6 +- src/types.h | 2 +- src/utils.cpp | 133 +++--- src/utils.h | 7 +- stamp-h.in | 1 + 28 files changed, 1332 insertions(+), 1792 deletions(-) diff --git a/ChangeLog b/ChangeLog index 851d697..f97b24a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.7 + * Added extra levels from players + * Double-size mode question at game start + 1.6 * Updated editor for double size mode * New graphics diff --git a/Makefile.am b/Makefile.am index ecaaf86..f1a972a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,6 +17,8 @@ beruskydoc_DATA = \ EXTRA_DIST = $(beruskydoc_DATA) + + # Copy all the spec files. Of cource, only one is actually used. dist-hook: for specfile in *.spec; do \ diff --git a/Makefile.in b/Makefile.in index b2f5811..c1c92d7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ 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;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,11 +79,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO acconfig.h config.guess config.sub depcomp install-sh \ - ltmain.sh missing mkinstalldirs +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) acconfig.h \ + $(srcdir)/config.h.in mkinstalldirs COPYING TODO config.guess \ + config.sub depcomp install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.in @@ -67,15 +95,28 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -112,9 +153,30 @@ am__installdirs = "$(DESTDIR)$(beruskydocdir)" DATA = $(beruskydoc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -163,6 +225,7 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -414,14 +477,13 @@ uninstall-beruskydocDATA: # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -442,31 +504,13 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -482,12 +526,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -499,15 +538,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -516,18 +551,16 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" - cscope: cscope.files test ! -s cscope.files \ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) - clean-cscope: -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive -cscope.files: clean-cscope cscopelist-recursive cscopelist - -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -664,9 +697,9 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -836,27 +869,25 @@ ps-am: uninstall-am: uninstall-beruskydocDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-cscope \ - clean-generic clean-libtool cscope cscopelist \ - cscopelist-recursive ctags ctags-recursive dist dist-all \ - dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-beruskydocDATA 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 \ +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-beruskydocDATA 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 \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-beruskydocDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-beruskydocDATA # Copy all the spec files. Of cource, only one is actually used. diff --git a/TODO b/TODO index 2640670..ceae01a 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,13 @@ +- Game hints +- fast movement by default +- single size - small menu backgrounds + +https://bugzilla.redhat.com/show_bug.cgi?id=1040127 + +FirefoxOS version? + Bugs: +- What happens if user-levelset is finished? - Auto-shading? (for boxes - and when moves) - Windows version - Sound & Music diff --git a/aclocal.m4 b/aclocal.m4 index e8c966b..8535737 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.12.2 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,6 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, @@ -336,7 +337,6 @@ msgstr "" dnl glib_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl GLIB_LC_MESSAGES GLIB_WITH_NLS @@ -1762,7 +1762,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1776,7 +1776,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1795,7 +1798,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -9247,24 +9253,37 @@ m4_popdef([pkg_default]) m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR -# Copyright (C) 2002-2012 Free Software Foundation, Inc. + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +# Copyright (C) 2002-2013 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 8 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.12' +[am__api_version='1.13' 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.12.2], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9280,21 +9299,19 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.2])dnl +[AM_AUTOMAKE_VERSION([1.13.4])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-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 - # 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/../..'. @@ -9340,38 +9357,14 @@ AC_PREREQ([2.50])dnl am_aux_dir=`cd $ac_aux_dir && pwd` ]) - -# Copyright (C) 1996-2012 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 5 - -# This was merged into AC_PROG_CC in Autoconf. - -AU_DEFUN([AM_PROG_CC_STDC], -[AC_PROG_CC -AC_DIAGNOSE([obsolete], [$0: - your code should no longer depend upon 'am_cv_prog_cc_stdc', but upon - 'ac_cv_prog_cc_stdc'. Remove this warning and the assignment when - you adjust the code. You can also remove the above call to - AC_PROG_CC if you already called it elsewhere.]) -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc -]) -AU_DEFUN([fp_PROG_CC_STDC]) - # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. @@ -9397,13 +9390,12 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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 17 # 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, @@ -9589,19 +9581,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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 6 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -9630,7 +9621,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -9664,27 +9655,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996-2012 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 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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 19 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -9700,7 +9678,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -9730,8 +9708,7 @@ AC_SUBST([CYGPATH_W]) dnl Distinguish between old-style and new-style calls. m4_ifval([$2], [AC_DIAGNOSE([obsolete], -[$0: two- and three-arguments forms are deprecated. For more info, see: -http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) + [$0: two- and three-arguments forms are deprecated.]) m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], @@ -9785,18 +9762,15 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], [_AM_DEPENDENCIES([OBJC])], [m4_define([AC_PROG_OBJC], m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -dnl Support for Objective C++ was only introduced in Autoconf 2.65, -dnl but we still cater to Autoconf 2.62. -m4_ifdef([AC_PROG_OBJCXX], -[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [_AM_DEPENDENCIES([OBJCXX])], [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl @@ -9830,14 +9804,12 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 8 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -9853,14 +9825,12 @@ if test x"${install_sh}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 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 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -9877,14 +9847,12 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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 7 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. @@ -9912,18 +9880,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 5 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -9968,14 +9932,12 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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 7 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -9983,11 +9945,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -10000,24 +9961,51 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= AC_MSG_WARN(['missing' script is too old or missing]) fi ]) +# -*- Autoconf -*- +# Obsolete and "removed" macros, that must however still report explicit +# error messages when used, to smooth transition. +# +# Copyright (C) 1996-2013 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. + +AC_DEFUN([AM_CONFIG_HEADER], +[AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl +AC_CONFIG_HEADERS($@)]) + +AC_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +AC_DIAGNOSE([obsolete], +['$0': this macro is obsolete. +You should simply use the 'AC][_PROG_CC' macro instead. +Also, your code should no longer depend upon 'am_cv_prog_cc_stdc', +but upon 'ac_cv_prog_cc_stdc'.])]) + +AC_DEFUN([AM_C_PROTOTYPES], + [AC_FATAL([automatic de-ANSI-fication support has been removed])]) +AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) + # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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 6 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -10043,14 +10031,12 @@ AC_DEFUN([_AM_IF_OPTION], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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 9 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], @@ -10126,13 +10112,71 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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 +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 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. # AM_PROG_INSTALL_STRIP # --------------------- @@ -10156,14 +10200,12 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 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 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -10177,14 +10219,12 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 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 3 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. @@ -10198,76 +10238,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_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='$${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]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar <conftest.tar]) + AM_RUN_LOG([cat conftest.dir/file]) + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar <conftest.tar]) - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..8fe1de8 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,159 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +DIE=0 + +if [ -n "$GNOME2_DIR" ]; then + ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" + LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH" + PATH="$GNOME2_DIR/bin:$PATH" + export PATH + export LD_LIBRARY_PATH +fi + +(test -f $srcdir/configure.in) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level package directory" + exit 1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`autoconf' installed." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"; + DIE=1 +} + +(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && { + (intltoolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`intltool' installed." + echo "You can get it from:" + echo " ftp://ftp.gnome.org/pub/GNOME/"; + DIE=1 + } +} + +(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && { + (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`xml-i18n-toolize' installed." + echo "You can get it from:" + echo " ftp://ftp.gnome.org/pub/GNOME/"; + DIE=1 + } +} + +(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { + (libtool --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`libtool' installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"; + DIE=1 + } +} + +(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null) && { + (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \ + (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`glib' installed." + echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"; + DIE=1 + } +} + +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`automake' installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"; + DIE=1 + NO_AUTOMAKE=yes +} + + +# if no automake, don't bother testing for aclocal +test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: Missing \`aclocal'. The version of \`automake'" + echo "installed doesn't appear recent enough." + echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"; + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "**Warning**: I am going to run \`configure' with no arguments." + echo "If you wish to pass any to it, please specify them on the" + echo \`$0\'" command line." + echo +fi + +case $CC in +xlc ) + am_opt=--include-deps;; +esac + +for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.in -print` +do + dr=`dirname $coin` + if test -f $dr/NO-AUTO-GEN; then + echo skipping $dr -- flagged as no auto-gen + else + echo processing $dr + ( cd $dr + + aclocalinclude="$ACLOCAL_FLAGS" + + if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then + echo "Creating $dr/aclocal.m4 ..." + test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 + echo "Running glib-gettextize... Ignore non-fatal messages." + echo "no" | glib-gettextize --force --copy + echo "Making $dr/aclocal.m4 writable ..." + test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 + fi + if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then + echo "Running intltoolize..." + intltoolize --copy --force --automake + fi + if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then + echo "Running xml-i18n-toolize..." + xml-i18n-toolize --copy --force --automake + fi + if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then + if test -z "$NO_LIBTOOLIZE" ; then + echo "Running libtoolize..." + libtoolize --force --copy + fi + fi + echo "Running aclocal $aclocalinclude ..." + aclocal $aclocalinclude + if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then + echo "Running autoheader..." + autoheader + fi + echo "Running automake --gnu $am_opt ..." + automake --add-missing --gnu $am_opt + echo "Running autoconf ..." + autoconf + ) + fi +done + +conf_flags="--enable-maintainer-mode" + +if test x$NOCONFIGURE = x; then + echo Running $srcdir/configure $conf_flags "$@" ... + $srcdir/configure $conf_flags "$@" \ + && echo Now type \`make\' to compile. || exit 1 +else + echo Skipping configure process. +fi diff --git a/berusky.prj b/berusky.prj new file mode 100644 index 0000000..e53e6cb --- /dev/null +++ b/berusky.prj @@ -0,0 +1,157 @@ +# Anjuta Version 1.2.4a +Compatibility Level: 1 + +<PROJECT_DESCRIPTION_START> +A logic game based on sokoban<PROJECT_DESCRIPTION_END> +<CONFIG_PROGS_START> +<CONFIG_PROGS_END> +<CONFIG_LIBS_START> +<CONFIG_LIBS_END> +<CONFIG_HEADERS_START> +<CONFIG_HEADERS_END> +<CONFIG_CHARACTERISTICS_START> +<CONFIG_CHARACTERISTICS_END> +<CONFIG_LIB_FUNCS_START> +<CONFIG_LIB_FUNCS_END> +<CONFIG_ADDITIONAL_START> +<CONFIG_ADDITIONAL_END> +<CONFIG_FILES_START> +<CONFIG_FILES_END> +<MAKEFILE_AM_START> +<MAKEFILE_AM_END> + +props.file.type=project + +anjuta.version=1.2.4a +anjuta.compatibility.level=1 + +project.name=berusky +project.type=GTK 2.0 +project.target.type=EXECUTABLE +project.version=1.7.1 +project.author=User +project.source.target=berusky +project.has.gettext=1 +project.gui.command= +project.programming.language=C++ +project.excluded.modules=intl + +project.config.extra.modules.before= +project.config.extra.modules.after= +project.config.blocked=0 +project.config.disable.overwriting=0 0 0 0 0 0 0 0 0 + +project.menu.entry=berusky Version 0.1 +project.menu.group=Applications +project.menu.comment=berusky Version 0.1 +project.menu.icon= +project.menu.need.terminal=0 + +project.configure.options= +anjuta.program.arguments= +preferences.build.option.keep.going=1 +preferences.build.option.autosave=0 +preferences.build.option.silent=0 +preferences.build.option.warn.undef=0 +preferences.build.option.jobs=0 +preferences.make=make +preferences.use.tabs=0 +preferences.indent.automatic=1 +preferences.tabsize=2 +preferences.indent.opening=1 +preferences.autoformat.custom.style=-bap -bad -br -brs -cli2 -i2 -nbfda -ncs -npcs -npsl -nut +preferences.autoformat.disable=0 +preferences.indent.closing=1 +preferences.indent.size=2 + +module.include.name=include +module.include.type= +module.include.files= + +module.source.name=src +module.source.type= +module.source.files=\ + 2d_graph.cpp\ + 2d_graph.h\ + animation.cpp\ + animation.h\ + berusky.cpp\ + berusky.h\ + data_parser.cpp\ + data_parser.h\ + defines.h\ + editor.cpp\ + editor.h\ + events.cpp\ + events.h\ + game_logic.cpp\ + game_logic.h\ + graphics.cpp\ + graphics.h\ + ini.cpp\ + ini.h\ + input.cpp\ + input.h\ + level.cpp\ + level.h\ + level_active.cpp\ + level_active.h\ + level_changer.cpp\ + level_changer.h\ + level_game.cpp\ + level_game.h\ + types.h\ + utils.cpp\ + utils.h\ + data_parser_tables.cpp\ + data_parser_tables.h\ + berusky_gui.cpp\ + berusky_gui.h\ + main.cpp\ + main.h\ + stack.h\ + gui.cpp\ + gui.h\ + portability.h\ + profile.cpp\ + profile.h\ + llist.h + +module.pixmap.name=pixmaps +module.pixmap.type= +module.pixmap.files= + +module.data.name=data +module.data.type= +module.data.files=\ + berusky.ini + +module.help.name=help +module.help.type= +module.help.files= + +module.doc.name=doc +module.doc.type= +module.doc.files= + +module.po.files= + +compiler.options.supports= +compiler.options.include.paths= +compiler.options.library.paths= +compiler.options.libraries=\ + SDL\ + gtk\ + gdk\ + SDL_image +compiler.options.libraries.selected=1 0 0 1 +compiler.options.defines= +compiler.options.defines.selected=1 0 0 1 +compiler.options.warning.buttons=0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +compiler.options.optimize.buttons=1 0 0 0 +compiler.options.other.buttons=1 0 +compiler.options.other.c.flags=-Wall -Wint-to-pointer-cast +compiler.options.other.l.flags= +compiler.options.other.l.libs= + +project.src.paths= diff --git a/configure b/configure index 470732b..1a22b19 100755 --- a/configure +++ b/configure @@ -722,6 +722,10 @@ CC MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -786,6 +790,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_maintainer_mode enable_dependency_tracking enable_shared @@ -1430,6 +1435,8 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer @@ -2374,7 +2381,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.12' +am__api_version='1.13' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2587,8 +2594,8 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 @@ -2828,6 +2835,45 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2851,7 +2897,7 @@ fi # Define the identity of the package. PACKAGE=berusky - VERSION=1.7 + VERSION=1.7.1 cat >>confdefs.h <<_ACEOF @@ -2891,12 +2937,17 @@ mkdir_p='$(MKDIR_P)' # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + ac_config_headers="$ac_config_headers config.h" @@ -5294,7 +5345,6 @@ else fi - am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc ac_ext=c @@ -9215,7 +9265,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -9233,7 +9283,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -9252,7 +9305,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -17453,12 +17509,12 @@ if test -n "$PACKAGE_CFLAGS"; then pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gdk-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gdk-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl SDL_image gtk+-2.0 gdk-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "sdl SDL_image gtk+-2.0 gdk-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 gdk-2.0" 2>/dev/null` + pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "sdl SDL_image gtk+-2.0 gdk-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17470,12 +17526,12 @@ if test -n "$PACKAGE_LIBS"; then pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gdk-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gdk-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl SDL_image gtk+-2.0 gdk-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "sdl SDL_image gtk+-2.0 gdk-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 gdk-2.0" 2>/dev/null` + pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "sdl SDL_image gtk+-2.0 gdk-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17496,14 +17552,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 gdk-2.0" 2>&1` + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl SDL_image gtk+-2.0 gdk-2.0" 2>&1` else - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 gdk-2.0" 2>&1` + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl SDL_image gtk+-2.0 gdk-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PACKAGE_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-2.0 gdk-2.0) were not met: + as_fn_error $? "Package requirements (sdl SDL_image gtk+-2.0 gdk-2.0) were not met: $PACKAGE_PKG_ERRORS @@ -17714,7 +17770,6 @@ DEFS=-DHAVE_CONFIG_H 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$//' @@ -19341,7 +19396,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -19392,7 +19447,7 @@ $as_echo X"$mf" | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the diff --git a/configure.in b/configure.in index 89c4d80..1ed29ff 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl If you don't want it to overwrite it, dnl Please disable it in the Anjuta project configuration AC_INIT(configure.in) -AM_INIT_AUTOMAKE(berusky, 1.7) +AM_INIT_AUTOMAKE(berusky, 1.7.1) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -26,7 +26,7 @@ AM_GLIB_GNU_GETTEXT AM_PROG_LIBTOOL -PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0]) +PKG_CHECK_MODULES(PACKAGE, [sdl SDL_image gtk+-2.0 gdk-2.0]) AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 53b496d..e6c32cb 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -35,7 +35,7 @@ subdir = po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ +MKINSTALLDIRS = mkdir -p CC = @CC@ GENCAT = @GENCAT@ @@ -130,12 +130,8 @@ install-exec: install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi - @catalogs='$(CATALOGS)'; \ + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ case "$$cat" in \ @@ -144,11 +140,7 @@ install-data-yes: all esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ + $(MKINSTALLDIRS) $$dir; \ if test -r $$cat; then \ $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ @@ -172,11 +164,7 @@ install-data-yes: all fi; \ done if test "$(PACKAGE)" = "glib"; then \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ diff --git a/po/berusky.pot b/po/berusky.pot deleted file mode 100644 index fbc640d..0000000 --- a/po/berusky.pot +++ /dev/null @@ -1,1287 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; -"product=glib&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-07-26 22:45+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../src/berusky.cpp:221 ../src/berusky_gui.cpp:333 -msgid "training" -msgstr "" - -#: ../src/berusky.cpp:222 ../src/berusky_gui.cpp:334 -msgid "easy" -msgstr "" - -#: ../src/berusky.cpp:223 ../src/berusky_gui.cpp:335 -msgid "intermediate" -msgstr "" - -#: ../src/berusky.cpp:224 ../src/berusky_gui.cpp:336 -msgid "advanced" -msgstr "" - -#: ../src/berusky.cpp:225 ../src/berusky_gui.cpp:337 -msgid "impossible" -msgstr "" - -#: ../src/berusky.cpp:226 -msgid "user set" -msgstr "" - -#: ../src/berusky.cpp:299 -#, c-format -msgid "Unable to restart level %d!" -msgstr "" - -#: ../src/defines.h:470 -msgid "Berusky" -msgstr "" - -#: ../src/editor.cpp:571 -#, c-format -msgid "I:%d V:%d R:%d L:%d" -msgstr "" - -#: ../src/editor.cpp:606 -#, c-format -msgid "" -"Item: %s\n" -"Variation: %d\n" -"Rotation: %s" -msgstr "" - -#: ../src/editor.cpp:650 -#, c-format -msgid "selection %d,%d - %d,%d" -msgstr "" - -#: ../src/editor.cpp:653 -#, c-format -msgid "level cursor %d x %d" -msgstr "" - -#: ../src/editor.cpp:657 -msgid "No selection" -msgstr "" - -#: ../src/editor.cpp:720 -msgid "help (f1)" -msgstr "" - -#: ../src/editor.cpp:721 -msgid "run level (f9)" -msgstr "" - -#: ../src/editor.cpp:722 -msgid "undo (ctrl+u)" -msgstr "" - -#: ../src/editor.cpp:723 -msgid "shade floor (ctrl+s)" -msgstr "" - -#: ../src/editor.cpp:724 -msgid "change background (b)" -msgstr "" - -#: ../src/editor.cpp:787 -msgid "floor" -msgstr "" - -#: ../src/editor.cpp:790 -msgid "items" -msgstr "" - -#: ../src/editor.cpp:793 -msgid "players" -msgstr "" - -#: ../src/editor.cpp:796 -msgid "all" -msgstr "" - -#: ../src/editor.cpp:802 -#, c-format -msgid "edited layer: %s" -msgstr "" - -#: ../src/editor.cpp:824 -msgid "Grid:" -msgstr "" - -#: ../src/editor.cpp:825 -msgid "Floor:" -msgstr "" - -#: ../src/editor.cpp:826 -msgid "Items:" -msgstr "" - -#: ../src/editor.cpp:827 -msgid "Players:" -msgstr "" - -#: ../src/editor.cpp:860 -msgid "off" -msgstr "" - -#: ../src/editor.cpp:861 -msgid "on" -msgstr "" - -#: ../src/editor.cpp:998 -msgid "erase all data?" -msgstr "" - -#: ../src/editor.cpp:1035 -msgid "level is modified. erase all data?" -msgstr "" - -#: ../src/editor.cpp:1043 -msgid "Level to load:" -msgstr "" - -#: ../src/editor.cpp:1061 ../src/level_active.cpp:324 -#: ../src/berusky_gui.cpp:2204 -#, c-format -msgid "Unable to load level %s" -msgstr "" - -#: ../src/editor.cpp:1096 -msgid "save to:" -msgstr "" - -#: ../src/editor.cpp:1105 -#, c-format -msgid "file %s exists! overwrite?:" -msgstr "" - -#: ../src/editor.cpp:1116 -#, c-format -msgid "Unable to save level %s" -msgstr "" - -#: ../src/editor.cpp:1118 -#, c-format -msgid "Saved as %s" -msgstr "" - -#: ../src/editor.cpp:1159 -msgid "Keyboard control:" -msgstr "" - -#: ../src/editor.cpp:1161 ../src/berusky_gui.cpp:1064 -msgid "F1" -msgstr "" - -#: ../src/editor.cpp:1161 -msgid "- Help" -msgstr "" - -#: ../src/editor.cpp:1162 -msgid "ESC" -msgstr "" - -#: ../src/editor.cpp:1162 -msgid "- Quit" -msgstr "" - -#: ../src/editor.cpp:1164 -msgid "CTRL+N" -msgstr "" - -#: ../src/editor.cpp:1164 -msgid "- New level" -msgstr "" - -#: ../src/editor.cpp:1165 -msgid "f2" -msgstr "" - -#: ../src/editor.cpp:1165 -msgid "- Save level" -msgstr "" - -#: ../src/editor.cpp:1166 -msgid "CTRL+F2" -msgstr "" - -#: ../src/editor.cpp:1166 -msgid "- Save level as" -msgstr "" - -#: ../src/editor.cpp:1167 ../src/berusky_gui.cpp:1066 -msgid "F3" -msgstr "" - -#: ../src/editor.cpp:1167 -msgid "- Load level" -msgstr "" - -#: ../src/editor.cpp:1169 -msgid "F9" -msgstr "" - -#: ../src/editor.cpp:1169 -msgid "- Run level" -msgstr "" - -#: ../src/editor.cpp:1171 -msgid "P" -msgstr "" - -#: ../src/editor.cpp:1171 -msgid "- Pick item from cursor" -msgstr "" - -#: ../src/editor.cpp:1172 -msgid "SHIFT+R" -msgstr "" - -#: ../src/editor.cpp:1172 -msgid "- Rotate item" -msgstr "" - -#: ../src/editor.cpp:1173 -msgid "CTRL+U" -msgstr "" - -#: ../src/editor.cpp:1173 -msgid "- Undo" -msgstr "" - -#: ../src/editor.cpp:1174 -msgid "CTRL+S" -msgstr "" - -#: ../src/editor.cpp:1174 -msgid "- Shade level" -msgstr "" - -#: ../src/editor.cpp:1175 -msgid "B" -msgstr "" - -#: ../src/editor.cpp:1175 -msgid "- Background" -msgstr "" - -#: ../src/editor.cpp:1177 -msgid "1" -msgstr "" - -#: ../src/editor.cpp:1177 -msgid "- Select floor layer" -msgstr "" - -#: ../src/editor.cpp:1178 -msgid "2" -msgstr "" - -#: ../src/editor.cpp:1178 -msgid "- Select items layer" -msgstr "" - -#: ../src/editor.cpp:1179 -msgid "3" -msgstr "" - -#: ../src/editor.cpp:1179 -msgid "- Select players layer" -msgstr "" - -#: ../src/editor.cpp:1180 -msgid "4" -msgstr "" - -#: ../src/editor.cpp:1180 -msgid "- Select all layer" -msgstr "" - -#: ../src/editor.cpp:1182 -msgid "CTRL+1" -msgstr "" - -#: ../src/editor.cpp:1182 -msgid "- on/off background" -msgstr "" - -#: ../src/editor.cpp:1183 -msgid "CTRL+2" -msgstr "" - -#: ../src/editor.cpp:1183 -msgid "- on/off floor layer" -msgstr "" - -#: ../src/editor.cpp:1184 -msgid "CTRL+3" -msgstr "" - -#: ../src/editor.cpp:1184 -msgid "- on/off items layer" -msgstr "" - -#: ../src/editor.cpp:1185 -msgid "CTRL+4" -msgstr "" - -#: ../src/editor.cpp:1185 -msgid "- on/off players layer" -msgstr "" - -#: ../src/editor.cpp:1189 -msgid "Mouse control:" -msgstr "" - -#: ../src/editor.cpp:1191 -msgid "first" -msgstr "" - -#: ../src/editor.cpp:1191 -msgid "- insert selected item" -msgstr "" - -#: ../src/editor.cpp:1192 -msgid "third" -msgstr "" - -#: ../src/editor.cpp:1192 -msgid "- clear selected cell" -msgstr "" - -#: ../src/editor.cpp:1194 -msgid "R+wheel" -msgstr "" - -#: ../src/editor.cpp:1194 -msgid "- in place rotation" -msgstr "" - -#: ../src/editor.cpp:1195 -msgid "V+wheel" -msgstr "" - -#: ../src/editor.cpp:1195 -msgid "- in place variation" -msgstr "" - -#: ../src/editor.cpp:1197 -msgid "F+first" -msgstr "" - -#: ../src/editor.cpp:1197 -msgid "- fill rect with item" -msgstr "" - -#: ../src/editor.cpp:1198 -msgid "D+first" -msgstr "" - -#: ../src/editor.cpp:1198 -msgid "- draw rect with item" -msgstr "" - -#: ../src/editor.cpp:1200 -msgid "F+third" -msgstr "" - -#: ../src/editor.cpp:1200 -msgid "- clear solid rect" -msgstr "" - -#: ../src/editor.cpp:1201 -msgid "D+third" -msgstr "" - -#: ../src/editor.cpp:1201 -msgid "- clear empty rect" -msgstr "" - -#: ../src/editor.cpp:1205 -msgid "item panel mouse control:" -msgstr "" - -#: ../src/editor.cpp:1207 -msgid "wheel" -msgstr "" - -#: ../src/editor.cpp:1207 -msgid "- scroll by one" -msgstr "" - -#: ../src/editor.cpp:1209 -msgid "PgUp" -msgstr "" - -#: ../src/editor.cpp:1209 -msgid "- scroll page up" -msgstr "" - -#: ../src/editor.cpp:1210 -msgid "PgDown" -msgstr "" - -#: ../src/editor.cpp:1210 -msgid "- scroll page down" -msgstr "" - -#: ../src/editor.cpp:1212 -msgid "Home" -msgstr "" - -#: ../src/editor.cpp:1212 -msgid "- first item" -msgstr "" - -#: ../src/editor.cpp:1213 -msgid "End" -msgstr "" - -#: ../src/editor.cpp:1213 -msgid "- last item" -msgstr "" - -#: ../src/editor.cpp:1216 -msgid "Screen control:" -msgstr "" - -#: ../src/editor.cpp:1218 -msgid "F10" -msgstr "" - -#: ../src/editor.cpp:1218 -msgid "- Full screen mode" -msgstr "" - -#: ../src/editor.cpp:1219 -msgid "Arrows" -msgstr "" - -#: ../src/editor.cpp:1219 -msgid "- Move screen" -msgstr "" - -#: ../src/editor.cpp:1273 -#, c-format -msgid "Inserted item %d at %dx%d - %dx%d layer %d" -msgstr "" - -#: ../src/editor.cpp:1285 -#, c-format -msgid "Inserted item %d at %dx%d layer %d" -msgstr "" - -#: ../src/editor.cpp:1320 -#, c-format -msgid "[Modify] Rotating item at %dx%d layer %d" -msgstr "" - -#: ../src/editor.cpp:1324 -#, c-format -msgid "[Set] Rotating item at %dx%d layer %d" -msgstr "" - -#: ../src/editor.cpp:1327 -#, c-format -msgid "Can't rotate item at %dx%d layer %d" -msgstr "" - -#: ../src/editor.cpp:1348 -#, c-format -msgid "[Modify] Variating item at %dx%d layer %d" -msgstr "" - -#: ../src/editor.cpp:1352 -#, c-format -msgid "[Set] Variating item at %dx%d layer %d" -msgstr "" - -#: ../src/editor.cpp:1378 -#, c-format -msgid "Erased items from %dx%d - %dx%d layer %d" -msgstr "" - -#: ../src/editor.cpp:1383 -#, c-format -msgid "Erased item at %dx%d layer %d" -msgstr "" - -#: ../src/editor.cpp:1406 -#, c-format -msgid "Can't rotate item %d" -msgstr "" - -#: ../src/editor.cpp:1511 -msgid "level is not saved. exit anyway?" -msgstr "" - -#: ../src/editor.cpp:1617 -msgid "Shading..." -msgstr "" - -#: ../src/editor.cpp:1852 -#, c-format -msgid "Level %s %s" -msgstr "" - -#: ../src/editor.cpp:1852 -msgid "(unsaved)" -msgstr "" - -#: ../src/editor.cpp:1852 -msgid "(saved)" -msgstr "" - -#: ../src/editor.cpp:1887 -msgid "undo" -msgstr "" - -#: ../src/editor.cpp:1889 -msgid "no more undo" -msgstr "" - -#. ---------------------------------------------------------------------- -#. An editor console code -#. ---------------------------------------------------------------------- -#: ../src/editor.cpp:1965 -msgid "y" -msgstr "" - -#: ../src/editor.cpp:1966 -msgid "n" -msgstr "" - -#: ../src/level.cpp:32 -msgid "Floor" -msgstr "" - -#: ../src/level.cpp:34 -msgid "Player 1" -msgstr "" - -#: ../src/level.cpp:35 -msgid "Player 2" -msgstr "" - -#: ../src/level.cpp:36 -msgid "Player 3" -msgstr "" - -#: ../src/level.cpp:37 -msgid "Player 4" -msgstr "" - -#: ../src/level.cpp:38 -msgid "Player 5" -msgstr "" - -#: ../src/level.cpp:40 -msgid "Box" -msgstr "" - -#: ../src/level.cpp:41 -msgid "Explosive" -msgstr "" - -#: ../src/level.cpp:42 -msgid "Wall" -msgstr "" - -#: ../src/level.cpp:43 -msgid "Exit" -msgstr "" - -#: ../src/level.cpp:44 -msgid "Stone" -msgstr "" - -#: ../src/level.cpp:45 -msgid "Key (to exit)" -msgstr "" - -#: ../src/level.cpp:46 -msgid "Pickax" -msgstr "" - -#. --- -#: ../src/level.cpp:49 -msgid "Color Key (for player 1)" -msgstr "" - -#: ../src/level.cpp:50 -msgid "Color Key (for player 2)" -msgstr "" - -#: ../src/level.cpp:51 -msgid "Color Key (for player 3)" -msgstr "" - -#: ../src/level.cpp:52 -msgid "Color Key (for player 4)" -msgstr "" - -#: ../src/level.cpp:53 -msgid "Color Key (for player 5)" -msgstr "" - -#. --- -#: ../src/level.cpp:56 ../src/level.cpp:62 ../src/level.cpp:68 -#: ../src/level.cpp:74 -msgid "Color door (for player 1)" -msgstr "" - -#: ../src/level.cpp:57 ../src/level.cpp:63 ../src/level.cpp:69 -#: ../src/level.cpp:75 -msgid "Color door (for player 2)" -msgstr "" - -#: ../src/level.cpp:58 ../src/level.cpp:64 ../src/level.cpp:70 -#: ../src/level.cpp:76 -msgid "Color door (for player 3)" -msgstr "" - -#: ../src/level.cpp:59 ../src/level.cpp:65 ../src/level.cpp:71 -#: ../src/level.cpp:77 -msgid "Color door (for player 4)" -msgstr "" - -#: ../src/level.cpp:60 ../src/level.cpp:66 ../src/level.cpp:72 -#: ../src/level.cpp:78 -msgid "Color door (for player 5)" -msgstr "" - -#. --- -#: ../src/level.cpp:81 ../src/level.cpp:87 ../src/level.cpp:93 -#: ../src/level.cpp:99 -msgid "Color gate-way (for player 1)" -msgstr "" - -#: ../src/level.cpp:82 ../src/level.cpp:88 ../src/level.cpp:94 -#: ../src/level.cpp:100 -msgid "Color gate-way (for player 2)" -msgstr "" - -#: ../src/level.cpp:83 ../src/level.cpp:89 ../src/level.cpp:95 -#: ../src/level.cpp:101 -msgid "Color gate-way (for player 3)" -msgstr "" - -#: ../src/level.cpp:84 ../src/level.cpp:90 ../src/level.cpp:96 -#: ../src/level.cpp:102 -msgid "Color gate-way (for player 4)" -msgstr "" - -#: ../src/level.cpp:85 ../src/level.cpp:91 ../src/level.cpp:97 -#: ../src/level.cpp:103 -msgid "Color gate-way (for player 5)" -msgstr "" - -#. --- -#: ../src/level.cpp:106 ../src/level.cpp:107 ../src/level.cpp:108 -#: ../src/level.cpp:109 ../src/level.cpp:111 ../src/level.cpp:112 -msgid "One-pass door" -msgstr "" - -#. -- -#: ../src/level.cpp:115 ../src/level.cpp:116 ../src/level.cpp:117 -#: ../src/level.cpp:118 ../src/level.cpp:120 ../src/level.cpp:121 -#: ../src/level.cpp:122 ../src/level.cpp:123 -msgid "Jamb (Wall)" -msgstr "" - -#: ../src/level.cpp:125 -msgid "Light box" -msgstr "" - -#: ../src/level.cpp:130 -msgid "0 DG." -msgstr "" - -#: ../src/level.cpp:131 -msgid "90 DG." -msgstr "" - -#: ../src/level.cpp:132 -msgid "180 DG." -msgstr "" - -#: ../src/level.cpp:133 -msgid "270 DG." -msgstr "" - -#: ../src/level_active.cpp:309 -#, c-format -msgid "User defined level %s..." -msgstr "" - -#: ../src/level_active.cpp:316 -#, c-format -msgid "Game level %s..." -msgstr "" - -#: ../src/level_game.cpp:158 -#, c-format -msgid "level_generic::level_load %s..." -msgstr "" - -#: ../src/level_game.cpp:167 -#, c-format -msgid "Checking %s...OK" -msgstr "" - -#: ../src/level_game.cpp:171 -#, c-format -msgid "Checking %s...not found" -msgstr "" - -#: ../src/utils.cpp:576 ../src/utils.cpp:684 ../src/utils.cpp:749 -#, c-format -msgid "Graphics dir '%s'" -msgstr "" - -#: ../src/utils.cpp:577 -msgid "Loading game graphics..." -msgstr "" - -#: ../src/utils.cpp:643 ../src/utils.cpp:728 -msgid "Unable to load data, exiting..." -msgstr "" - -#: ../src/utils.cpp:645 ../src/utils.cpp:730 -#, c-format -msgid "%d sprites loaded..." -msgstr "" - -#: ../src/utils.cpp:685 -msgid "Loading menu graphics..." -msgstr "" - -#: ../src/utils.cpp:724 -#, c-format -msgid "Unable to load font %d!" -msgstr "" - -#: ../src/utils.cpp:750 -msgid "Checking backgrounds..." -msgstr "" - -#: ../src/utils.cpp:761 -#, c-format -msgid "%d backgrounds..." -msgstr "" - -#. Check ~./berusky/berusky.ini -#: ../src/utils.cpp:907 -#, c-format -msgid "Checking %s/%s..." -msgstr "" - -#: ../src/utils.cpp:909 -#, c-format -msgid "missing, try to copy it from %s..." -msgstr "" - -#: ../src/utils.cpp:912 ../src/utils.cpp:918 -msgid "ok" -msgstr "" - -#: ../src/utils.cpp:915 -msgid "failed" -msgstr "" - -#: ../src/berusky_gui.cpp:109 -msgid "Start in high resolution mode?" -msgstr "" - -#: ../src/berusky_gui.cpp:116 -msgid "yes" -msgstr "" - -#: ../src/berusky_gui.cpp:117 -msgid "no" -msgstr "" - -#: ../src/berusky_gui.cpp:135 -msgid "Don't ask again" -msgstr "" - -#: ../src/berusky_gui.cpp:253 -msgid "play" -msgstr "" - -#: ../src/berusky_gui.cpp:254 -msgid "change profile" -msgstr "" - -#: ../src/berusky_gui.cpp:255 -msgid "settings" -msgstr "" - -#: ../src/berusky_gui.cpp:256 -msgid "help" -msgstr "" - -#: ../src/berusky_gui.cpp:257 -msgid "editor" -msgstr "" - -#: ../src/berusky_gui.cpp:258 ../src/berusky_gui.cpp:2423 -msgid "quit" -msgstr "" - -#: ../src/berusky_gui.cpp:279 -#, c-format -msgid "berusky version %s (C) Anakreon 1997-2012\n" -msgstr "" - -#: ../src/berusky_gui.cpp:280 -msgid "distributed under GPLv2\n" -msgstr "" - -#: ../src/berusky_gui.cpp:285 -#, c-format -msgid "Selected profile: %s" -msgstr "" - -#: ../src/berusky_gui.cpp:331 -msgid "Choose your level map:" -msgstr "" - -#: ../src/berusky_gui.cpp:338 -msgid "user levels" -msgstr "" - -#. -#. menu_item_draw_checkbox(sound, MENU_LEFT, p_ber->sound.sound_on, 1, -#. LEVEL_EVENT(GC_MENU_SETTINGS_SOUND_SWITCH)); -#. menu_item_draw_checkbox(music, MENU_LEFT, p_ber->sound.music_on, 2, -#. LEVEL_EVENT(GC_MENU_SETTINGS_MUSIC_SWITCH)); -#. -#: ../src/berusky_gui.cpp:339 ../src/berusky_gui.cpp:451 -#: ../src/berusky_gui.cpp:568 ../src/berusky_gui.cpp:663 -#: ../src/berusky_gui.cpp:986 ../src/berusky_gui.cpp:1084 -#: ../src/berusky_gui.cpp:1168 ../src/berusky_gui.cpp:1260 -#: ../src/berusky_gui.cpp:1502 ../src/berusky_gui.cpp:2516 -msgid "back" -msgstr "" - -#: ../src/berusky_gui.cpp:402 -#, c-format -msgid "Current profile is: %s" -msgstr "" - -#: ../src/berusky_gui.cpp:408 -msgid "Create a new player profile:\n" -msgstr "" - -#: ../src/berusky_gui.cpp:416 -msgid "create" -msgstr "" - -#: ../src/berusky_gui.cpp:430 -msgid "Choose saved profile:\n" -msgstr "" - -#: ../src/berusky_gui.cpp:564 ../src/berusky_gui.cpp:1500 -msgid "level hint" -msgstr "" - -#: ../src/berusky_gui.cpp:565 -msgid "game controls" -msgstr "" - -#: ../src/berusky_gui.cpp:566 -msgid "game rulez" -msgstr "" - -#: ../src/berusky_gui.cpp:567 -msgid "authors" -msgstr "" - -#: ../src/berusky_gui.cpp:636 -msgid "fulscreen" -msgstr "" - -#: ../src/berusky_gui.cpp:637 -msgid "High resolution mode" -msgstr "" - -#: ../src/berusky_gui.cpp:638 -msgid "Ask on start up" -msgstr "" - -#: ../src/berusky_gui.cpp:699 -msgid "" -"The game must be restarted\n" -"for the change to take effect." -msgstr "" - -#: ../src/berusky_gui.cpp:754 -msgid "Basic rules and game elements" -msgstr "" - -#: ../src/berusky_gui.cpp:759 -msgid "" -"In order to leave each level it is\n" -"necessary to own five keys and also\n" -"to have a free way to the exit.\n" -"\n" -"You will be meeting miscellaneous game\n" -"elements while completing individual\n" -"missions, we will try to explain their\n" -"meaning now.\n" -msgstr "" - -#. 310 -#: ../src/berusky_gui.cpp:768 -msgid "box - it is possible to push it." -msgstr "" - -#: ../src/berusky_gui.cpp:784 -msgid "Light box - bugs can push two of them." -msgstr "" - -#: ../src/berusky_gui.cpp:800 -msgid "explosive - can destroy the boxes." -msgstr "" - -#: ../src/berusky_gui.cpp:820 ../src/berusky_gui.cpp:875 -#: ../src/berusky_gui.cpp:936 -msgid "Active game elements" -msgstr "" - -#: ../src/berusky_gui.cpp:826 -msgid "key - you need five of them." -msgstr "" - -#: ../src/berusky_gui.cpp:834 -msgid "exit - a gate to next level." -msgstr "" - -#: ../src/berusky_gui.cpp:848 -msgid "stone - can be broken by a pickax." -msgstr "" - -#: ../src/berusky_gui.cpp:861 -msgid "pickax - a tool for stone crushing." -msgstr "" - -#: ../src/berusky_gui.cpp:881 -msgid "" -"color key - used to unlock color door,\n" -"only a bug with identical color can\n" -"pick them up" -msgstr "" - -#: ../src/berusky_gui.cpp:899 -msgid "" -"color door - can be opened by the\n" -"respective color key only" -msgstr "" - -#: ../src/berusky_gui.cpp:915 -msgid "" -"color gate-way - only a bug with\n" -"identical color is allowed to go\n" -"through. Boxes cannot be pushed\n" -"through." -msgstr "" - -#: ../src/berusky_gui.cpp:942 -msgid "" -"one-pass door - can be used only once,\n" -"then it is closed off and there's no\n" -"way to open it\n" -msgstr "" - -#: ../src/berusky_gui.cpp:970 -msgid "" -"Other elements not listed here are just\n" -"walls, which have no interesting\n" -"properties. They cannot be push away nor\n" -"it is possible to break them anywise.\n" -msgstr "" - -#: ../src/berusky_gui.cpp:984 -msgid "previous" -msgstr "" - -#: ../src/berusky_gui.cpp:985 -msgid "next" -msgstr "" - -#: ../src/berusky_gui.cpp:1050 -msgid "Game Controls" -msgstr "" - -#: ../src/berusky_gui.cpp:1053 -msgid "" -"Up to five bugs are available,\n" -"which can be controlled by these keys:" -msgstr "" - -#: ../src/berusky_gui.cpp:1057 -msgid "arrows" -msgstr "" - -#: ../src/berusky_gui.cpp:1058 -msgid "SHIFT+arrows" -msgstr "" - -#: ../src/berusky_gui.cpp:1060 -msgid "Tab" -msgstr "" - -#: ../src/berusky_gui.cpp:1061 -msgid "N" -msgstr "" - -#: ../src/berusky_gui.cpp:1062 -msgid "D" -msgstr "" - -#: ../src/berusky_gui.cpp:1063 -msgid "CTRL+X" -msgstr "" - -#: ../src/berusky_gui.cpp:1065 -msgid "F2" -msgstr "" - -#: ../src/berusky_gui.cpp:1069 -msgid ". . . . . move the bug" -msgstr "" - -#: ../src/berusky_gui.cpp:1070 -msgid ". . quick bug movement" -msgstr "" - -#: ../src/berusky_gui.cpp:1071 -msgid ". . . . . . . switch among the bugs" -msgstr "" - -#: ../src/berusky_gui.cpp:1072 -msgid ". . . . . . . . change the music" -msgstr "" - -#: ../src/berusky_gui.cpp:1073 -msgid ". . . . . . . . demo" -msgstr "" - -#: ../src/berusky_gui.cpp:1074 -msgid ". . . . . . quit quickly" -msgstr "" - -#: ../src/berusky_gui.cpp:1075 -msgid ". . . . . . . . Help" -msgstr "" - -#: ../src/berusky_gui.cpp:1076 -msgid ". . . . . . . . Save level" -msgstr "" - -#: ../src/berusky_gui.cpp:1077 -msgid ". . . . . . . . Load level" -msgstr "" - -#: ../src/berusky_gui.cpp:1249 -msgid "Level hint:" -msgstr "" - -#: ../src/berusky_gui.cpp:1251 -msgid "" -"\n" -"Sorry dude, no hint available for this\n" -"level." -msgstr "" - -#: ../src/berusky_gui.cpp:1499 -msgid "play level" -msgstr "" - -#: ../src/berusky_gui.cpp:1501 -msgid "select last" -msgstr "" - -#. And print the level name -#: ../src/berusky_gui.cpp:2082 ../src/berusky_gui.cpp:2114 -#, c-format -msgid "Level: %d - %s" -msgstr "" - -#: ../src/berusky_gui.cpp:2225 -#, c-format -msgid "Unable to load level %d from set %d" -msgstr "" - -#: ../src/berusky_gui.cpp:2320 ../src/berusky_gui.cpp:2406 -msgid "your bugs have survived!" -msgstr "" - -#: ../src/berusky_gui.cpp:2321 ../src/berusky_gui.cpp:2326 -#, c-format -msgid "difficulty %s" -msgstr "" - -#: ../src/berusky_gui.cpp:2322 ../src/berusky_gui.cpp:2327 -#, c-format -msgid "they made %d steps" -msgstr "" - -#: ../src/berusky_gui.cpp:2323 ../src/berusky_gui.cpp:2412 -#, c-format -msgid "and %s." -msgstr "" - -#: ../src/berusky_gui.cpp:2325 -msgid "your bugs have given it up!" -msgstr "" - -#: ../src/berusky_gui.cpp:2328 -#, c-format -msgid "and spent %s" -msgstr "" - -#: ../src/berusky_gui.cpp:2341 -msgid "play next level" -msgstr "" - -#: ../src/berusky_gui.cpp:2342 ../src/berusky_gui.cpp:2585 -msgid "back to menu" -msgstr "" - -#: ../src/berusky_gui.cpp:2407 -#, c-format -msgid "custom level %s." -msgstr "" - -#: ../src/berusky_gui.cpp:2410 -#, c-format -msgid "it took %d steps" -msgstr "" - -#: ../src/berusky_gui.cpp:2576 -msgid "return to game (ESC)" -msgstr "" - -#: ../src/berusky_gui.cpp:2577 -msgid "restart level (CTRL+R)" -msgstr "" - -#: ../src/berusky_gui.cpp:2579 -msgid "save game (F2)" -msgstr "" - -#: ../src/berusky_gui.cpp:2580 -msgid "load game (F3)" -msgstr "" - -#: ../src/berusky_gui.cpp:2582 -msgid "level hint (CTRL+F1)" -msgstr "" - -#: ../src/berusky_gui.cpp:2583 -msgid "help (F1)" -msgstr "" - -#: ../src/berusky_gui.cpp:2586 -msgid "quit (CTRL+X)" -msgstr "" - -#: ../src/berusky_gui.cpp:2650 -msgid "Level saved..." -msgstr "" - -#: ../src/berusky_gui.cpp:2665 -msgid "Level loaded..." -msgstr "" - -#: ../src/main.cpp:61 -#, c-format -msgid "Berusky v.%s (C) Anakreon 2006, http://www.anakreon.cz/\n"; -msgstr "" - -#: ../src/main.cpp:62 -#, c-format -msgid "This is free software; see the source for copying conditions.\n" -msgstr "" - -#: ../src/main.cpp:63 -#, c-format -msgid "" -"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A " -"PARTICULAR PURPOSE.\n" -msgstr "" - -#: ../src/main.cpp:64 -#, c-format -msgid "" -"Built %s, %s\n" -"\n" -msgstr "" - -#: ../src/main.cpp:70 -#, c-format -msgid "" -"Bad command line argument(s)!\n" -"\n" -msgstr "" - -#: ../src/main.cpp:72 -#, c-format -msgid "" -"Using: berusky [-e [level.lv3]] [-u level.lv3]\n" -"\n" -msgstr "" - -#: ../src/main.cpp:73 -#, c-format -msgid " -e [level.lv3] -run level editor\n" -msgstr "" - -#: ../src/main.cpp:74 -#, c-format -msgid " -u level.lv3 -run level\n" -msgstr "" - -#: ../src/main.cpp:256 -#, c-format -msgid "Checking config file %s..." -msgstr "" - -#: ../src/main.cpp:260 -#, c-format -msgid "Selected config file %s" -msgstr "" - -#: ../src/main.cpp:267 -msgid "Can't find any configuration file!" -msgstr "" - -#: ../src/main.cpp:396 -#, c-format -msgid "Data dir '%s'" -msgstr "" - -#: ../src/main.cpp:397 -msgid "Loading items repository...." -msgstr "" - -#: ../src/main.cpp:401 -msgid "Failed, exiting..." -msgstr "" diff --git a/setup-gettext b/setup-gettext new file mode 100755 index 0000000..34aa1b7 --- /dev/null +++ b/setup-gettext @@ -0,0 +1,201 @@ +#!/bin/sh +# +# setup-gettext - Provides compatibility with versions of gettext +# from the 0.10.x series and 0.11.x. +# +# Copyright (C) 2002 Christian Hammond. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +VERSION=0.1.3 + +VERBOSE=1 + +parse_gettext_version() { + GETTEXT_VERSION=`$GETTEXT_TOOL --version | sed -n 's/^.*\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\).*$/\1.\2.\3/p'` + GETTEXT_MAJOR_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^\([0-9]\+\).*/\1/p'` + GETTEXT_MINOR_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^[0-9]\+\.\([0-9]\+\).*/\1/p'` + GETTEXT_MICRO_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^[0-9]\+\.[0-9]\+\.\([0-9]\+\).*/\1/p'` +} + +find_gettext() { + GETTEXT_TOOL=autopoint + + (autopoint --version) < /dev/null > /dev/null 2>&1 || { + GETTEXT_TOOL=gettextize + + (gettextize --version) < /dev/null > /dev/null 2>&1 || { + GETTEXT_TOOL= + } + } +} + +install() { + [ -f configure.in ] && { + cp configure.in .tmp-configure.in + sed -e 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\ +AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.in > configure.in + rm .tmp-configure.in + } + + [ -f configure.ac ] && { + cp configure.ac .tmp-configure.ac + sed -e 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\ +AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.ac > configure.ac + rm .tmp-configure.ac + } + + [ -f autogen.sh ] && { + cp autogen.sh .tmp-autogen.sh + sed -e 's/\(gettextize\|autopoint\) --version/.\/setup-gettext --gettext-tool/1' -e 's/^\(echo.*|[\t ]*\)\?\(gettextize\|autopoint\) -.*$/.\/setup-gettext/1' < .tmp-autogen.sh > autogen.sh + rm .tmp-autogen.sh + } + + echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> acinclude.m4 +} + +backup_m4() { + [ -d m4 ] && mv m4 m4~ +} + +restore_m4() { + [ -d m4~ ] && { + rm -rf m4 + mv m4~ m4 + } +} + +restore_files() { + [ -f configure.in~ ] && mv -f configure.in~ configure.in + [ -f configure.ac~ ] && mv -f configure.ac~ configure.ac + [ -f Makefile.am~ ] && mv -f Makefile.am~ Makefile.am +} + +abort() { + restore_files + restore_m4 + + exit 1 +} + +# Main code + +find_gettext + +# See if a version of gettext and its tools are installed. +if [ x$GETTEXT_TOOL = x ]; then + echo + echo "You do not have a version of gettext installed." + echo "Please download one from your local package repository or" + echo "from ftp://ftp.gnu.org/pub/gnu/gettext/"; + echo + exit 1 +fi + +parse_gettext_version + +NUMVAR=$# + +if [ $NUMVAR -gt 0 ]; then + if [ $NUMVAR -gt 1 ]; then + echo "Only one option at a time!" + exit 1 + + elif [ $1 = "--gettext-tool" ]; then + echo $GETTEXT_TOOL + exit 0 + + elif [ $1 = "--help" ]; then + echo "setup-gettext v$VERSION" + echo "Usage:" + echo " --gettext-tool Returns gettextize or autopoint, depending" + echo " on the version of gettext installed." + echo " --gettext-version Returns the version of gettext installed." + echo " --gettext-major-version Returns the major version of gettext installed." + echo " --gettext-minor-version Returns the minor version of gettext installed." + echo " --gettext-micro-version Returns the micro version of gettext installed." + echo " --help Displays this help screen." + echo + exit 0 + + elif [ $1 = "--version" ]; then + echo $VERSION + exit 0 + + elif [ $1 = "--gettext-version" ]; then + echo $GETTEXT_VERSION + exit 0 + + elif [ $1 = "--gettext-major-version" ]; then + echo $GETTEXT_MAJOR_VERSION + exit 0 + + elif [ $1 = "--gettext-minor-version" ]; then + echo $GETTEXT_MINOR_VERSION + exit 0 + + elif [ $1 = "--gettext-micro-version" ]; then + echo $GETTEXT_MICRO_VERSION + exit 0 + + elif [ $1 = "--install" ]; then + install + echo "setup-gettext installed." + exit 0 + + elif [ $1 = "--happy-url" ]; then + echo http://gaim.sf.net/forkgettext.jpg + exit 0 + + elif [ $1 = "--verbose" ]; then + VERBOSE=1 + + else + echo "Invalid option '$1'" + exit 1 + fi +fi + +# Okay, run the main stuff +if [ "$GETTEXT_TOOL" = "autopoint" ]; then + backup_m4 + [ $VERBOSE -eq 1 ] && echo " autopoint --force" + echo n | autopoint --force || abort + restore_m4 +else + if [ $GETTEXT_MINOR_VERSION -eq 11 ]; then + backup_m4 + + # Gettext is pure evil. It DEMANDS that we press Return no matter + # what. This gets rid of their happy "feature" of doom. + [ $VERBOSE -eq 1 ] && \ + echo " gettextize --copy --force --intl --no-changelog" + + sed 's:read .*< /dev/tty::' `which gettextize` > .temp-gettextize + chmod +x .temp-gettextize + echo n | ./.temp-gettextize --copy --force --intl --no-changelog || abort + rm .temp-gettextize + + restore_files + restore_m4 + + [ -f po/Makevars.template ] && mv po/Makevars.template po/Makevars + else + [ $VERBOSE -eq 1 ] && echo " gettextize --copy --force --intl" + echo n | gettextize --copy --force --intl || exit; + fi +fi diff --git a/src/2d_graph.cpp b/src/2d_graph.cpp index e1ab998..2b7d9b6 100644 --- a/src/2d_graph.cpp +++ b/src/2d_graph.cpp @@ -389,7 +389,7 @@ void surface::blend(tpos sx, tpos sy, tpos dx, tpos dy, tcolor color, BLEND_OP o pixel.g -= color_rgb.g; pixel.b -= color_rgb.b; - int rn = floor(((float)rand()/RAND_MAX)*10); + int rn = (int)floor(((float)rand()/RAND_MAX)*10); pixel.r -= rn; pixel.g -= rn; pixel.b -= rn; @@ -981,13 +981,13 @@ void graph_2d::check(void) void graph_2d::fullscreen_toggle(void) { - +#ifdef LINUX if(!SDL_WM_ToggleFullScreen(p_screen_surface->surf_get())) { bprintf("SDL_WM_ToggleFullScreen() failed!"); + return; } - else { - graphics_fullscreen = !graphics_fullscreen; - } +#endif + graphics_fullscreen = !graphics_fullscreen; } // ------------------------------------------------------- diff --git a/src/2d_graph.h b/src/2d_graph.h index 1f012dd..70503d1 100644 --- a/src/2d_graph.h +++ b/src/2d_graph.h @@ -749,7 +749,9 @@ public: void check(void); graph_2d(tpos dx, tpos dy, int depth, bool fullscreen) - : store(SURFACES, SPRITES), + : p_screen_surface(NULL), + p_screen(NULL), + store(SURFACES, SPRITES), rect_last(0) { /* sdl init */ diff --git a/src/Makefile.in b/src/Makefile.in index 0cde404..c1a0da3 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ 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;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,8 +80,8 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = berusky$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.in @@ -76,31 +104,65 @@ am_berusky_OBJECTS = 2d_graph.$(OBJEXT) animation.$(OBJEXT) \ berusky_OBJECTS = $(am_berusky_OBJECTS) am__DEPENDENCIES_1 = berusky_DEPENDENCIES = $(am__DEPENDENCIES_1) -berusky_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ - $(berusky_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +berusky_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(berusky_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(berusky_SOURCES) DIST_SOURCES = $(berusky_SOURCES) am__can_run_installinfo = \ @@ -108,11 +170,29 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -364,10 +444,12 @@ install-binPROGRAMS: $(bin_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -388,7 +470,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -401,9 +484,10 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + berusky$(EXEEXT): $(berusky_OBJECTS) $(berusky_DEPENDENCIES) $(EXTRA_berusky_DEPENDENCIES) @rm -f berusky$(EXEEXT) - $(berusky_LINK) $(berusky_OBJECTS) $(berusky_LDADD) $(LIBS) + $(AM_V_CXXLD)$(berusky_LINK) $(berusky_OBJECTS) $(berusky_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -433,25 +517,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -459,26 +543,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -490,15 +563,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -507,9 +576,10 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -664,19 +734,19 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool cscopelist ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS 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 maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + 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 maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/berusky_gui.cpp b/src/berusky_gui.cpp index 71b97c6..c832b3b 100644 --- a/src/berusky_gui.cpp +++ b/src/berusky_gui.cpp @@ -34,8 +34,8 @@ #endif #ifdef WINDOWS -#include <stdio.h> -#include <process.h> +#include <stdio.h> +#include <process.h> #endif #include "berusky.h" @@ -2687,8 +2687,13 @@ void game_gui::run_editor(void) bprintf("Pid %d done",pid); } #elif WINDOWS - bprintf("%s -e",p_dir->game_binary_get()); - int ret = _spawnl( _P_WAIT, p_dir->game_binary_get(),p_dir->game_binary_get(),"-e",NULL); + bprintf("%s -e",p_dir->game_binary_get()); + + char tmp[PATH_MAX] = "\""; + strcat(tmp, p_dir->game_binary_get()); + strcat(tmp, "\""); + + int ret = _spawnl( _P_WAIT, p_dir->game_binary_get(), tmp,"-e",NULL); if(ret == -1) { bprintf("Error: %s",strerror(errno)); } diff --git a/src/defines.h b/src/defines.h index 58d8d8a..df5145d 100644 --- a/src/defines.h +++ b/src/defines.h @@ -254,8 +254,6 @@ #define ROTATION_MIN 0 #define ROTATION_MAX 3 -#define BOOL_UNDEFINED (-1) -#define ERROR (-1) #define DEFAULT_LEVEL_NAME "a.lv3" @@ -450,14 +448,25 @@ typedef int anim_handle; #define INI_FILE_GLOBAL "/var/games/berusky/"INI_FILE_NAME #define INI_FILE_USER "~/.berusky/"INI_FILE_NAME #define INI_FILE_LOCAL "./"INI_FILE_NAME +#define DIRECTORY_GET(d) (d) +#define FILE_GET(d) (d) #elif WINDOWS -#define INI_USER_DIRECTORY "./" -#define INI_USER_LEVELS "./" -#define INI_FILE_GLOBAL INI_FILE_NAME -#define INI_FILE_USER INI_FILE_NAME -#define INI_FILE_LOCAL INI_FILE_NAME +#define INI_ANAKREON_DIR 0 +#define INI_BERUSKY_DIR 1 + +#define INI_USER_DIRECTORY 10 +#define INI_USER_LEVELS 11 +#define INI_USER_PROFILES 12 + +#define INI_FILE_GLOBAL 20 +#define INI_FILE_USER 21 +#define INI_FILE_LOCAL 22 + +#define DIRECTORY_GET(d) (windows_dir_get(d)) +#define FILE_GET(d) (windows_file_get(d)) #endif + #define INI_FILE (config_file()) #define LEVEL_HINTS_FILE "hints.dat" diff --git a/src/editor.cpp b/src/editor.cpp index 057be80..04f77ee 100644 --- a/src/editor.cpp +++ b/src/editor.cpp @@ -465,15 +465,17 @@ editor_gui::editor_gui(ITEM_REPOSITORY *p_repo_, DIR_LIST *p_dir_): gui_base(), p_dir(p_dir_), p_repo(p_repo_), - level(p_repo_), + level(p_repo_), console(&input,CONSOLE_X,CONSOLE_Y,CONSOLE_DX,CONSOLE_LINES), + console_callback(NULL), + console_callback_id(0), + p_side_event_first(NULL), panel_items(ITEMS_IN_PANEL, VERTICAL, 0, 0, PANEL_HANDLE_ITEMS, &panel_variants), panel_variants(ITEMS_IN_PANEL+2, HORIZONTAL, EDITOR_ITEM_SIZE_X, 0, PANEL_HANDLE_VARIANTS) { editor_panel::set_up(p_repo_); editor_panel_slot::set_up(p_repo_); - - + input.mevent_clear(); input.events_wait(TRUE); @@ -1000,7 +1002,15 @@ void editor_gui::level_new(bool force) undo_store(); console.print("new level"); level.level_new(); - strcpy(level_name,DEFAULT_LEVEL_NAME); + + level_name[0] = '\0'; +#ifdef WINDOWS + // Windows usualy don't allow to write to current working directory + // it may be in C:\\Program Files or so... + strcpy(level_name,p_dir->levels_user_get()); +#endif + strcat(level_name,DEFAULT_LEVEL_NAME); + level_edited_set(); level_edited_clear(); } @@ -1582,8 +1592,17 @@ void editor_gui::editor_run_level(void) bprintf("Saved as %s",filename); char level_name[MAX_FILENAME]; return_path(p_dir->tmp_get(), TMP_LEVEL, level_name, MAX_FILENAME); - bprintf("%s -u %s",p_dir->game_binary_get(),level_name); - int ret = _spawnl( _P_WAIT, p_dir->game_binary_get(),p_dir->game_binary_get(),"-u",level_name,NULL); + bprintf("%s -u %s",p_dir->game_binary_get(),level_name); + + char game_path[PATH_MAX] = "\""; + strcat(game_path, p_dir->game_binary_get()); + strcat(game_path, "\""); + + char level_path[PATH_MAX] = "\""; + strcat(level_path, level_name); + strcat(level_path, "\""); + + int ret = _spawnl( _P_WAIT, p_dir->game_binary_get(),game_path,"-u",level_path,NULL); if(ret == -1) { bprintf("Error: %s",strerror(errno)); } @@ -1913,7 +1932,7 @@ void editor_gui::input_start(EDITOR_CONSOLE_CALLBACK callback, int callback_id, /* An editor interface to console */ -void editor_gui::console_input(MENU_STATE state, int data, int data1) +void editor_gui::console_input(MENU_STATE state, size_ptr data, size_ptr data1) { switch(data) { case K_ENTER: @@ -1948,14 +1967,10 @@ void editor_gui::input_stop(bool success) /* Wait for a key */ -void editor_gui::console_wait(MENU_STATE state, int data, int data1) +void editor_gui::console_wait(MENU_STATE state, size_ptr data, size_ptr data1) { - switch(data) { - default: - help_quit(); - input_stop(TRUE); - break; - } + help_quit(); + input_stop(TRUE); } // ---------------------------------------------------------------------- diff --git a/src/editor.h b/src/editor.h index 302a331..524c250 100644 --- a/src/editor.h +++ b/src/editor.h @@ -542,8 +542,8 @@ public: #define HANDLE_4 (NO_HANDLE+4) void input_start(EDITOR_CONSOLE_CALLBACK callback, int callback_id, INPUT_TYPE type, char *p_text,...); - void console_input(MENU_STATE state, int data, int data1); - void console_wait(MENU_STATE state, int data, int data1); + void console_input(MENU_STATE state, size_ptr data, size_ptr data1); + void console_wait(MENU_STATE state, size_ptr data, size_ptr data1); void input_stop(bool success); void console_draw(bool draw) diff --git a/src/ini.cpp b/src/ini.cpp index 70d02a6..99eb5b4 100644 --- a/src/ini.cpp +++ b/src/ini.cpp @@ -280,8 +280,12 @@ bool ini_write_string(const char *p_file, FHANDLE f_orig = file_open(NULL, p_file, "r", FALSE); if (!f_orig) return(FALSE); - + +#ifdef WINDOWS + FHANDLE f_new(tmpfile_get()); +#else FHANDLE f_new(tmpfile()); +#endif if (!f_new) return(FALSE); diff --git a/src/level_active.h b/src/level_active.h index eb43a4f..b20c39b 100644 --- a/src/level_active.h +++ b/src/level_active.h @@ -77,7 +77,7 @@ public: Level Store ******************************************************* */ -#define MAX_LEVELNAME 50 +#define MAX_LEVELNAME PATH_MAX #define MAX_PASSWORD 50 typedef struct level_store_item { diff --git a/src/main.cpp b/src/main.cpp index 85fad96..3ea2281 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -247,7 +247,10 @@ void run_editor(GAME_MODE gmode, char *p_garg, DIR_LIST *p_dir) */ const char * config_file(bool configure) { - static const char *files[] = { INI_FILE_LOCAL, INI_FILE_USER, INI_FILE_GLOBAL }; + static const char *files[] = { FILE_GET(INI_FILE_LOCAL), + FILE_GET(INI_FILE_USER), + FILE_GET(INI_FILE_GLOBAL) + }; static const char *ini_file = NULL; if(configure) { @@ -287,7 +290,11 @@ int main(int argc, char *argv[]) #endif banner(); - + + int i; + for(i = 0; i < argc; i++) + bprintf("argv[%d] = %s\n",i,argv[i]); + /* Run help */ if((argc > 3) || (argc > 1 && (argv[1][0] != '-' || argv[1][1] == '?' || argv[1][1] == 'h'))) { diff --git a/src/portability.h b/src/portability.h index c775cf8..984b7ff 100644 --- a/src/portability.h +++ b/src/portability.h @@ -39,16 +39,22 @@ #define WINDOWS 1 #undef LINUX - + +#include <io.h> +#include "window.h" + +#define VERSION "1.7.1" #define PATH_MAX 128 #define random() rand() #define snprintf _snprintf #define mkdirm _mkdir +#define mktemp _mktemp +#define stat _stat // Stupid VC2010 #pragma warning(disable: 4996 4800) - + #endif // _WIN32 /* diff --git a/src/profile.cpp b/src/profile.cpp index fb7260b..7c68320 100644 --- a/src/profile.cpp +++ b/src/profile.cpp @@ -111,7 +111,7 @@ void berusky_profile::save(void) level_set[3].level_last, level_set[4].level_last, level_set[5].level_last); - file_save(INI_USER_PROFILES, filename, (void *)buffer, strlen(buffer), "w"); + file_save(DIRECTORY_GET(INI_USER_PROFILES), filename, (void *)buffer, strlen(buffer), "w"); } void berusky_profile::create(const char *p_name) @@ -132,13 +132,13 @@ bool profiles_load(BERUSKY_PROFILE **p_profiles, int *p_num) *p_profiles = NULL; *p_num = 0; - int files = file_list_get(INI_USER_PROFILES, PROFILE_FILE_MASK, &p_profile_names); + int files = file_list_get(DIRECTORY_GET(INI_USER_PROFILES), PROFILE_FILE_MASK, &p_profile_names); if(!files) return(FALSE); BERUSKY_PROFILE *p_list = new BERUSKY_PROFILE[files]; for(int i = 0; i < files; i++) { - p_list[i].load(INI_USER_PROFILES, p_profile_names[i].name); + p_list[i].load(DIRECTORY_GET(INI_USER_PROFILES), p_profile_names[i].name); } ffree(p_profile_names); diff --git a/src/types.h b/src/types.h index f44e55f..b4457a9 100644 --- a/src/types.h +++ b/src/types.h @@ -33,6 +33,6 @@ typedef unsigned int dword; typedef unsigned short word; typedef unsigned char byte; -typedef size_t size_ptr; +typedef size_t size_ptr; #endif // __TYPES_H__ diff --git a/src/utils.cpp b/src/utils.cpp index 1da6f56..b2f1da4 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -33,11 +33,13 @@ #include <errno.h> #include <sys/stat.h> #include <sys/types.h> -#include <dirent.h> -#include <fnmatch.h> #include "portability.h" +#ifdef LINUX +#include <dirent.h> +#include <fnmatch.h> +#endif #ifdef WINDOWS #include <direct.h> #endif @@ -107,25 +109,35 @@ void dir_list::load(const char *p_ini) #define INI_GAME "game_data" #define INI_GRAPHICS "graphics_data" #define INI_LEVEL_USER "level_data_user" - #define INI_TMP "tmp_data" + #define INI_BINARY "game_binary" ini_read_string_file(p_ini, INI_LEVEL, levels, sizeof(levels), "./Lihen/Levels"); ini_read_string_file(p_ini, INI_GAME, gamedata, sizeof(gamedata), "./Lihen/GameData"); ini_read_string_file(p_ini, INI_GRAPHICS, graphics, sizeof(graphics), "./Lihen/Graphics"); + ini_read_string_file(p_ini, INI_BINARY, game_binary, sizeof(game_binary), "berusky"); + +#ifdef LINUX ini_read_string_file(p_ini, INI_LEVEL_USER, levels_user, sizeof(levels_user), "./Lihen/User"); + + #define INI_TMP "tmp_data" ini_read_string_file(p_ini, INI_TMP, tmp, sizeof(tmp), "/var/tmp"); getcwd(cwd,MAX_FILENAME); - update_path(levels); update_path(gamedata); update_path(graphics); update_path(levels_user); update_path(tmp); chdir(cwd); +#endif - #define INI_BINARY "game_binary" - ini_read_string_file(p_ini, INI_BINARY, game_binary, sizeof(game_binary), "berusky"); +#ifdef WINDOWS + strcpy(levels_user,DIRECTORY_GET(INI_USER_LEVELS)); + + char path[PATH_MAX]; + strcpy(tmp,tmpfile_get(path)); + dir_create(tmp); +#endif bprintf("level_data: %s",levels); bprintf("game_data: %s",gamedata); @@ -144,7 +156,7 @@ bool get_fullscreen(const char *p_ini_file) bool set_fullscreen(const char *p_ini_file, bool state) { char tmp[100]; - return(ini_write_string(p_ini_file, INI_FULLSCREEN, itoa(10, tmp, state ? 1 : 0))); + return(ini_write_string(p_ini_file, INI_FULLSCREEN, my_itoa(10, tmp, state ? 1 : 0))); } #define INI_DOUBLESIZE "disable_double_size" @@ -157,7 +169,7 @@ bool set_doublesize(const char *p_ini_file, bool state) { char tmp[100]; // it's reversed - disable_double_size = 0 is the default - return(ini_write_string(p_ini_file, INI_DOUBLESIZE, itoa(10, tmp, !state ? 1 : 0))); + return(ini_write_string(p_ini_file, INI_DOUBLESIZE, my_itoa(10, tmp, !state ? 1 : 0))); } #define INI_DOUBLESIZE_QUESTION "startup_doublesize_question" @@ -169,7 +181,7 @@ bool get_doublesize_question(const char *p_ini_file) bool set_doublesize_question(const char *p_ini_file, bool state) { char tmp[100]; - return(ini_write_string(p_ini_file, INI_DOUBLESIZE_QUESTION, itoa(10, tmp, state ? 1 : 0))); + return(ini_write_string(p_ini_file, INI_DOUBLESIZE_QUESTION, my_itoa(10, tmp, state ? 1 : 0))); } int get_colors(const char *p_ini_file, int default_color_depth) @@ -178,8 +190,7 @@ int get_colors(const char *p_ini_file, int default_color_depth) return(ini_read_int_file(p_ini_file, INI_COLOR, default_color_depth)); } -#ifdef LINUX -char * itoa(int base, char *buf, int d) +char * my_itoa(int base, char *buf, int d) { char *p = buf; char *p1, *p2; @@ -218,7 +229,6 @@ char * itoa(int base, char *buf, int d) } return(buf); } -#endif // LINUX /* Create a path */ char * return_path(const char *p_dir, const char *p_file, char *p_buffer, int max_lenght) @@ -428,7 +438,7 @@ int file_size_get(const char * p_dir, const char * p_file) void print_errno(bool new_line) { if(new_line) { - bprintf("\n%s",strerror(errno)); + bprintf("\nError: %s",strerror(errno)); } else { bprintf(strerror(errno)); } @@ -452,22 +462,24 @@ char * dir_home_get(char *p_dir, int max) bool dir_create(const char *p_dir) { assert(p_dir); + struct stat st; char tmp_dir[MAX_FILENAME]; +#ifdef WINDOWS + strcpy(tmp_dir, p_dir); +#else return_path(p_dir, "", tmp_dir, MAX_FILENAME); - - struct stat st; +#endif // Check the dir bprintfnl("Checking %s...",tmp_dir); if(stat(tmp_dir,&st) == -1 && errno == ENOENT) { - bprintfnl("missing, try to create it..."); + bprintfnl("\nmissing, try to create it..."); if(mkdirm(tmp_dir) != -1) { bprintf("ok"); return(TRUE); } else { - print_errno(TRUE); - bprintf("failed"); + print_errno(TRUE); return(FALSE); } } else { @@ -510,41 +522,42 @@ int file_list_get(const char *p_dir, const char *p_mask, DIRECTORY_ENTRY **p_lis #endif #ifdef WINDOWS -int file_list_get(const char *p_dir, const char *p_mask, DIRECTORY_ENTRY *p_list) -{ - PLAYER_PROFILE Profile; - FILE *file; - long Done, error; +int file_list_get(const char *p_dir, const char *p_mask, DIRECTORY_ENTRY **p_list) +{ + long ret, handle; + char current_dir[MAX_FILENAME]; struct _finddata_t Data; + int size; + + _getcwd(current_dir,MAX_FILENAME); + _chdir(p_dir); - Done = _findfirst(p_mask,&Data); - error = Done; - - while(error != -1) + size = 0; + handle = ret = _findfirst(p_mask, &Data); + while(ret != -1) { - if(error != -1) - { - file = fopen(Data.name, "rb"); - - if(file) - { - fread(&Profile, sizeof(PLAYER_PROFILE), 1, file); - fclose(file); - - if(!wcscmp(Profile.cName, wName)) - { - strcpy(cFile, Data.name); - _findclose(Done); - return 1; - } - } - - error = _findnext(Done,&Data); - } + size++; + ret = _findnext(handle, &Data); } - _findclose(Done); + _findclose(handle); - return 0; + // Sorry dude, no files + if(size) { + *p_list = (DIRECTORY_ENTRY *)mmalloc(sizeof(DIRECTORY_ENTRY)*size); + + size = 0; + handle = ret = _findfirst(p_mask, &Data); + while(ret != -1) + { + strcpy((*p_list)[size++].name, Data.name); + ret = _findnext(handle, &Data); + } + _findclose(handle); + } + + _chdir(current_dir); + + return size; } #endif @@ -899,15 +912,24 @@ void graphics_generate(void) void user_directory_create(void) { // Check ~./berusky - dir_create(INI_USER_DIRECTORY); - dir_create(INI_USER_LEVELS); - dir_create(INI_USER_PROFILES); +#ifdef WINDOWS + dir_create(DIRECTORY_GET(INI_ANAKREON_DIR)); + dir_create(DIRECTORY_GET(INI_BERUSKY_DIR)); +#endif + + dir_create(DIRECTORY_GET(INI_USER_DIRECTORY)); + dir_create(DIRECTORY_GET(INI_USER_LEVELS)); + dir_create(DIRECTORY_GET(INI_USER_PROFILES)); // Check ~./berusky/berusky.ini - bprintfnl(_("Checking %s/%s..."),INI_USER_DIRECTORY,INI_FILE_NAME); - if(!file_exists(INI_USER_DIRECTORY,INI_FILE_NAME)) { - bprintfnl(_("missing, try to copy it from %s..."),INI_FILE_GLOBAL); - bool ret = file_copy(INI_FILE_GLOBAL, NULL, INI_FILE_NAME, INI_USER_DIRECTORY,FALSE); + bprintfnl(_("Checking %s/%s..."),DIRECTORY_GET(INI_USER_DIRECTORY),INI_FILE_NAME); + if(!file_exists(DIRECTORY_GET(INI_USER_DIRECTORY),INI_FILE_NAME)) { + bprintfnl(_("missing, try to copy it from %s..."),FILE_GET(INI_FILE_GLOBAL)); + bool ret = file_copy(FILE_GET(INI_FILE_GLOBAL), + NULL, + INI_FILE_NAME, + DIRECTORY_GET(INI_USER_DIRECTORY), + FALSE); if(ret) { bprintf(_("ok")); } else { @@ -919,3 +941,4 @@ void user_directory_create(void) } bprintf(" "); } + diff --git a/src/utils.h b/src/utils.h index a713306..7d2c32f 100644 --- a/src/utils.h +++ b/src/utils.h @@ -71,6 +71,9 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif +#define BOOL_UNDEFINED (-1) +#define ERROR (-1) + #define POINTER_TO_INT(pointer) (*((int*)&(pointer))) #define INT_TO_POINTER(integer) (reinterpret_cast<void *>(integer)) @@ -396,9 +399,7 @@ inline char * change_tail(char * p_str, const char * p_end) return (p_end ? (char *) strcat(p_str, p_end) : p_str); } -#ifdef LINUX -char * itoa(int base, char *buf, int d); -#endif +char * my_itoa(int base, char *buf, int d); typedef struct _DIRECTORY_ENTRY { diff --git a/stamp-h.in b/stamp-h.in new file mode 100644 index 0000000..9788f70 --- /dev/null +++ b/stamp-h.in @@ -0,0 +1 @@ +timestamp -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/berusky.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
