[Mplayer-cvslog] CVS: main configure,1.658,1.659

Alex Beregszaszi alex at mplayerhq.hu
Tue Feb 11 19:56:33 CET 2003


Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv2143

Modified Files:
	configure 
Log Message:
optional loader/ (currently it does nothing until the win32 support on cygwin is disabled)

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -r1.658 -r1.659
--- configure	8 Feb 2003 22:29:05 -0000	1.658
+++ configure	11 Feb 2003 18:56:17 -0000	1.659
@@ -3839,13 +3839,7 @@
 fi
 if test "$_win32" = yes ; then
   _def_win32='#define USE_WIN32DLL 1'
-  _ld_win32='loader/libloader.a'
-  _dep_win32='loader/libloader.a'
-  _codecmodules="win32 $_codecmodules"
   echores "yes"
-  if openbsd ; then
-    x86 && _ld_win32="$_ld_win32 -li386"
-  fi
 else
   _def_win32='#undef USE_WIN32DLL'
   _nocodecmodules="win32 $_nocodecmodules"
@@ -3853,6 +3847,23 @@
   echores "no"
 fi
 
+if test "$_win32" != no ; then
+  _def_win32_loader='#undef WIN32_LOADER'
+  echocheck "Win32 loader support"
+  if ! cygwin ; then
+    _ld_win32='loader/libloader.a'
+    _dep_win32='loader/libloader.a'
+    _codecmodules="win32 $_codecmodules"
+    if openbsd ; then
+      x86 && _ld_win32="$_ld_win32 -li386"
+    fi
+    _def_win32_loader='#define WIN32_LOADER 1'
+    echores "yes"
+  else
+    echores "no (using native windows)"
+  fi
+fi
+
 echocheck "DirectShow"
 if false ; then
 
@@ -3944,7 +3955,8 @@
 echocheck "RealPlayer DLL"
 if test "$_real" = auto ; then
   _real=no
-  if test "$_dl" = yes ; then
+  if test "$_dl" = yes || test "$_win32" = yes ; then
+#  if test "$_dl" = yes  ; then
     if linux || freebsd || netbsd || cygwin ; then
       _real=yes
     else
@@ -5132,6 +5144,9 @@
 
 /* DirectShow support */
 $_def_dshow
+
+/* Build our Win32-loader */
+$_def_win32_loader
 
 /* ffmpeg's libavcodec support (requires libavcodec source) */
 $_def_libavcodec



More information about the MPlayer-cvslog mailing list