diff options
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | configure | 26 | ||||
-rw-r--r-- | libaf/Makefile | 2 | ||||
-rw-r--r-- | osdep/Makefile | 4 |
4 files changed, 18 insertions, 16 deletions
@@ -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) @@ -469,6 +469,7 @@ else 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 @@ if test "$_vidix" = auto ; then 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 @@ echores "$_ftello" # 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 @@ EXTRA_INC = $_inc_extra $_inc_gtk 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 @@ MACOSX_FRAMEWORKS = $_macosx_frameworks # --- Some stuff for autoconfigure ---- $_target_arch $_confwin32 -$_confcygwin -$_confmingw32 TARGET_CPU=$iproc TARGET_MMX = $_mmx TARGET_MMX2 = $_mmx2 diff --git a/libaf/Makefile b/libaf/Makefile index 2abee8c79e..15b988b822 100644 --- a/libaf/Makefile +++ b/libaf/Makefile @@ -8,7 +8,7 @@ OBJS=$(SRCS:.c=.o) CFLAGS = $(OPTFLAGS) -I. -Wall $(EXTRA_INC) -ifeq ($(TARGET_MINGW32),yes) +ifeq ($(TARGET_OS),MINGW32) CFLAGS += -D_IO_H_ endif diff --git a/osdep/Makefile b/osdep/Makefile index 9c39fddd3a..4052aa4cd7 100644 --- a/osdep/Makefile +++ b/osdep/Makefile @@ -17,10 +17,10 @@ timer = timer-lx.c 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 |