[Scummvm-cvs-logs] SF.net SVN: scummvm: [30041] scummvm/trunk
sev at users.sourceforge.net
sev at users.sourceforge.net
Fri Dec 28 08:52:56 CET 2007
Revision: 30041
http://scummvm.svn.sourceforge.net/scummvm/?rev=30041&view=rev
Author: sev
Date: 2007-12-27 23:52:56 -0800 (Thu, 27 Dec 2007)
Log Message:
-----------
Patch #1858158: BUILD: Plugin building cleanup
Modified Paths:
--------------
scummvm/trunk/common/module.mk
scummvm/trunk/configure
scummvm/trunk/dists/msvc8/scummvm.vcproj
scummvm/trunk/engines/agos/res.cpp
scummvm/trunk/engines/scumm/module.mk
scummvm/trunk/engines/scumm/smush/smush_player.cpp
Modified: scummvm/trunk/common/module.mk
===================================================================
--- scummvm/trunk/common/module.mk 2007-12-28 07:49:51 UTC (rev 30040)
+++ scummvm/trunk/common/module.mk 2007-12-28 07:52:56 UTC (rev 30041)
@@ -13,7 +13,8 @@
stream.o \
util.o \
system.o \
- unzip.o
+ unzip.o \
+ zlib.o
# Include common rules
include $(srcdir)/rules.mk
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2007-12-28 07:49:51 UTC (rev 30040)
+++ scummvm/trunk/configure 2007-12-28 07:52:56 UTC (rev 30041)
@@ -1183,7 +1183,7 @@
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 @@
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_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
'
Modified: scummvm/trunk/dists/msvc8/scummvm.vcproj
===================================================================
--- scummvm/trunk/dists/msvc8/scummvm.vcproj 2007-12-28 07:49:51 UTC (rev 30040)
+++ scummvm/trunk/dists/msvc8/scummvm.vcproj 2007-12-28 07:52:56 UTC (rev 30041)
@@ -428,6 +428,10 @@
RelativePath="..\..\common\util.h"
>
</File>
+ <File
+ RelativePath="..\..\common\zlib.cpp"
+ >
+ </File>
</Filter>
<Filter
Name="sound"
Modified: scummvm/trunk/engines/agos/res.cpp
===================================================================
--- scummvm/trunk/engines/agos/res.cpp 2007-12-28 07:49:51 UTC (rev 30040)
+++ scummvm/trunk/engines/agos/res.cpp 2007-12-28 07:52:56 UTC (rev 30041)
@@ -32,11 +32,8 @@
#include "agos/intern.h"
#include "agos/sound.h"
+#include "common/zlib.h"
-#ifdef USE_ZLIB
-#include <zlib.h>
-#endif
-
using Common::File;
namespace AGOS {
@@ -77,8 +74,8 @@
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 {
Modified: scummvm/trunk/engines/scumm/module.mk
===================================================================
--- scummvm/trunk/engines/scumm/module.mk 2007-12-28 07:49:51 UTC (rev 30040)
+++ scummvm/trunk/engines/scumm/module.mk 2007-12-28 07:52:56 UTC (rev 30041)
@@ -117,8 +117,6 @@
# 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
Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp 2007-12-28 07:49:51 UTC (rev 30040)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp 2007-12-28 07:52:56 UTC (rev 30041)
@@ -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 @@
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);
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