[Scummvm-cvs-logs] CVS: scummvm Makefile,1.93,1.94 configure,1.111,1.112

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26867

Modified Files:
	Makefile configure 
Log Message:
Configure the plugin prefix/suffix in the configure script; use that setting in plugins.cpp

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- Makefile	11 Jan 2005 22:02:04 -0000	1.93
+++ Makefile	6 Feb 2005 17:21:31 -0000	1.94
@@ -29,18 +29,6 @@
 CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor
 CXXFLAGS+= -Wno-reorder -Wwrite-strings -fcheck-new -Wctor-dtor-privacy 
 
-######################################################################
-# Plugin settings
-######################################################################
-
-# Plugin prefix. Typically "lib" on Unix, and nothing everywhere else
-PLUGIN_PREFIX := lib
-# Plugin suffix. For static/shared libs this is typically ".so"/".a" on Unix,
-# ".dll"/".lib" on Windows, ".bundle"/".a" on OS X, etc.
-PLUGIN_SUFFIX := .so
-
-PLUGIN_EXTRA_DEPS := $(EXECUTABLE)
-
 #######################################################################
 # Misc stuff - you should never have to edit this                     #
 #######################################################################

Index: configure
===================================================================
RCS file: /cvsroot/scummvm/scummvm/configure,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- configure	7 Jan 2005 14:14:04 -0000	1.111
+++ configure	6 Feb 2005 17:21:31 -0000	1.112
@@ -761,11 +761,19 @@
 #
 echocheck "Plugin support"
 _mak_plugins=
+_def_plugin=
 if test "$_build_plugins" = yes ; then
     case $_host_os in
 	linux*)
+_def_plugin='
+#define PLUGIN_PREFIX	"lib"
+#define PLUGIN_SUFFIX	".so"
+'
 _mak_plugins='
 BUILD_PLUGINS := 1
+PLUGIN_PREFIX := lib
+PLUGIN_SUFFIX := .so
+PLUGIN_EXTRA_DEPS := $(EXECUTABLE)
 CXXFLAGS      += -DDYNAMIC_MODULES
 CXXFLAGS        += -fpic
 PLUGIN_LDFLAGS  += -shared
@@ -775,8 +783,15 @@
 '
 	    ;;
 	freebsd*)
+_def_plugin='
+#define PLUGIN_PREFIX	"lib"
+#define PLUGIN_SUFFIX	".so"
+'
 _mak_plugins='
 BUILD_PLUGINS := 1
+PLUGIN_PREFIX := lib
+PLUGIN_SUFFIX := .so
+PLUGIN_EXTRA_DEPS := $(EXECUTABLE)
 CXXFLAGS      += -DDYNAMIC_MODULES
 CXXFLAGS        += -fpic
 PLUGIN_LDFLAGS  += -shared
@@ -785,8 +800,15 @@
 '
 	    ;;
 	darwin*)
+_def_plugin='
+#define PLUGIN_PREFIX	""
+#define PLUGIN_SUFFIX	".plugin"
+'
 _mak_plugins='
 BUILD_PLUGINS := 1
+PLUGIN_PREFIX := 
+PLUGIN_SUFFIX := .plugin
+PLUGIN_EXTRA_DEPS := $(EXECUTABLE)
 CXXFLAGS      += -DDYNAMIC_MODULES
 PLUGIN_LDFLAGS  += -bundle -bundle_loader $(EXECUTABLE) -exported_symbols_list "$(srcdir)/plugin.exp"
 PRE_OBJS_FLAGS  := -all_load
@@ -796,6 +818,8 @@
 	    ;;
 	*)
 	    _build_plugins=no
+		_mak_plugins=
+		_def_plugin=
 	    ;;
     esac
 fi
@@ -1095,6 +1119,9 @@
 /* Whether we should use i386 assembly routines */
 $_def_nasm
 
+/* Plugin settings */
+$_def_plugin
+
 #endif /* CONFIG_H */
 EOF