[Scummvm-cvs-logs] SF.net SVN: scummvm: [32682] residual/trunk
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Thu Jun 12 22:17:46 CEST 2008
Revision: 32682
http://scummvm.svn.sourceforge.net/scummvm/?rev=32682&view=rev
Author: aquadran
Date: 2008-06-12 13:17:46 -0700 (Thu, 12 Jun 2008)
Log Message:
-----------
don't use zlib in common
Modified Paths:
--------------
residual/trunk/common/module.mk
residual/trunk/configure
residual/trunk/engine/lua.cpp
residual/trunk/engine/savegame.h
residual/trunk/engine/smush/smush.cpp
residual/trunk/engine/smush/smush.h
Removed Paths:
-------------
residual/trunk/common/zlib.cpp
residual/trunk/common/zlib.h
Modified: residual/trunk/common/module.mk
===================================================================
--- residual/trunk/common/module.mk 2008-06-12 20:15:46 UTC (rev 32681)
+++ residual/trunk/common/module.mk 2008-06-12 20:17:46 UTC (rev 32682)
@@ -7,8 +7,7 @@
matrix4.o \
memorypool.o \
str.o \
- mutex.o \
- zlib.o
+ mutex.o
# Include common rules
include $(srcdir)/rules.mk
Deleted: residual/trunk/common/zlib.cpp
===================================================================
--- residual/trunk/common/zlib.cpp 2008-06-12 20:15:46 UTC (rev 32681)
+++ residual/trunk/common/zlib.cpp 2008-06-12 20:17:46 UTC (rev 32682)
@@ -1,41 +0,0 @@
-/* Residual - Virtual machine to run LucasArts' 3D adventure games
- * Copyright (C) 2003-2008 The ScummVM-Residual Team (www.scummvm.org)
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- */
-
-#include "common/zlib.h"
-
-#if defined(USE_ZLIB)
-
-#ifdef __SYMBIAN32__
-#include <zlib\zlib.h>
-#else
-#include <zlib.h>
-#endif
-
-namespace Common {
-
-int uncompress(byte *dst, unsigned long *dstLen, const byte *src, unsigned long srcLen) {
- return ::uncompress(dst, dstLen, src, srcLen);
-}
-
-} // end of namespace Common
-
-#endif
-
Deleted: residual/trunk/common/zlib.h
===================================================================
--- residual/trunk/common/zlib.h 2008-06-12 20:15:46 UTC (rev 32681)
+++ residual/trunk/common/zlib.h 2008-06-12 20:17:46 UTC (rev 32682)
@@ -1,48 +0,0 @@
-/* Residual - Virtual machine to run LucasArts' 3D adventure games
- * Copyright (C) 2003-2008 The ScummVM-Residual Team (www.scummvm.org)
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- */
-
-#include "common/sys.h"
-
-#if defined(USE_ZLIB)
-
-#ifndef COMMON_ZLIB_H
-#define COMMON_ZLIB_H
-
-#ifdef __SYMBIAN32__
-#include <zlib\zlib.h>
-#else
-#include <zlib.h>
-#endif
-
-namespace Common {
-
-enum {
- ZLIB_OK = Z_OK
-};
-
-int uncompress(byte *dst, unsigned long *dstLen, const byte *src, unsigned long srcLen);
-
-} // end of namespace Common
-
-#endif
-
-#endif
-
Modified: residual/trunk/configure
===================================================================
--- residual/trunk/configure 2008-06-12 20:15:46 UTC (rev 32681)
+++ residual/trunk/configure 2008-06-12 20:17:46 UTC (rev 32682)
@@ -61,7 +61,6 @@
_flac=auto
_mad=auto
_alsa=auto
-_zlib=auto
_mpeg2=auto
_endian=unknown
@@ -322,7 +321,6 @@
--disable-flac disable FLAC support [autodetect]
--with-zlib-prefix=DIR Prefix where zlib is installed (optional)
- --disable-zlib disable zlib (compression) support [autodetect]
--with-mpeg2-prefix=DIR Prefix where libmpeg2 is installed (optional)
--disable-mpeg2 disable mpeg2 codec for cutscenes [autodetect]
@@ -362,8 +360,6 @@
--disable-flac) _flac=no ;;
--enable-mad) _mad=yes ;;
--disable-mad) _mad=no ;;
- --enable-zlib) _zlib=yes ;;
- --disable-zlib) _zlib=no ;;
--disable-mpeg2) _mpeg2=no ;;
--with-mpeg2-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2`
@@ -1033,21 +1029,24 @@
# Check for ZLib
#
echocheck "zlib"
-if test "$_zlib" = auto ; then
- _zlib=no
- cat > $TMPC << EOF
+_zlib=no
+
+cat > $TMPC << EOF
#include <string.h>
#include <zlib.h>
int main(void) { return strcmp(ZLIB_VERSION, zlibVersion()); }
EOF
- cc_check $LDFLAGS $CXXFLAGS $ZLIB_CFLAGS $ZLIB_LIBS -lz && _zlib=yes
-fi
+
+cc_check $LDFLAGS $CXXFLAGS $ZLIB_CFLAGS $ZLIB_LIBS -lz && _zlib=yes
+
if test "$_zlib" = yes ; then
_def_zlib='#define USE_ZLIB'
LIBS="$LIBS $ZLIB_LIBS -lz"
INCLUDES="$INCLUDES $ZLIB_CFLAGS"
else
- _def_zlib='#undef USE_ZLIB'
+ echo
+ echo "zlib library support required"
+ exit 1
fi
echo "$_zlib"
@@ -1167,12 +1166,8 @@
$_def_flac
$_def_mad
$_def_alsa
-$_def_zlib
$_def_mpeg2
-/* Plugin settings */
-$_def_plugin
-
#endif /* CONFIG_H */
EOF
Modified: residual/trunk/engine/lua.cpp
===================================================================
--- residual/trunk/engine/lua.cpp 2008-06-12 20:15:46 UTC (rev 32681)
+++ residual/trunk/engine/lua.cpp 2008-06-12 20:17:46 UTC (rev 32682)
@@ -53,7 +53,12 @@
#include <cstdio>
#include <cmath>
+
+#ifdef __SYMBIAN32__
+#include <zlib\zlib.h>
+#else
#include <zlib.h>
+#endif
extern Imuse *g_imuse;
Modified: residual/trunk/engine/savegame.h
===================================================================
--- residual/trunk/engine/savegame.h 2008-06-12 20:15:46 UTC (rev 32681)
+++ residual/trunk/engine/savegame.h 2008-06-12 20:17:46 UTC (rev 32682)
@@ -23,12 +23,16 @@
#ifndef SAVEGAME_H
#define SAVEGAME_H
+#ifdef __SYMBIAN32__
+#include <zlib\zlib.h>
+#else
+#include <zlib.h>
+#endif
+
#include "common/debug.h"
#include "engine/lua.h"
-#include <zlib.h>
-
class SaveGame {
public:
SaveGame(char *filename, bool saving);
Modified: residual/trunk/engine/smush/smush.cpp
===================================================================
--- residual/trunk/engine/smush/smush.cpp 2008-06-12 20:15:46 UTC (rev 32681)
+++ residual/trunk/engine/smush/smush.cpp 2008-06-12 20:17:46 UTC (rev 32682)
@@ -34,7 +34,6 @@
#include "mixer/mixer.h"
#include <cstring>
-#include <zlib.h>
#define SMUSH_LOOPMOVIE(x) (x & 0x000001)
#define SMUSH_ALTSPEED(x) (x & 0x000004)
Modified: residual/trunk/engine/smush/smush.h
===================================================================
--- residual/trunk/engine/smush/smush.h 2008-06-12 20:15:46 UTC (rev 32681)
+++ residual/trunk/engine/smush/smush.h 2008-06-12 20:17:46 UTC (rev 32682)
@@ -23,6 +23,12 @@
#ifndef SMUSH_PLAYER_H
#define SMUSH_PLAYER_H
+#ifdef __SYMBIAN32__
+#include <zlib\zlib.h>
+#else
+#include <zlib.h>
+#endif
+
#include "common/sys.h"
#include "common/debug.h"
@@ -31,7 +37,6 @@
#include "mixer/mixer.h"
#include "mixer/audiostream.h"
-#include <zlib.h>
#include <cstring>
struct SavePos {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list