diff options
| author | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-03-26 12:15:54 +0000 |
|---|---|---|
| committer | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-03-26 12:15:54 +0000 |
| commit | 940bcdc4a5ad2014a9e962bceb3531a6bfda244e (patch) | |
| tree | 3c9acd5c666db169d0b22d6c3e99a92e1057ac1b | |
| parent | d1d9313755f0300713bb2fa5ce721a3f24e60a12 (diff) | |
| download | mpv-940bcdc4a5ad2014a9e962bceb3531a6bfda244e.tar.bz2 mpv-940bcdc4a5ad2014a9e962bceb3531a6bfda244e.tar.xz | |
fix compilation on cygwin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12070 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | libdha/Makefile | 4 | ||||
| -rw-r--r-- | libdha/libdha.c | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -5728,6 +5728,12 @@ else _confmingw32='TARGET_MINGW32 = no' fi +if mingw32 || cygwin ; then + _confwin32='TARGET_WIN32 = yes' +else + _confwin32='TARGET_WIN32 = no' +fi + # Dynamic linking flags # (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly) _ld_dl_dynamic='' @@ -5961,6 +5967,7 @@ MPFLAC = $_mpflac # --- Some stuff for autoconfigure ---- $_target_arch +$_confwin32 $_confcygwin $_confmingw32 TARGET_CPU=$iproc diff --git a/libdha/Makefile b/libdha/Makefile index e4479eca12..827d397421 100644 --- a/libdha/Makefile +++ b/libdha/Makefile @@ -15,7 +15,7 @@ SONAME_FLAGS = -Wl,-soname,$(SHORTNAME) #SHORTNAME = libdha.so VSHORTNAME = libdha.so endif -ifeq ($(TARGET_MINGW32),yes) +ifeq ($(TARGET_WIN32),yes) LIBNAME = libdha.a SHORTNAME = libdha.a else @@ -48,7 +48,7 @@ endif $(CC) -c $(CFLAGS) -o $@ $< $(LIBNAME): $(OBJS) -ifeq ($(TARGET_MINGW32),yes) +ifeq ($(TARGET_WIN32),yes) $(AR) r $(LIBNAME) $(OBJS) else #$(CC) -shared $(SONAME_FLAGS) -o $(LIBNAME) $(OBJS) $(LIBS) diff --git a/libdha/libdha.c b/libdha/libdha.c index fa8efe75ee..f6ff7e664f 100644 --- a/libdha/libdha.c +++ b/libdha/libdha.c @@ -32,7 +32,7 @@ #endif #include <unistd.h> -#if defined(_WIN32) +#if defined(WIN32) #include "sysdep/libdha_win32.c" #elif defined (__EMX__) #include "sysdep/libdha_os2.c" |