diff options
| -rw-r--r-- | common/module.mk | 3 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | dists/msvc8/scummvm.vcproj | 4 | ||||
| -rw-r--r-- | engines/agos/res.cpp | 9 | ||||
| -rw-r--r-- | engines/scumm/module.mk | 2 | ||||
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 8 |
6 files changed, 15 insertions, 17 deletions
diff --git a/common/module.mk b/common/module.mk index e388eace74..237753458a 100644 --- a/common/module.mk +++ b/common/module.mk @@ -13,7 +13,8 @@ MODULE_OBJS := \ stream.o \ util.o \ system.o \ - unzip.o + unzip.o \ + zlib.o # Include common rules include $(srcdir)/rules.mk @@ -1183,7 +1183,7 @@ _mak_plugins=' BUILD_PLUGINS := 1 PLUGIN_PREFIX := lib PLUGIN_SUFFIX := .so -PLUGIN_EXTRA_DEPS = $(EXECUTABLE) +PLUGIN_EXTRA_DEPS = CXXFLAGS += -DDYNAMIC_MODULES CXXFLAGS += -fpic PLUGIN_LDFLAGS += -shared @@ -1201,7 +1201,7 @@ _mak_plugins=' BUILD_PLUGINS := 1 PLUGIN_PREFIX := lib PLUGIN_SUFFIX := .so -PLUGIN_EXTRA_DEPS = $(EXECUTABLE) +PLUGIN_EXTRA_DEPS = CXXFLAGS += -DDYNAMIC_MODULES CXXFLAGS += -fpic PLUGIN_LDFLAGS += -shared @@ -1237,7 +1237,7 @@ PLUGIN_PREFIX := PLUGIN_SUFFIX := .dll PLUGIN_EXTRA_DEPS = $(EXECUTABLE) CXXFLAGS += -DDYNAMIC_MODULES -PLUGIN_LDFLAGS := -shared ./libscummvm.a $(LIBS) $(LDFLAGS) +PLUGIN_LDFLAGS := -shared ./libscummvm.a PRE_OBJS_FLAGS := -Wl,--whole-archive POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a ' diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj index defa5cae3a..e226149246 100644 --- a/dists/msvc8/scummvm.vcproj +++ b/dists/msvc8/scummvm.vcproj @@ -428,6 +428,10 @@ RelativePath="..\..\common\util.h" > </File> + <File + RelativePath="..\..\common\zlib.cpp" + > + </File> </Filter> <Filter Name="sound" diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp index ceb041b397..d74563226f 100644 --- a/engines/agos/res.cpp +++ b/engines/agos/res.cpp @@ -32,10 +32,7 @@ #include "agos/intern.h" #include "agos/sound.h" - -#ifdef USE_ZLIB -#include <zlib.h> -#endif +#include "common/zlib.h" using Common::File; @@ -77,8 +74,8 @@ void AGOSEngine::decompressData(const char *srcName, byte *dst, uint32 offset, u error("decompressData: Read failed"); unsigned long decompressedSize = dstSize; - int result = uncompress(dst, &decompressedSize, srcBuffer, srcSize); - if (result != Z_OK) + int result = Common::uncompress(dst, &decompressedSize, srcBuffer, srcSize); + if (result != Common::ZLIB_OK) error("decompressData: Zlib uncompress error"); free(srcBuffer); } else { diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk index ee3573975b..8dfb867943 100644 --- a/engines/scumm/module.mk +++ b/engines/scumm/module.mk @@ -117,8 +117,6 @@ endif # This module can be built as a plugin ifdef BUILD_PLUGINS PLUGIN := 1 -# HACK HACK evil HACK HACK -PLUGIN_LDFLAGS += -lz endif # Include common rules diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 7c66c8124d..906395c0ca 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -59,9 +59,7 @@ #include <png.h> #endif -#ifdef USE_ZLIB -#include <zlib.h> -#endif +#include "common/zlib.h" namespace Scumm { @@ -820,8 +818,8 @@ void SmushPlayer::handleZlibFrameObject(Chunk &b) { unsigned long decompressedSize = READ_BE_UINT32(chunkBuffer); byte *fobjBuffer = (byte *)malloc(decompressedSize); - int result = uncompress(fobjBuffer, &decompressedSize, chunkBuffer + 4, chunkSize - 4); - if (result != Z_OK) + int result = Common::uncompress(fobjBuffer, &decompressedSize, chunkBuffer + 4, chunkSize - 4); + if (result != Common::ZLIB_OK) error("SmushPlayer::handleZlibFrameObject() Zlib uncompress error"); free(chunkBuffer); |