MINGW32 port. Engine library and most of plugins compiles now.

List of some changes:
 - replaced some _MSC_VER by more common WIN32
 - define INTLDIR, remove -static flag for included intl
 - shared more common CFLAGS with DEBUG_CFLAGS
 - use WIN32_CFLAGS for all building
 - separate some flags into THREAD_CFLAGS_CONFIG,
   THREAD_CFLAGS_CONFIG and ZLIB_LIB_CONFIG for public xine-config,
   automatically use internal libs if necessary
 - don't warn about missing X for mingw and cygwin
 - libw32dll disabled for WIN32 (making native loader would be
   interesting, or porting wine code to Windows? :->)
 - DVB and RTP disabled for WIN32, not ported yet
 - fix build and fix a warning in cdda
 - fix build for nosefart and libfaad
 - implement configure option --disable-freetype
 - sync libxine.pc and xine-config.in
 - add -liberty to goom under WIN32
 - move original build files from included phread and zlib into archives
   and replace them by autotools

CVS patchset: 6910
CVS date: 2004/08/27 19:33:17

1 files changed, 28 insertions, 3 deletions

diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 120808132..09d42fd49 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -6,6 +6,16 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
 lib_LTLIBRARIES = libxine.la
 
 XINEUTILS_LIB  = $(top_builddir)/src/xine-utils/libxineutils.la
+if !HAVE_ZLIB
+INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la
+endif
+if WIN32
+DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la
+INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la
+endif
+if !SETENV
+SETENV_LIB = $(top_builddir)/win32/contrib/libsetenv.la
+endif
 
 libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
 	load_plugins.c video_decoder.c buffer_types.c \
@@ -17,9 +27,12 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
 # FIXME: these are currently unused:
 EXTRA_DIST = lrb.c lrb.h
 
-libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB)
+libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(INTERNAL_ZLIB_LIB) \
+                          $(DIRENT_LIB) $(INTERNAL_PTHREAD_LIB) \
+                          $(SETENV_LIB)
 libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \
-		-lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS)
+		    -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \
+                    $(DIRENT_LIB) $(SETENV_LIB)
 
 libxine_la_LDFLAGS =  \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -37,4 +50,16 @@ noinst_HEADERS = bswap.h
 @INCLUDED_INTL_TRUE@	@cd $(top_builddir)/intl && $(MAKE) libintl.la
 
 $(XINEUTILS_LIB):
-	cd $(top_srcdir)/src/xine-utils && $(MAKE) libxineutils.la
+	$(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
+
+$(INTERNAL_PTHREAD_LIB):
+	$(MAKE) -C $(top_builddir)/win32/contrib/pthreads libpthread.la
+
+$(INTERNAL_ZLIB_LIB):
+	$(MAKE) -C $(top_builddir)/win32/contrib/zlib libzlib.la
+
+$(DIRENT_LIB):
+	$(MAKE) -C $(top_builddir)/win32/contrib libdirent.la
+
+$(SETENV_LIB):
+	$(MAKE) -C $(top_builddir)/win32/contrib libsetenv.la