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, 15 insertions, 19 deletions

diff --git a/src/libfaad/common.h b/src/libfaad/common.h
index a1dbe00f6..744df0e45 100644
--- a/src/libfaad/common.h
+++ b/src/libfaad/common.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: common.h,v 1.12 2004/01/27 19:13:05 jstembridge Exp $
+** $Id: common.h,v 1.13 2004/08/27 19:33:20 valtri Exp $
 **/
 
 #ifndef __COMMON_H__
@@ -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
@@ -228,8 +226,6 @@ char *strchr(), *strrchr();
 # endif
 #endif
 
-#endif
-
 #ifdef WORDS_BIGENDIAN
 #define ARCH_IS_BIG_ENDIAN
 #endif