[Mplayer-cvslog] CVS: main configure, 1.880, 1.881 Makefile, 1.293, 1.294

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv3179

Modified Files:
	configure Makefile 
Log Message:
mingw crosscompiling step 1

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.880
retrieving revision 1.881
diff -u -r1.880 -r1.881
--- configure	26 Jun 2004 10:40:21 -0000	1.880
+++ configure	27 Jun 2004 17:54:30 -0000	1.881
@@ -469,6 +469,7 @@
     sunos) system_name=SunOS ;;
     qnx) system_name=QNX ;;
     morphos) system_name=MorphOS ;;
+    mingw32msvc) system_name=MINGW32 ;;
   esac
   # We need to convert underscores so that values like k6-2 and pentium-mmx can be passed
   host_arch=`echo $_target | cut -d '-' -f 1 | tr '_' '-'`
@@ -1883,6 +1884,17 @@
   sunos && _vidix=no
 fi
 
+echocheck "mplayer binary name"
+if win32 ; then
+  _prg="mplayer.exe"
+  _prg_mencoder="mencoder.exe"
+else
+  _prg="mplayer"
+  _prg_mencoder="mencoder"
+fi
+echores $_prg
+
+
 # On QNX we must link to libph - Gabucino
 if qnx ; then
   _ld_arch="$_ld_arch -lph"
@@ -5961,19 +5973,10 @@
 
 # Determine OS dependent libs
 if cygwin ; then
-  _confcygwin='TARGET_CYGWIN = yes'
   _def_confwin32='#define WIN32'
   #CFLAGS="$CFLAGS -D__CYGWIN__ -D__CYGWIN_USE_BIG_TYPES__"
   # stat.st_size with BIG_TYPES is broken (not set) ::atmos 
   CFLAGS="$CFLAGS -D__CYGWIN__"
-else
-  _confcygwin="TARGET_CYGWIN = no"
-fi
-
-if mingw32 ; then
-  _confmingw32='TARGET_MINGW32 = yes'
-else
-  _confmingw32='TARGET_MINGW32 = no'
 fi
 
 if win32 ; then
@@ -6097,6 +6100,9 @@
 OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC)
 STRIPBINARIES = $_stripbinaries
 
+PRG = $_prg
+PRG_MENCODER = $_prg_mencoder
+
 $_live_libs_def
 
 MPLAYER_NETWORK = $_network
@@ -6221,8 +6227,6 @@
 # --- Some stuff for autoconfigure ----
 $_target_arch
 $_confwin32
-$_confcygwin
-$_confmingw32
 TARGET_CPU=$iproc
 TARGET_MMX = $_mmx
 TARGET_MMX2 = $_mmx2

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- Makefile	26 Jun 2004 15:35:35 -0000	1.293
+++ Makefile	27 Jun 2004 17:54:30 -0000	1.294
@@ -6,9 +6,7 @@
 
 include config.mak
 
-PRG = mplayer
 PRG_CFG = codec-cfg
-PRG_MENCODER = mencoder
 
 # Do not strip the binaries at installation
 ifeq ($(STRIPBINARIES),yes)