[Scummvm-cvs-logs] SF.net SVN: scummvm: [26963] scummvm/trunk
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun May 27 12:46:51 CEST 2007
Revision: 26963
http://scummvm.svn.sourceforge.net/scummvm/?rev=26963&view=rev
Author: lordhoto
Date: 2007-05-27 03:46:47 -0700 (Sun, 27 May 2007)
Log Message:
-----------
Commit of patch #1715310 ("WIN32: Dynamic Plugin support with MinGW").
Modified Paths:
--------------
scummvm/trunk/backends/plugins/win32/win32-provider.cpp
scummvm/trunk/configure
scummvm/trunk/rules.mk
Modified: scummvm/trunk/backends/plugins/win32/win32-provider.cpp
===================================================================
--- scummvm/trunk/backends/plugins/win32/win32-provider.cpp 2007-05-27 08:22:04 UTC (rev 26962)
+++ scummvm/trunk/backends/plugins/win32/win32-provider.cpp 2007-05-27 10:46:47 UTC (rev 26963)
@@ -27,6 +27,8 @@
#include "backends/plugins/dynamic-plugin.h"
#include "common/fs.h"
+#include <windows.h>
+
#define PLUGIN_DIRECTORY ""
#define PLUGIN_PREFIX ""
#define PLUGIN_SUFFIX ".dll"
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2007-05-27 08:22:04 UTC (rev 26962)
+++ scummvm/trunk/configure 2007-05-27 10:46:47 UTC (rev 26963)
@@ -1025,6 +1025,22 @@
LIBS += -ldl
'
;;
+ *mingw32*)
+_def_plugin='
+#define PLUGIN_PREFIX ""
+#define PLUGIN_SUFFIX ".dll"
+'
+_mak_plugins='
+BUILD_PLUGINS := 1
+PLUGIN_PREFIX :=
+PLUGIN_SUFFIX := .dll
+PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
+CXXFLAGS += -DDYNAMIC_MODULES
+PLUGIN_LDFLAGS := -shared ./libscummvm.a $(LIBS)
+PRE_OBJS_FLAGS := -Wl,--whole-archive
+POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a
+'
+ ;;
*)
_build_plugins=no
_mak_plugins=
Modified: scummvm/trunk/rules.mk
===================================================================
--- scummvm/trunk/rules.mk 2007-05-27 08:22:04 UTC (rev 26962)
+++ scummvm/trunk/rules.mk 2007-05-27 10:46:47 UTC (rev 26963)
@@ -17,7 +17,7 @@
PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX)
$(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS)
$(MKDIR) plugins
- $(CXX) $(PLUGIN_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) -o $@
+ $(CXX) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@
PLUGIN:=
plugins: $(PLUGIN-$(MODULE))
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