mirror of
https://github.com/mpv-player/mpv
synced 2024-12-22 23:02:37 +00:00
fix compilation on cygwin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12070 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
d1d9313755
commit
940bcdc4a5
7
configure
vendored
7
configure
vendored
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user