From c3eead45d4b65cd00da35109bc6fffea04abe459 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Fri, 1 Jun 2012 17:28:05 +0000 Subject: [PATCH] (linux-only) - version set to 0.89 - added icon and desktop file for client - updated compilers warning settings --- README.linux | 8 ++-- client/Makefile.am | 11 +++++ client/Makefile.in | 94 ++++++++++++++++++++++++++++++++++---- client/vcmiclient.desktop | 9 ++++ client/vcmiclient.png | Bin 0 -> 5578 bytes configure | 27 +++++------ configure.ac | 9 ++-- debian/changelog | 7 +++ debian/control | 2 +- 9 files changed, 134 insertions(+), 33 deletions(-) create mode 100644 client/vcmiclient.desktop create mode 100644 client/vcmiclient.png diff --git a/README.linux b/README.linux index 49fcb2539..3a2ebd285 100644 --- a/README.linux +++ b/README.linux @@ -22,7 +22,7 @@ To compile, at least the following packages (and their development counterparts) - thread On Debian-based systems (e.g. Ubuntu) run: - sudo apt-get install g++ libsdl1.2debian-all libsdl-image1.2-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev zlib1g-dev libavformat-dev libswscale-dev libboost-dev libboost-filesystem-dev libboost-iostreams-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev + sudo apt-get install g++ libsdl1.2debian libsdl-image1.2-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev zlib1g-dev libavformat-dev libswscale-dev libboost-dev libboost-filesystem-dev libboost-iostreams-dev libboost-system-dev libboost-thread-dev libboost-program-options-dev On Fedora run(this may not be complete): sudo yum install gcc-c++ SDL-devel SDL_image-devel SDL_ttf-devel boost boost-devel boost-filesystem boost-iostreams boost-system boost-thread boost-program-options zlib-devel ffmpeg-devel ffmpeg-libs @@ -80,12 +80,14 @@ Since VCMI is still in development, there's no install procedure, although this make install You also need to update configuration files: cp /PATH_TO_SOURCE/config /DATA_PATH/vcmi +In this case you'll have to manually update after any changes. +For more permament solution you should use links as described below. For development puposes, it's better to use links. Go to /BIN_PATH/, and type: - ln -s /PATH_TO_SOURCE/client/vcmiclient - ln -s /PATH_TO_SOURCE/server/vcmiserver + ln -s /PATH_TO_SOURCE/client/.libs/vcmiclient + ln -s /PATH_TO_SOURCE/server/.libs/vcmiserver Go to /LIB_PATH/vcmi, and type: diff --git a/client/Makefile.am b/client/Makefile.am index bb2be34ee..46c4d341f 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,4 +1,15 @@ bin_PROGRAMS = vcmiclient + +desktopdir = $(datadir)/applications +desktop_DATA = vcmiclient.desktop + +icondir = $(datadir)/icons +dist_icon_DATA = vcmiclient.png + +EXTRA_DIST = \ + $(pixmaps_extra_DATA) \ + ${desktop_DATA} + BUILT_SOURCES = StdInc.h.gch StdInc.h.gch: StdInc.h $(CXXCOMPILE) -c $< diff --git a/client/Makefile.in b/client/Makefile.in index 3af0d17b2..a31812544 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -15,6 +15,7 @@ @SET_MAKE@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -36,7 +37,8 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = vcmiclient$(EXEEXT) subdir = client -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(dist_icon_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/aclocal/m4/ax_boost_base.m4 \ $(top_srcdir)/aclocal/m4/ax_boost_filesystem.m4 \ @@ -56,7 +58,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \ + "$(DESTDIR)$(icondir)" PROGRAMS = $(bin_PROGRAMS) am_vcmiclient_OBJECTS = vcmiclient-CCallback.$(OBJEXT) \ vcmiclient-CBattleAnimations.$(OBJEXT) \ @@ -140,6 +143,34 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(vcmiclient_SOURCES) DIST_SOURCES = $(vcmiclient_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +DATA = $(desktop_DATA) $(dist_icon_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -277,6 +308,14 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +desktopdir = $(datadir)/applications +desktop_DATA = vcmiclient.desktop +icondir = $(datadir)/icons +dist_icon_DATA = vcmiclient.png +EXTRA_DIST = \ + $(pixmaps_extra_DATA) \ + ${desktop_DATA} + BUILT_SOURCES = StdInc.h.gch vcmiclient_LDADD = $(top_builddir)/lib/libvcmi.la @SDL_LIBS@ @FFMPEG_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @BOOST_IOSTREAMS_LIB@ -lz vcmiclient_CXXFLAGS = @SDL_CFLAGS@ @FFMPEG_CXXFLAGS@ @@ -979,6 +1018,42 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-desktopDATA: $(desktop_DATA) + @$(NORMAL_INSTALL) + test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ + done + +uninstall-desktopDATA: + @$(NORMAL_UNINSTALL) + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) +install-dist_iconDATA: $(dist_icon_DATA) + @$(NORMAL_INSTALL) + test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" + @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \ + done + +uninstall-dist_iconDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -1065,9 +1140,9 @@ distdir: $(DISTFILES) check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(PROGRAMS) +all-am: Makefile $(PROGRAMS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icondir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1124,7 +1199,7 @@ info: info-am info-am: -install-data-am: +install-data-am: install-desktopDATA install-dist_iconDATA install-dvi: install-dvi-am @@ -1170,7 +1245,8 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS +uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ + uninstall-dist_iconDATA .MAKE: all check install install-am install-strip @@ -1178,7 +1254,8 @@ uninstall-am: uninstall-binPROGRAMS clean-generic clean-libtool 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-binPROGRAMS install-data install-data-am \ + install-desktopDATA install-dist_iconDATA 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 \ @@ -1186,7 +1263,8 @@ uninstall-am: uninstall-binPROGRAMS maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS + uninstall-binPROGRAMS uninstall-desktopDATA \ + uninstall-dist_iconDATA StdInc.h.gch: StdInc.h $(CXXCOMPILE) -c $< diff --git a/client/vcmiclient.desktop b/client/vcmiclient.desktop new file mode 100644 index 000000000..64466b395 --- /dev/null +++ b/client/vcmiclient.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=VCMI +GenericName=Strategy Game Engine +Comment=Open engine for Heroes of Might and Magic 3 +Icon=vcmiclient +Exec=vcmiclient +Categories=Game;StrategyGame; +Version=0.89 diff --git a/client/vcmiclient.png b/client/vcmiclient.png new file mode 100644 index 0000000000000000000000000000000000000000..7ea3c9ff9c13eef55a8a3afda193daf551cd8d1c GIT binary patch literal 5578 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 Y0T6f$rsNSk`2YX_07*qoM6N<$f^{j<%K!iX literal 0 HcmV?d00001 diff --git a/configure b/configure index 0bfd23a20..48a6dd2f7 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for vcmi 0.88b. +# Generated by GNU Autoconf 2.68 for vcmi 0.89. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='vcmi' PACKAGE_TARNAME='vcmi' -PACKAGE_VERSION='0.88b' -PACKAGE_STRING='vcmi 0.88b' +PACKAGE_VERSION='0.89' +PACKAGE_STRING='vcmi 0.89' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1325,7 +1325,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures vcmi 0.88b to adapt to many kinds of systems. +\`configure' configures vcmi 0.89 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1395,7 +1395,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vcmi 0.88b:";; + short | recursive ) echo "Configuration of vcmi 0.89:";; esac cat <<\_ACEOF @@ -1536,7 +1536,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vcmi configure 0.88b +vcmi configure 0.89 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2131,7 +2131,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vcmi $as_me 0.88b, which was +It was created by vcmi $as_me 0.89, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2946,7 +2946,7 @@ fi # Define the identity of the package. PACKAGE='vcmi' - VERSION='0.88b' + VERSION='0.89' cat >>confdefs.h <<_ACEOF @@ -15218,18 +15218,15 @@ if test "x$GXX" = "xyes" -a "x$enable_debug" = "xyes" ; then CXXFLAGS="$CXXFLAGS -O0 -ggdb" fi -# For c++11 compatibility. Required at least in VCAI -CXXFLAGS="$CXXFLAGS -std=c++0x" - # For gcc and compatible compilers, enable compilation warnings, but # selectively disable some because too many are generated. if test "x$GXX" = "xyes" ; then - CXXFLAGS="$CXXFLAGS -Wall -Wno-switch -Wno-sign-compare -Wcast-align -Wpointer-arith" + CXXFLAGS="$CXXFLAGSc -std=c++0x -Wall -Wextra -Wcast-align -Wpointer-arith -Wno-switch -Wno-sign-compare -Wno-unused-parameter" fi # extra clang parameters if test "x${ax_cv_cxx_compiler_vendor}" = "xclang" ; then - CXXFLAGS="$CXXFLAGS -Wno-address-of-temporary -Wno-unused-value -Wno-cast-align" + CXXFLAGS="$CXXFLAGS -Wno-cast-align -Woverloaded-virtual" fi # extra Intel icc parameters @@ -18194,7 +18191,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vcmi $as_me 0.88b, which was +This file was extended by vcmi $as_me 0.89, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18251,7 +18248,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -vcmi config.status 0.88b +vcmi config.status 0.89 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 208dce87a..a38d5121f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT(vcmi, 0.88b) # Follow VCMI_VERSION in GameConstants.h +AC_INIT(vcmi, 0.89) # Follow VCMI_VERSION in GameConstants.h AM_INIT_AUTOMAKE AC_CONFIG_MACRO_DIR([aclocal/m4]) @@ -30,18 +30,15 @@ if test "x$GXX" = "xyes" -a "x$enable_debug" = "xyes" ; then CXXFLAGS="$CXXFLAGS -O0 -ggdb" fi -# For c++11 compatibility. Required at least in VCAI -CXXFLAGS="$CXXFLAGS -std=c++0x" - # For gcc and compatible compilers, enable compilation warnings, but # selectively disable some because too many are generated. if test "x$GXX" = "xyes" ; then - CXXFLAGS="$CXXFLAGS -Wall -Wno-switch -Wno-sign-compare -Wcast-align -Wpointer-arith" + CXXFLAGS="$CXXFLAGSc -std=c++0x -Wall -Wextra -Wcast-align -Wpointer-arith -Wno-switch -Wno-sign-compare -Wno-unused-parameter" fi # extra clang parameters if test "x${ax_cv_cxx_compiler_vendor}" = "xclang" ; then - CXXFLAGS="$CXXFLAGS -Wno-address-of-temporary -Wno-unused-value -Wno-cast-align" + CXXFLAGS="$CXXFLAGS -Wno-cast-align -Woverloaded-virtual" fi # extra Intel icc parameters diff --git a/debian/changelog b/debian/changelog index 5e1784025..30f31cea2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vcmi (0.89) unstable; urgency=low + + * New upstream release + * Removed unnecessary dependencies + + -- Ivan Savenko Fri, 1 June 2012 20:06:50 +0200 + vcmi (0.88) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index bb9980722..b26635872 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: vcmi Section: games Priority: extra Maintainer: frank zago -Build-Depends: debhelper (>= 7), cdbs (>= 0.4.48), autotools-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev (>= 1.2.8), zlib1g-dev, libavformat-dev, libswscale-dev, libboost-all-dev (>=1.37) +Build-Depends: debhelper (>= 7), cdbs (>= 0.4.48), autotools-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev (>= 1.2.8), zlib1g-dev, libavformat-dev, libswscale-dev, libboost-dev (>=1.44), libboost-program-options-dev (>=1.44), libboost-filesystem-dev (>=1.44), libboost-iostreams-dev (>=1.44), libboost-system-dev (>=1.44), libboost-thread-dev (>=1.44) Standards-Version: 3.8.0 Homepage: http://vcmi.eu