From b4fa2fae063985550037ca680f25649875c44ab1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 13 Dec 2008 20:41:40 +0000 Subject: [PATCH] win32/common/: Hardcode cpu for win32 build, just like we do in the other modules, to remove VCS conflicts and incons... Original commit message from CVS: * win32/common/.cvsignore: * win32/common/config.h: * win32/common/config.h.in: Hardcode cpu for win32 build, just like we do in the other modules, to remove VCS conflicts and inconsistent defines between modules, and update version defines to CVS. --- ChangeLog | 9 ++ win32/common/config.h | 242 +++++++++++++++++++++++++++++++++++++++++++++++ win32/common/config.h.in | 5 +- 3 files changed, 255 insertions(+), 1 deletion(-) create mode 100644 win32/common/config.h diff --git a/ChangeLog b/ChangeLog index 9a7a220..8b87f5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-12-13 Tim-Philipp Müller + + * win32/common/.cvsignore: + * win32/common/config.h: + * win32/common/config.h.in: + Hardcode cpu for win32 build, just like we do in the other modules, + to remove VCS conflicts and inconsistent defines between modules, + and update version defines to CVS. + 2008-12-13 Edward Hervey * m4/Makefile.am: diff --git a/win32/common/config.h b/win32/common/config.h new file mode 100644 index 0000000..40b6e3b --- /dev/null +++ b/win32/common/config.h @@ -0,0 +1,242 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ +/* This copy of config.h.in is specifically for win32 Visual Studio builds */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#undef ENABLE_NLS + +/* gettext package name */ +#define GETTEXT_PACKAGE "gst-plugins-ugly-0.10" + +/* macro to use to show function name */ +#define GST_FUNCTION "(function)" + +/* Defined if gcov is enabled to force a rebuild due to config.h changing */ +#undef GST_GCOV_ENABLED + +/* Default errorlevel to use */ +#undef GST_LEVEL_DEFAULT + +/* GStreamer license */ +#define GST_LICENSE "LGPL" + +/* package name in plugins */ +#define GST_PACKAGE_NAME "GStreamer Ugly Plug-ins CVS/prerelease" + +/* package origin */ +#define GST_PACKAGE_ORIGIN "Unknown package origin" + +/* support for features: gstalsa */ +#undef HAVE_ALSA + +/* support for features: cdparanoia */ +#undef HAVE_CDPARANOIA + +/* Define if the host CPU is an Alpha */ +#undef HAVE_CPU_ALPHA + +/* Define if the host CPU is an ARM */ +#undef HAVE_CPU_ARM + +/* Define if the host CPU is a HPPA */ +#undef HAVE_CPU_HPPA + +/* Define if the host CPU is an x86 */ +#define HAVE_CPU_I386 1 + +/* Define if the host CPU is a IA64 */ +#undef HAVE_CPU_IA64 + +/* Define if the host CPU is a M68K */ +#undef HAVE_CPU_M68K + +/* Define if the host CPU is a MIPS */ +#undef HAVE_CPU_MIPS + +/* Define if the host CPU is a PowerPC */ +#undef HAVE_CPU_PPC + +/* Define if the host CPU is a 64 bit PowerPC */ +#undef HAVE_CPU_PPC64 + +/* Define if the host CPU is a S390 */ +#undef HAVE_CPU_S390 + +/* Define if the host CPU is a SPARC */ +#undef HAVE_CPU_SPARC + +/* Define if the host CPU is a x86_64 */ +#undef HAVE_CPU_X86_64 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#undef HAVE_DCGETTEXT + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* support for features: */ +#undef HAVE_EXTERNAL + +/* FIONREAD ioctl found in sys/filio.h */ +#undef HAVE_FIONREAD_IN_SYS_FILIO + +/* FIONREAD ioctl found in sys/ioclt.h */ +#undef HAVE_FIONREAD_IN_SYS_IOCTL + +/* defined if the compiler implements __func__ */ +#undef HAVE_FUNC + +/* defined if the compiler implements __FUNCTION__ */ +#undef HAVE_FUNCTION + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT + +/* support for features: gnomevfssrc */ +#undef HAVE_GNOME_VFS + +/* support for features: v4lsrc v4lmjpegsrc v4lmjpegsink */ +#undef HAVE_GST_V4L + +/* Define if you have the iconv() function. */ +#undef HAVE_ICONV + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `asound' library (-lasound). */ +#undef HAVE_LIBASOUND + +/* support for features: libvisual */ +#undef HAVE_LIBVISUAL + +/* Define if you have C99's lrint function. */ +#undef HAVE_LRINT + +/* Define if you have C99's lrintf function. */ +#undef HAVE_LRINTF + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* support for features: oggdemux oggmux */ +#undef HAVE_OGG + +/* support for features: pango */ +#undef HAVE_PANGO + +/* defined if the compiler implements __PRETTY_FUNCTION__ */ +#undef HAVE_PRETTY_FUNCTION + +/* Define if RDTSC is available */ +#undef HAVE_RDTSC + +/* Define to 1 if you have the header file. */ +#undef HAVE_REGEX_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H 1 + +/* support for features: theoradec theoraenc */ +#undef HAVE_THEORA + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define if valgrind should be used */ +#undef HAVE_VALGRIND + +/* support for features: vorbisenc vorbisdec */ +#undef HAVE_VORBIS + +/* defined if vorbis_synthesis_restart is present */ +#undef HAVE_VORBIS_SYNTHESIS_RESTART + +/* support for features: ximagesink */ +#undef HAVE_X + +/* support for features: xshm */ +#undef HAVE_XSHM + +/* support for features: xvimagesink */ +#undef HAVE_XVIDEO + +/* gettext locale dir */ +#define LOCALEDIR PREFIX "\\share\\locale" + +/* Name of package */ +#define PACKAGE "gst-plugins-ugly" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer" + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME "GStreamer Ugly Plug-ins" + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING "GStreamer Ugly Plug-ins 0.10.10.1" + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME "gst-plugins-ugly" + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION "0.10.10.1" + +/* directory where plugins are located */ +#undef PLUGINDIR + +/* The size of a `char', as computed by sizeof. */ +#undef SIZEOF_CHAR + +/* The size of a `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of a `long', as computed by sizeof. */ +#undef SIZEOF_LONG + +/* The size of a `short', as computed by sizeof. */ +#undef SIZEOF_SHORT + +/* The size of a `void*', as computed by sizeof. */ +#undef SIZEOF_VOIDP + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#define VERSION "0.10.10.1" + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN + +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif diff --git a/win32/common/config.h.in b/win32/common/config.h.in index e359cce..801722e 100644 --- a/win32/common/config.h.in +++ b/win32/common/config.h.in @@ -42,7 +42,7 @@ #undef HAVE_CPU_HPPA /* Define if the host CPU is an x86 */ -#undef HAVE_CPU_I386 +#define HAVE_CPU_I386 1 /* Define if the host CPU is a IA64 */ #undef HAVE_CPU_IA64 @@ -56,6 +56,9 @@ /* Define if the host CPU is a PowerPC */ #undef HAVE_CPU_PPC +/* Define if the host CPU is a 64 bit PowerPC */ +#undef HAVE_CPU_PPC64 + /* Define if the host CPU is a S390 */ #undef HAVE_CPU_S390 -- 2.7.4