copy plugins to game folder

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2731 b956fd51-792f-4845-bead-9b4dfca2ff2c

5 files changed, 57 insertions, 24 deletions

diff --git a/mediaplugin/src/plugins/media/Makefile b/mediaplugin/src/plugins/media/Makefile
index fb3b886d..2de6a1f9 100644
--- a/mediaplugin/src/plugins/media/Makefile
+++ b/mediaplugin/src/plugins/media/Makefile
@@ -1,10 +1,12 @@
 SUBDIRS = ffmpeg
+PLUGIN_DIR = ../../../game/plugins/media
+#LIB_EXT = .so
 
 .PHONY: all clean distclean
 
 all:
 	@for dir in $(SUBDIRS); do \
-	  $(MAKE) -C "$$dir" all; \
+	  $(MAKE) -C "$$dir" compile; \
 	done
 
 clean:
diff --git a/mediaplugin/src/plugins/media/ffmpeg/Makefile.am b/mediaplugin/src/plugins/media/ffmpeg/Makefile.am
index 6f54e80f..94a8f611 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/Makefile.am
+++ b/mediaplugin/src/plugins/media/ffmpeg/Makefile.am
@@ -3,8 +3,10 @@ libffmpegplugin_la_SOURCES = ../core/plugin_core.cpp ../core/util.cpp ../core/lo
 libffmpegplugin_la_CXXFLAGS = -I../include -Wall \
 	$(ffmpeg_CFLAGS) \
 	$(libswscale_CFLAGS)
-libffmpegplugin_la_LDFLAGS = -dynamic \
+libffmpegplugin_la_LDFLAGS = -shared -dynamic \
 	$(ffmpeg_LIBS) \
 	$(libswscale_LIBS) \
 	$(LDFLAGS)
 
+compile: libffmpegplugin.la
+	cp .libs/*$(LIB_EXT) $(PLUGIN_DIR)
diff --git a/mediaplugin/src/plugins/media/ffmpeg/Makefile.in b/mediaplugin/src/plugins/media/ffmpeg/Makefile.in
index 9aaef0fd..b38eba32 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/Makefile.in
+++ b/mediaplugin/src/plugins/media/ffmpeg/Makefile.in
@@ -48,7 +48,7 @@ DIST_COMMON = $(am__configure_deps) \
 	../../../../dists/autogen/depcomp \
 	../../../../dists/autogen/install-sh \
 	../../../../dists/autogen/ltmain.sh \
-	../../../../dists/autogen/missing
+	../../../../dists/autogen/missing compile
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -160,6 +160,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIB_EXT = @LIB_EXT@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -182,6 +183,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGIN_DIR = @PLUGIN_DIR@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -251,7 +253,7 @@ libffmpegplugin_la_CXXFLAGS = -I../include -Wall \
 	$(ffmpeg_CFLAGS) \
 	$(libswscale_CFLAGS)
 
-libffmpegplugin_la_LDFLAGS = -module -export-dynamic \
+libffmpegplugin_la_LDFLAGS = -shared -dynamic \
 	$(ffmpeg_LIBS) \
 	$(libswscale_LIBS) \
 	$(LDFLAGS)
@@ -753,6 +755,9 @@ uninstall-am: uninstall-libLTLIBRARIES
 	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
 
+compile: libffmpegplugin.la
+	cp .libs/*$(LIB_EXT) $(PLUGIN_DIR)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/mediaplugin/src/plugins/media/ffmpeg/configure b/mediaplugin/src/plugins/media/ffmpeg/configure
index 3c45e448..215742a9 100755
--- a/mediaplugin/src/plugins/media/ffmpeg/configure
+++ b/mediaplugin/src/plugins/media/ffmpeg/configure
@@ -748,6 +748,8 @@ libswscale_LIBS
 libswscale_CFLAGS
 ffmpeg_LIBS
 ffmpeg_CFLAGS
+PLUGIN_DIR
+LIB_EXT
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
@@ -4009,13 +4011,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4012: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4014: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4015: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4017: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4018: output\"" >&5)
+  (eval echo "\"\$as_me:4020: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5221,7 +5223,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5224 "configure"' > conftest.$ac_ext
+  echo '#line 5226 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6746,11 +6748,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6749: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6751: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6753: \$? = $ac_status" >&5
+   echo "$as_me:6755: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7085,11 +7087,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7088: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7090: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7092: \$? = $ac_status" >&5
+   echo "$as_me:7094: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7190,11 +7192,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7193: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7195: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7197: \$? = $ac_status" >&5
+   echo "$as_me:7199: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7245,11 +7247,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7248: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7250: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7252: \$? = $ac_status" >&5
+   echo "$as_me:7254: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9629,7 +9631,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9632 "configure"
+#line 9634 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9725,7 +9727,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9728 "configure"
+#line 9730 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13679,11 +13681,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13682: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13684: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13686: \$? = $ac_status" >&5
+   echo "$as_me:13688: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13778,11 +13780,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13781: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13783: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13785: \$? = $ac_status" >&5
+   echo "$as_me:13787: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13830,11 +13832,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13833: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13835: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13837: \$? = $ac_status" >&5
+   echo "$as_me:13839: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15048,9 +15050,20 @@ case "${host_os}" in
     CPPFLAGS="-arch i386"
     CFLAGS="-arch i386"
     CXXFLAGS="-arch i386"
+    LIB_EXT=.dylib
+    ;;
+  cygwin*)
+    LIB_EXT=.dll
+    ;;
+  *)
+    LIB_EXT=.so
     ;;
 esac
 
+
+PLUGIN_DIR="../../../../game/plugins/media"
+
+
 # -----------------------------------------
 # check for libraries
 # -----------------------------------------
diff --git a/mediaplugin/src/plugins/media/ffmpeg/configure.ac b/mediaplugin/src/plugins/media/ffmpeg/configure.ac
index bea05445..1e350c63 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/configure.ac
+++ b/mediaplugin/src/plugins/media/ffmpeg/configure.ac
@@ -78,8 +78,19 @@ case "${host_os}" in
     CPPFLAGS="-arch i386"
     CFLAGS="-arch i386"
     CXXFLAGS="-arch i386"
+    LIB_EXT=.dylib
+    ;;
+  cygwin*)
+    LIB_EXT=.dll
+    ;;
+  *)
+    LIB_EXT=.so
     ;;
 esac
+AC_SUBST(LIB_EXT)
+
+PLUGIN_DIR="../../../../game/plugins/media"
+AC_SUBST(PLUGIN_DIR)
 
 # -----------------------------------------
 # check for libraries