diff options
author | František Dvořák <valtri@users.sourceforge.net> | 2004-08-27 19:33:17 +0000 |
---|---|---|
committer | František Dvořák <valtri@users.sourceforge.net> | 2004-08-27 19:33:17 +0000 |
commit | e46ac635c2c28d80706f02f239bb847c7e48c34b (patch) | |
tree | edfd3169ae1ca48fbf36d7d1c6b61ccdfe50d01b /src/libfaad/diff_to_faad2_cvs.patch | |
parent | 2d5b782a786e81f3ee364210278747d8d338f065 (diff) | |
download | xine-lib-e46ac635c2c28d80706f02f239bb847c7e48c34b.tar.gz xine-lib-e46ac635c2c28d80706f02f239bb847c7e48c34b.tar.bz2 |
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
Diffstat (limited to 'src/libfaad/diff_to_faad2_cvs.patch')
-rw-r--r-- | src/libfaad/diff_to_faad2_cvs.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/src/libfaad/diff_to_faad2_cvs.patch b/src/libfaad/diff_to_faad2_cvs.patch index 86dc8aa69..df7a6db7b 100644 --- a/src/libfaad/diff_to_faad2_cvs.patch +++ b/src/libfaad/diff_to_faad2_cvs.patch @@ -16,3 +16,88 @@ #ifdef __ICL /* only Intel C compiler has fmath ??? */ +diff -u -p -r1.1.1.1 common.h +--- common.h 26 Jul 2004 15:27:56 -0000 1.1.1.1 ++++ common.h 30 Jul 2004 00:08:55 -0000 +@@ -145,22 +145,6 @@ extern "C" { + + /* END COMPILE TIME DEFINITIONS */ + +-#if defined(_WIN32) +- +- +-typedef unsigned __int64 uint64_t; +-typedef unsigned __int32 uint32_t; +-typedef unsigned __int16 uint16_t; +-typedef unsigned __int8 uint8_t; +-typedef __int64 int64_t; +-typedef __int32 int32_t; +-typedef __int16 int16_t; +-typedef __int8 int8_t; +-typedef float float32_t; +- +- +-#else +- + #ifdef HAVE_CONFIG_H + # include "config.h" + #endif +@@ -189,6 +173,8 @@ typedef float float32_t; + #if HAVE_STRINGS_H + # include <strings.h> + #endif ++ ++/* precedence defining int-types by header files for all platforms */ + #if HAVE_INTTYPES_H + # include <inttypes.h> + #else +@@ -196,6 +182,17 @@ typedef float float32_t; + # include <stdint.h> + # else + /* we need these... */ ++# ifdef WIN32 ++typedef unsigned __int64 uint64_t; ++typedef unsigned __int32 uint32_t; ++typedef unsigned __int16 uint16_t; ++typedef unsigned __int8 uint8_t; ++typedef __int64 int64_t; ++typedef __int32 int32_t; ++typedef __int16 int16_t; ++typedef __int8 int8_t; ++# else /* WIN32 */ ++typedef float float32_t; + typedef unsigned long long uint64_t; + typedef unsigned long uint32_t; + typedef unsigned short uint16_t; +@@ -204,6 +201,7 @@ typedef long long int64_t; + typedef long int32_t; + typedef short int16_t; + typedef char int8_t; ++# endif /* WIN32 */ + # endif + #endif + #if HAVE_UNISTD_H +@@ -226,8 +224,6 @@ char *strchr(), *strrchr(); + # define memcpy(d, s, n) bcopy((s), (d), (n)) + # define memmove(d, s, n) bcopy((s), (d), (n)) + # endif +-#endif +- + #endif + + #ifdef WORDS_BIGENDIAN +diff -u -p -r1.1.1.1 bits.h +--- bits.h 26 Jul 2004 15:27:56 -0000 1.1.1.1 ++++ bits.h 30 Jul 2004 09:35:55 -0000 +@@ -56,9 +56,9 @@ typedef struct _bitfile + } bitfile; + + +-#if defined (_WIN32) && !defined(_WIN32_WCE) ++#if defined(_MSC_VER) + #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax +-#elif defined(LINUX) || defined(DJGPP) ++#elif defined(LINUX) || defined(DJGPP) || defined (__MINGW32__) || defined (__CYGWIN__) + #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ) + #else + #define BSWAP(a) \ |