[opencity] 87/91: Imported Upstream version 0.0.6.4stable
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Mar 25 12:23:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository opencity.
commit 56c65bf7b6d1b26fccb1afb3b5456af202cc1b36
Author: Markus Koschany <apo at gambaru.de>
Date: Wed Mar 25 13:07:38 2015 +0100
Imported Upstream version 0.0.6.4stable
---
Makefile.in | 2 +-
README | 2 +-
TODO | 2 +-
configure | 57 ++++++++++++++++++++++++++++-----------------
configure.ac | 46 +++++++++++++++++++++++++-----------
src/extensionmanager.cpp | 12 +++++++++-
src/globalvar.h | 4 ++--
src/main.cpp | 2 +-
src/main.h | 2 +-
src/model/ac3dmaterial.cpp | 2 +-
src/model/ac3dobject.cpp | 2 +-
src/model/ac3dsurface.cpp | 2 +-
src/pathfinder.cpp | 10 ++++++--
src/propertymanager.cpp | 18 +++++++-------
src/structure/structure.cpp | 8 +++----
15 files changed, 110 insertions(+), 61 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 292f3cb..f5ee69a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -483,7 +483,7 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -find $(distdir) -type d ! -perm -755 -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
diff --git a/README b/README
index 568734a..8424fd4 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
README for OpenCity 0.0.7dev
------------------------------------------------------------------------------
Last modified:
- $Id: README 421 2009-10-10 12:22:14Z neoneurone $
+ $Id: README 451 2010-12-11 12:05:23Z neoneurone $
Audience:
# End-users:
diff --git a/TODO b/TODO
index dbaf918..f1a6e1d 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,7 @@
OpenCity TODO version 0.0.7 BETA
--------------------------------
Last modified:
- $Id: TODO 389 2008-11-11 12:32:40Z neoneurone $
+ $Id: TODO 451 2010-12-11 12:05:23Z neoneurone $
diff --git a/configure b/configure
index 0614da9..233a971 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.63 for OpenCity 0.0.6.2stable.
+# Generated by GNU Autoconf 2.63 for OpenCity 0.0.6.4stable.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='OpenCity'
PACKAGE_TARNAME='opencity'
-PACKAGE_VERSION='0.0.6.2stable'
-PACKAGE_STRING='OpenCity 0.0.6.2stable'
+PACKAGE_VERSION='0.0.6.4stable'
+PACKAGE_STRING='OpenCity 0.0.6.4stable'
PACKAGE_BUGREPORT=''
ac_unique_file="src/main.cpp"
@@ -758,6 +758,7 @@ enable_gprof
enable_gdb
enable_debug
enable_mingw
+enable_as_needed
'
ac_precious_vars='build_alias
host_alias
@@ -1323,7 +1324,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 OpenCity 0.0.6.2stable to adapt to many kinds of systems.
+\`configure' configures OpenCity 0.0.6.4stable to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1394,7 +1395,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenCity 0.0.6.2stable:";;
+ short | recursive ) echo "Configuration of OpenCity 0.0.6.4stable:";;
esac
cat <<\_ACEOF
@@ -1414,6 +1415,7 @@ Optional Features:
--enable-gdb enable GDB support with debugging enabled
--enable-debug enable ALL debugging codes
--enable-mingw enable MinGW32 support
+ --enable-as-needed link with --as-needed flag
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1499,7 +1501,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenCity configure 0.0.6.2stable
+OpenCity configure 0.0.6.4stable
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1513,7 +1515,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 OpenCity $as_me 0.0.6.2stable, which was
+It was created by OpenCity $as_me 0.0.6.4stable, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2360,7 +2362,7 @@ fi
# Define the identity of the package.
PACKAGE='opencity'
- VERSION='0.0.6.2stable'
+ VERSION='0.0.6.4stable'
cat >>confdefs.h <<_ACEOF
@@ -4372,9 +4374,6 @@ $as_echo "$as_me: error: SDL version $SDL_VERSION not found" >&2;}
-CXXFLAGS="$SDL_CFLAGS"
-LDFLAGS="$LDFLAGS $SDL_LIBS"
-
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4862,6 +4861,9 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+CPPFLAGS="$SDL_CFLAGS"
+LIBS="$SDL_LIBS"
+
@@ -5701,7 +5703,7 @@ $as_echo_n "checking SDL_mixer support... " >&6; }
if test "x$SDL_mixer_h" = "xyes"; then
if test "x$SDL_mixer_lib" = "xyes"; then
- LDFLAGS="$LDFLAGS -lSDL_mixer"
+ LIBS="$SDL_LIBS -lSDL_mixer"
cat >>confdefs.h <<\_ACEOF
#define OPENCITY_SDL_MIXER 1
@@ -5787,7 +5789,7 @@ fi
if test "x$enable_mingw" = "xyes"; then
- LDFLAGS="-lmingw32 -lSDLmain -mwindows -lglu32 -lopengl32 $LDFLAGS"
+ LIBS="-lmingw32 -lSDLmain -mwindows -lglu32 -lopengl32 $LIBS"
else
{ $as_echo "$as_me:$LINENO: checking for glBegin in -lGL" >&5
@@ -6120,8 +6122,8 @@ fi
$as_echo_n "checking for libpng... " >&6; }
for PNG in png png12 png13 dummypng; do
if $PACKAGE_CONFIG --exists lib$PNG > /dev/null 2>&1 ; then
- CXXFLAGS="$CXXFLAGS `$PACKAGE_CONFIG --cflags lib$PNG`"
- LDFLAGS="$LDFLAGS `$PACKAGE_CONFIG --libs lib$PNG`"
+ CPPFLAGS="$CPPFLAGS `$PACKAGE_CONFIG --cflags lib$PNG`"
+ LIBS="$LIBS `$PACKAGE_CONFIG --libs lib$PNG`"
break
fi
done
@@ -6135,15 +6137,28 @@ $as_echo "lib$PNG" >&6; }
fi
-CXXFLAGS="-Wall -Wmissing-braces -Wparentheses -pedantic-errors $CXXFLAGS"
+# Check whether --enable-as-needed was given.
+if test "${enable_as_needed+set}" = set; then
+ enableval=$enable_as_needed;
+fi
+
+
+if test "x$enable_as_needed" = "xyes"; then
+ enable_as_needed="-Wl,--as-needed"
+else
+ enable_as_needed=""
+fi
+
+
+CPPFLAGS="-Wall -Wmissing-braces -Wparentheses -pedantic-errors $CPPFLAGS"
-CXXFLAGS="-I$with_gl_prefix/include $enable_gprof $enable_debug $CXXFLAGS"
+CPPFLAGS="-I$with_gl_prefix/include $enable_gprof $enable_debug $CPPFLAGS"
-CFLAGS="-std=c99 $CXXFLAGS"
+CFLAGS="-std=c99 $CFLAGS"
CXXFLAGS="-std=c++98 $CXXFLAGS"
-LDFLAGS="-L$with_gl_prefix/lib $enable_gprof $LDFLAGS"
+LDFLAGS="-L$with_gl_prefix/lib $enable_gprof $enable_as_needed $LDFLAGS"
@@ -6638,7 +6653,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OpenCity $as_me 0.0.6.2stable, which was
+This file was extended by OpenCity $as_me 0.0.6.4stable, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6701,7 +6716,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-OpenCity config.status 0.0.6.2stable
+OpenCity config.status 0.0.6.4stable
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index b77a939..1da0720 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
dnl ===========================================================================
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac 411 2009-01-10 18:24:58Z frodrigo $
+dnl $Id: configure.ac 463 2011-07-03 17:01:29Z neoneurone $
dnl ===========================================================================
-AC_INIT(OpenCity, 0.0.6.2stable)
+AC_INIT(OpenCity, 0.0.6.4stable)
AC_CONFIG_SRCDIR(src/main.cpp)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
@@ -45,14 +45,14 @@ dnl We are doing checkings for a C++ program
dnl ===========================================================================
dnl CXX=g++ done by AC_PROG_CXX
dnl AC_SUBST(CXX)
-dnl Set CXXFLAGS to disable -g -O2 and support the SDL libraries check
-
-CXXFLAGS="$SDL_CFLAGS"
-LDFLAGS="$LDFLAGS $SDL_LIBS"
+dnl Set CPPFLAGS to disable -g -O2 and support the SDL libraries check
AC_PROG_CXX
AC_LANG_CPLUSPLUS
+CPPFLAGS="$SDL_CFLAGS"
+LIBS="$SDL_LIBS"
+
dnl Checks for programs.
@@ -70,7 +70,7 @@ if test "x$enable_sdl_mixer" = "x"; then
if test "x$SDL_mixer_h" = "xyes"; then
if test "x$SDL_mixer_lib" = "xyes"; then
- LDFLAGS="$LDFLAGS -lSDL_mixer"
+ LIBS="$SDL_LIBS -lSDL_mixer"
AC_DEFINE(OPENCITY_SDL_MIXER, 1, [SDL_Mixer support])
AC_MSG_RESULT(yes)
else
@@ -144,7 +144,7 @@ dnl ===========================================================================
dnl Checks for libraries.
dnl ===========================================================================
if test "x$enable_mingw" = "xyes"; then
- LDFLAGS="-lmingw32 -lSDLmain -mwindows -lglu32 -lopengl32 $LDFLAGS"
+ LIBS="-lmingw32 -lSDLmain -mwindows -lglu32 -lopengl32 $LIBS"
else
AC_CHECK_LIB(GL, glBegin, ,
AC_MSG_ERROR([OpenGL library required. See FAQ for more information]))
@@ -170,8 +170,8 @@ AC_CHECK_LIB(SDL_net, SDLNet_Init, ,
AC_MSG_CHECKING(for libpng)
for PNG in png png12 png13 dummypng; do
if $PACKAGE_CONFIG --exists lib$PNG > /dev/null 2>&1 ; then
- CXXFLAGS="$CXXFLAGS `$PACKAGE_CONFIG --cflags lib$PNG`"
- LDFLAGS="$LDFLAGS `$PACKAGE_CONFIG --libs lib$PNG`"
+ CPPFLAGS="$CPPFLAGS `$PACKAGE_CONFIG --cflags lib$PNG`"
+ LIBS="$LIBS `$PACKAGE_CONFIG --libs lib$PNG`"
break
fi
done
@@ -183,17 +183,35 @@ fi
dnl ===========================================================================
+dnl Optional linker --as-needed switch
+dnl ===========================================================================
+AC_ARG_ENABLE(as-needed,
+ [ --enable-as-needed link with --as-needed flag])
+
+if test "x$enable_as_needed" = "xyes"; then
+ enable_as_needed="-Wl,--as-needed"
+else
+ enable_as_needed=""
+fi
+
+
+dnl ===========================================================================
dnl Set the compiler and the linker options
dnl ===========================================================================
-CXXFLAGS="-Wall -Wmissing-braces -Wparentheses -pedantic-errors $CXXFLAGS"
+dnl Set C / C++ compiler options
+CPPFLAGS="-Wall -Wmissing-braces -Wparentheses -pedantic-errors $CPPFLAGS"
-CXXFLAGS="-I$with_gl_prefix/include $enable_gprof $enable_debug $CXXFLAGS"
+dnl Set more C / C++ compiler options
+CPPFLAGS="-I$with_gl_prefix/include $enable_gprof $enable_debug $CPPFLAGS"
-CFLAGS="-std=c99 $CXXFLAGS"
+dnl Set specific C compiler flags
+CFLAGS="-std=c99 $CFLAGS"
+dnl Set specific C++ compiler flags
CXXFLAGS="-std=c++98 $CXXFLAGS"
-LDFLAGS="-L$with_gl_prefix/lib $enable_gprof $LDFLAGS"
+dnl Set linker options
+LDFLAGS="-L$with_gl_prefix/lib $enable_gprof $enable_as_needed $LDFLAGS"
dnl ===========================================================================
diff --git a/src/extensionmanager.cpp b/src/extensionmanager.cpp
index 0399210..fca0cca 100644
--- a/src/extensionmanager.cpp
+++ b/src/extensionmanager.cpp
@@ -5,7 +5,7 @@
copyright : (C) 2008 by Duong Khang NGUYEN
email : neoneurone @ gmail com
- $Id: extensionmanager.cpp 376 2008-10-28 18:34:46Z neoneurone $
+ $Id: extensionmanager.cpp 463 2011-07-03 17:01:29Z neoneurone $
***************************************************************************/
/***************************************************************************
@@ -38,7 +38,17 @@ ExtensionManager::Load()
{
bool ok = true;
+ // Warning: ISO C++ forbids casting between pointer-to-function and pointer-to-object
+ // There's no other solution at the time of writing.
+
+ // Look for the glTexImage3DEXT function.
this->glTexImage3D = (PFNGLTEXIMAGE3DEXTPROC)SDL_GL_GetProcAddress("glTexImage3DEXT");
+
+ // Look for the glTexImage3D function instead.
+ if (this->glTexImage3D == NULL) {
+ this->glTexImage3D = (PFNGLTEXIMAGE3DEXTPROC)SDL_GL_GetProcAddress("glTexImage3D");
+ }
+
if (this->glTexImage3D == NULL) {
OPENCITY_ERROR( "GL_EXT_texture3D extension unsupported by your video driver" );
ok = false;
diff --git a/src/globalvar.h b/src/globalvar.h
index 2176038..c67a520 100644
--- a/src/globalvar.h
+++ b/src/globalvar.h
@@ -5,7 +5,7 @@
copyright : (C) 2006-2008 by Duong Khang NGUYEN
email : neoneurone @ gmail com
- $Id: globalvar.h 421 2009-10-10 12:22:14Z neoneurone $
+ $Id: globalvar.h 455 2010-12-11 17:39:43Z neoneurone $
***************************************************************************/
/***************************************************************************
@@ -42,7 +42,7 @@
// The current OpenCity version
#define OC_VERSION 0
#define OC_PATCHLEVEL 0
-#define OC_SUBLEVEL 7
+#define OC_SUBLEVEL 6
//========================================================================
diff --git a/src/main.cpp b/src/main.cpp
index eb61afe..637e3d8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,7 +11,7 @@
This is a game project which targets the ultimate city
simulation just like like xxxCity or something like that :)
- $Id: main.cpp 421 2009-10-10 12:22:14Z neoneurone $
+ $Id: main.cpp 451 2010-12-11 12:05:23Z neoneurone $
***************************************************************************/
/***************************************************************************
diff --git a/src/main.h b/src/main.h
index 4834646..7264a07 100644
--- a/src/main.h
+++ b/src/main.h
@@ -5,7 +5,7 @@
copyright : (C) 2003-2008 by Duong Khang NGUYEN
email : neoneurone @ gmail com
- $Id: main.h 422 2009-10-11 17:31:11Z neoneurone $
+ $Id: main.h 451 2010-12-11 12:05:23Z neoneurone $
***************************************************************************/
/***************************************************************************
diff --git a/src/model/ac3dmaterial.cpp b/src/model/ac3dmaterial.cpp
index 22fc43b..9d890f5 100644
--- a/src/model/ac3dmaterial.cpp
+++ b/src/model/ac3dmaterial.cpp
@@ -5,7 +5,7 @@
copyright : (C) 2005 by Duong Khang NGUYEN
email : neoneurone @ gmail com
- $Id: ac3dmaterial.cpp 395 2008-12-27 21:12:05Z neoneurone $
+ $Id: ac3dmaterial.cpp 451 2010-12-11 12:05:23Z neoneurone $
***************************************************************************/
/***************************************************************************
diff --git a/src/model/ac3dobject.cpp b/src/model/ac3dobject.cpp
index e52c338..dcc9d38 100644
--- a/src/model/ac3dobject.cpp
+++ b/src/model/ac3dobject.cpp
@@ -5,7 +5,7 @@
copyright : (C) 2005-2007 by Duong Khang NGUYEN
email : neoneurone @ gmail com
- $Id: ac3dobject.cpp 395 2008-12-27 21:12:05Z neoneurone $
+ $Id: ac3dobject.cpp 451 2010-12-11 12:05:23Z neoneurone $
***************************************************************************/
/***************************************************************************
diff --git a/src/model/ac3dsurface.cpp b/src/model/ac3dsurface.cpp
index cefa6d4..b403c76 100644
--- a/src/model/ac3dsurface.cpp
+++ b/src/model/ac3dsurface.cpp
@@ -5,7 +5,7 @@
copyright : (C) 2005 by Duong Khang NGUYEN
email : neoneurone @ gmail com
- $Id: ac3dsurface.cpp 395 2008-12-27 21:12:05Z neoneurone $
+ $Id: ac3dsurface.cpp 451 2010-12-11 12:05:23Z neoneurone $
***************************************************************************/
/***************************************************************************
diff --git a/src/pathfinder.cpp b/src/pathfinder.cpp
index b561967..01673d4 100644
--- a/src/pathfinder.cpp
+++ b/src/pathfinder.cpp
@@ -5,7 +5,7 @@
copyright : (C) 2004-2007 by Duong Khang NGUYEN
email : neoneurone @ gmail com
- $Id: pathfinder.cpp 375 2008-10-28 14:47:15Z neoneurone $
+ $Id: pathfinder.cpp 463 2011-07-03 17:01:29Z neoneurone $
***************************************************************************/
/***************************************************************************
@@ -225,7 +225,7 @@ PathFinder::findShortestPath(
bool boolFound;
// Dynamic compare functor
- bool (*pFunctor)(const PathFinderNode&, const PathFinderNode&);
+ bool (*pFunctor)(const PathFinderNode&, const PathFinderNode&) = NULL;
// Variables used to rebuild the "destination vector" from start to stop
int iFatherLinear;
@@ -247,9 +247,15 @@ PathFinder::findShortestPath(
case OC_DISTANCE:
pFunctor = pathfinderCompareDistance;
break;
+
case OC_TRAFFIC:
pFunctor = pathfinderCompareTraffic;
break;
+
+ default:
+ OPENCITY_DEBUG("Unrecognized path type enumeration.");
+ assert(0);
+ break;
}
// For each OC_ROAD structure
diff --git a/src/propertymanager.cpp b/src/propertymanager.cpp
index ddf86de..80a04b5 100644
--- a/src/propertymanager.cpp
+++ b/src/propertymanager.cpp
@@ -5,7 +5,7 @@
copyright : (C) 2004-2007 by Duong Khang NGUYEN
email : neoneurone @ gmail com
- $Id: propertymanager.cpp 375 2008-10-28 14:47:15Z neoneurone $
+ $Id: propertymanager.cpp 452 2010-12-11 13:15:05Z neoneurone $
***************************************************************************/
/***************************************************************************
@@ -370,14 +370,14 @@ PropertyManager::GetWLH(
uint & l, const uint defl,
uint & h, const uint defh)
{
- static OC_LINT lint;
-
- propertymanagerGetLint( gcode, "width", lint, defw );
- w = lint;
- propertymanagerGetLint( gcode, "length", lint, defl );
- l = lint;
- propertymanagerGetLint( gcode, "height", lint, defh );
- h = lint;
+ static OC_LINT width, length, height;
+
+ propertymanagerGetLint( gcode, "width", width, defw );
+ w = (uint)width;
+ propertymanagerGetLint( gcode, "length", length, defl );
+ l = (uint)length;
+ propertymanagerGetLint( gcode, "height", height, defh );
+ h = (uint)height;
/* debug
cout << "code: " << gcode
diff --git a/src/structure/structure.cpp b/src/structure/structure.cpp
index ad1dd72..eed9af3 100644
--- a/src/structure/structure.cpp
+++ b/src/structure/structure.cpp
@@ -4,8 +4,8 @@
begin : june 16th, 2003
copyright : (C) 2003-2007 by Duong Khang NGUYEN
email : neoneurone @ gmail com
-
- $Id: structure.cpp 375 2008-10-28 14:47:15Z neoneurone $
+
+ $Id: structure.cpp 463 2011-07-03 17:01:29Z neoneurone $
***************************************************************************/
/***************************************************************************
@@ -179,7 +179,7 @@ Structure::GetGraphicCode() const
const OPENCITY_GRAPHIC_CODE
Structure::GetBaseGraphicCode() const
{
- OPENCITY_GRAPHIC_CODE tempGC;
+ OPENCITY_GRAPHIC_CODE tempGC = OC_EMPTY;
switch (_eSC) {
case OC_STRUCTURE_RES:
@@ -195,7 +195,7 @@ Structure::GetBaseGraphicCode() const
break;
default:
- OPENCITY_DEBUG("Not implemented yet");
+ OPENCITY_DEBUG("Unrecognized graphic code enumeration.");
assert(0);
break;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/opencity.git
More information about the Pkg-games-commits
mailing list