# HG changeset patch
# User faust3
# Date 1088358871 0
# Node ID 51d61721906b9e1479f33021c3890b453a5bdf95
# Parent  8188e7aa570aeb68dac90a7625d54e212702ef77
mingw crosscompiling step 1

diff -r 8188e7aa570a -r 51d61721906b Makefile
--- a/Makefile	Sun Jun 27 15:47:18 2004 +0000
+++ b/Makefile	Sun Jun 27 17:54:31 2004 +0000
@@ -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)
diff -r 8188e7aa570a -r 51d61721906b configure
--- a/configure	Sun Jun 27 15:47:18 2004 +0000
+++ b/configure	Sun Jun 27 17:54:31 2004 +0000
@@ -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
diff -r 8188e7aa570a -r 51d61721906b libaf/Makefile
--- a/libaf/Makefile	Sun Jun 27 15:47:18 2004 +0000
+++ b/libaf/Makefile	Sun Jun 27 17:54:31 2004 +0000
@@ -8,7 +8,7 @@
 
 CFLAGS  = $(OPTFLAGS) -I. -Wall $(EXTRA_INC)
 
-ifeq ($(TARGET_MINGW32),yes)
+ifeq ($(TARGET_OS),MINGW32)
 CFLAGS += -D_IO_H_
 endif
 
diff -r 8188e7aa570a -r 51d61721906b osdep/Makefile
--- a/osdep/Makefile	Sun Jun 27 15:47:18 2004 +0000
+++ b/osdep/Makefile	Sun Jun 27 17:54:31 2004 +0000
@@ -17,10 +17,10 @@
 ifeq ($(TARGET_OS),Darwin)
 timer = timer-darwin.c
 endif
-ifeq ($(TARGET_CYGWIN),yes)
+ifeq ($(TARGET_OS),CYGWIN)
 timer = timer-win2.c
 endif
-ifeq ($(TARGET_MINGW32),yes)
+ifeq ($(TARGET_OS),MINGW32)
 timer = timer-win2.c
 getch = getch2-win.c
 SRCS += glob-win.c