Mercurial > mplayer.hg

changeset 12069:841fd0c2f2e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix compilation on cygwin
author faust3
date Fri, 26 Mar 2004 12:15:54 +0000
parents df423e2d71dc
children 070fc453a20b
files configure libdha/Makefile libdha/libdha.c
diffstat 3 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Mar 25 21:49:48 2004 +0000
+++ b/configure	Fri Mar 26 12:15:54 2004 +0000
@@ -5728,6 +5728,12 @@
   _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 @@
 
 # --- Some stuff for autoconfigure ----
 $_target_arch
+$_confwin32
 $_confcygwin
 $_confmingw32
 TARGET_CPU=$iproc
--- a/libdha/Makefile	Thu Mar 25 21:49:48 2004 +0000
+++ b/libdha/Makefile	Fri Mar 26 12:15:54 2004 +0000
@@ -15,7 +15,7 @@
 #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 @@
 	$(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)
--- a/libdha/libdha.c	Thu Mar 25 21:49:48 2004 +0000
+++ b/libdha/libdha.c	Fri Mar 26 12:15:54 2004 +0000
@@ -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"