(linux-only)

- version set to 0.89 - added icon and desktop file for client - updated compilers warning settings
2024-12-24 22:14:36 +02:00 · 2012-06-01 17:28:05 +00:00 · 2012-06-01 17:28:05 +00:00 · c3eead45d4
commit c3eead45d4
parent dc4d30df0e
9 changed files with 134 additions and 33 deletions
--- 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:

--- 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 $<
--- 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 $<
--- a/client/vcmiclient.desktop
+++ 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
--- a/client/vcmiclient.png
+++ b/client/vcmiclient.png
--- a/27
+++ b/27
@ -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\\"

--- 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
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,10 @@
+vcmi (0.89) unstable; urgency=low
+
+  * New upstream release
+  * Removed unnecessary dependencies
+
+ -- Ivan Savenko <saven.ivan@gmail.com>  Fri, 1 June 2012 20:06:50 +0200
+
 vcmi (0.88) unstable; urgency=low

  * New upstream release
--- a/debian/control
+++ b/debian/control
@ -2,7 +2,7 @@ Source: vcmi
 Section: games
 Priority: extra
 Maintainer: frank zago <frank@zago.net>
-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