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/bits.h | |
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/bits.h')
-rw-r--r-- | src/libfaad/bits.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libfaad/bits.h b/src/libfaad/bits.h index 7c1080967..68153dd5f 100644 --- a/src/libfaad/bits.h +++ b/src/libfaad/bits.h @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: bits.h,v 1.7 2004/01/26 22:34:10 jstembridge Exp $ +** $Id: bits.h,v 1.8 2004/08/27 19:33:20 valtri Exp $ **/ #ifndef __BITS_H__ @@ -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) \ |