From e46ac635c2c28d80706f02f239bb847c7e48c34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 27 Aug 2004 19:33:17 +0000 Subject: 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 --- misc/libxine.pc.in | 4 ++-- misc/xine-config.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'misc') diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in index c19e0dd24..adef34f11 100644 --- a/misc/libxine.pc.in +++ b/misc/libxine.pc.in @@ -7,5 +7,5 @@ Name: libxine Description: The xine engine library Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@ Requires: -Libs: -L${libdir} -lxine @ZLIB_LIBS@ @THREAD_LIBS@ @EXTRA_X_LIBS@ -Cflags: -I${includedir} @THREAD_CFLAGS@ @EXTRA_X_CFLAGS@ +Libs: -L${libdir} -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @EXTRA_X_LIBS@ @LIBICONV@ +Cflags: -I${includedir} @THREAD_CFLAGS_CONFIG@ @EXTRA_X_CFLAGS@ diff --git a/misc/xine-config.in b/misc/xine-config.in index d78125b04..db6c7ec7e 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -100,11 +100,11 @@ if test "$echo_acflags" = "yes"; then fi if test "$echo_cflags" = "yes"; then - echo -I@includedir@ @THREAD_CFLAGS@ @EXTRA_X_CFLAGS@ + echo -I@includedir@ @THREAD_CFLAGS_CONFIG@ @EXTRA_X_CFLAGS@ fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @EXTRA_X_LIBS@ @LIBICONV@ + echo -L@libdir@ -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @EXTRA_X_LIBS@ @LIBICONV@ fi if test "$echo_plugindir" = "yes"; then echo "@XINE_PLUGINPATH@" -- cgit v1.2.3