summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac42
-rw-r--r--win32/common/.gitignore2
-rw-r--r--win32/common/config.h188
4 files changed, 160 insertions, 76 deletions
diff --git a/Makefile.am b/Makefile.am
index 023aabae..822105bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,5 +31,9 @@ check-torture:
true
endif
+win32-update:
+ cp $(top_builddir)/win32/common/config.h-new \
+ $(top_builddir)/win32/common/config.h
+
include $(top_srcdir)/common/coverage/lcov.mak
diff --git a/configure.ac b/configure.ac
index 3cc4f76d..aa074f5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -487,9 +487,49 @@ tests/Makefile
tests/check/Makefile
m4/Makefile
po/Makefile.in
-win32/common/config.h
gst-plugins-ugly.spec
)
+
+dnl Create the config.h file for Visual Studio builds
+dnl Beware of spaces and /'s in some of the shell variable contents.
+sed \
+ -e 's/.*config.h.in.*autoheader.*/\/* Autogenerated config.h created for win32 Visual Studio builds *\/\n\n\/* PREFIX -- specifically added for Windows for easier moving *\/\n#define PREFIX "C:\\\\gstreamer"\n\n/' \
+ -e 's/.* GETTEXT_PACKAGE$/#define GETTEXT_PACKAGE "'$GETTEXT_PACKAGE'"/' \
+ -e 's/.* GST_DATADIR$/#define GST_DATADIR PREFIX "\\\\share"/' \
+ -e 's/.* GST_LEVEL_DEFAULT$/#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR/' \
+ -e 's/.* GST_LICENSE$/#define GST_LICENSE "'$GST_LICENSE'"/' \
+ -e 's/.* GST_MAJORMINOR$/#define GST_MAJORMINOR "'$GST_MAJORMINOR'"/' \
+ -e "s,.* GST_PACKAGE_NAME$,#define GST_PACKAGE_NAME \"${GST_PACKAGE_NAME}\"," \
+ -e 's/.* GST_PACKAGE_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \
+ -e 's/.* HAVE_CPU_I386$/#define HAVE_CPU_I386 1/' \
+ -e 's/.* HAVE_FGETPOS$/#define HAVE_FGETPOS 1/' \
+ -e 's/.* HAVE_FSETPOS$/#define HAVE_FSETPOS 1/' \
+ -e 's/.* HAVE_LIBXML2$/#define HAVE_LIBXML2 1/' \
+ -e 's/.* HAVE_PROCESS_H$/#define HAVE_PROCESS_H 1/' \
+ -e 's/.* HAVE_STDLIB_H$/#define HAVE_STDLIB_H 1/' \
+ -e 's/.* HAVE_STRING_H$/#define HAVE_STRING_H 1/' \
+ -e 's/.* HAVE_SYS_STAT_H$/#define HAVE_SYS_STAT_H 1/' \
+ -e 's/.* HAVE_SYS_TYPES_H$/#define HAVE_SYS_TYPES_H 1/' \
+ -e 's/.* HAVE_WIN32$/#define HAVE_WIN32 1/' \
+ -e 's/.* HAVE_WINSOCK2_H$/#define HAVE_WINSOCK2_H 1/' \
+ -e 's/.* HOST_CPU$/#define HOST_CPU "i686"/' \
+ -e 's/.* LIBDIR$/#ifdef _DEBUG\n# define LIBDIR PREFIX "\\\\debug\\\\lib"\n#else\n# define LIBDIR PREFIX "\\\\lib"\n#endif/' \
+ -e 's/.* LOCALEDIR$/#define LOCALEDIR PREFIX "\\\\share\\\\locale"/' \
+ -e "s/.* PACKAGE$/#define PACKAGE \"$PACKAGE\"/" \
+ -e 's/.* PACKAGE_BUGREPORT$/#define PACKAGE_BUGREPORT "http:\/\/bugzilla.gnome.org\/enter_bug.cgi?product=GStreamer"/' \
+ -e "s/.* PACKAGE_NAME$/#define PACKAGE_NAME \"$PACKAGE_NAME\"/" \
+ -e "s/.* PACKAGE_STRING$/#define PACKAGE_STRING \"$PACKAGE_STRING\"/" \
+ -e 's/.* PACKAGE_TARNAME$/#define PACKAGE_TARNAME "'$PACKAGE_TARNAME'"/' \
+ -e 's/.* PACKAGE_VERSION$/#define PACKAGE_VERSION "'$PACKAGE_VERSION'"/' \
+ -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.10"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.10"\n#endif/' \
+ -e 's/.* USE_BINARY_REGISTRY$/#define USE_BINARY_REGISTRY/' \
+ -e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \
+ -e "s/.* DEFAULT_AUDIOSINK$/#define DEFAULT_AUDIOSINK \"directaudiosink\"/" \
+ -e "s/.* DEFAULT_AUDIOSRC$/#define DEFAULT_AUDIOSRC \"audiotestsrc\"/" \
+ -e "s/.* DEFAULT_VIDEOSRC$/#define DEFAULT_VIDEOSRC \"videotestsrc\"/" \
+ -e "s/.* DEFAULT_VISUALIZER$/#define DEFAULT_VISUALIZER \"goom\"/" \
+ config.h.in >win32/common/config.h-new
+
AC_OUTPUT
AG_GST_OUTPUT_PLUGINS
diff --git a/win32/common/.gitignore b/win32/common/.gitignore
index 0e56cf2f..d2cf6843 100644
--- a/win32/common/.gitignore
+++ b/win32/common/.gitignore
@@ -1 +1 @@
-config.h
+config.h-new
diff --git a/win32/common/config.h b/win32/common/config.h
index 383549db..c7af5b56 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -1,5 +1,27 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
-/* This copy of config.h.in is specifically for win32 Visual Studio builds */
+/* Autogenerated config.h created for win32 Visual Studio builds */
+
+/* PREFIX -- specifically added for Windows for easier moving */
+#define PREFIX "C:\\gstreamer"
+
+
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Default audio sink */
+#define DEFAULT_AUDIOSINK "directaudiosink"
+
+/* Default audio source */
+#define DEFAULT_AUDIOSRC "audiotestsrc"
+
+/* Default video sink */
+#undef DEFAULT_VIDEOSINK
+
+/* Default video source */
+#define DEFAULT_VIDEOSRC "videotestsrc"
+
+/* Default visualizer */
+#define DEFAULT_VISUALIZER "goom"
/* Define to 1 if translation of program messages to the user's native
language is requested. */
@@ -9,28 +31,42 @@
#define GETTEXT_PACKAGE "gst-plugins-ugly-0.10"
/* macro to use to show function name */
-#define GST_FUNCTION "(function)"
+#undef GST_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
+#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR
/* GStreamer license */
#define GST_LICENSE "LGPL"
/* package name in plugins */
-#define GST_PACKAGE_NAME "GStreamer Ugly Plug-ins git/prerelease"
+#define GST_PACKAGE_NAME "GStreamer Ugly Plug-ins git"
/* package origin */
#define GST_PACKAGE_ORIGIN "Unknown package origin"
-/* support for features: gstalsa */
-#undef HAVE_ALSA
+/* Define to enable a52dec (used by a52dec). */
+#undef HAVE_A52DEC
+
+/* Define to enable amrnb library (used by amrnb). */
+#undef HAVE_AMRNB
+
+/* Define to enable amrwb library (used by amrwbdec). */
+#undef HAVE_AMRWB
+
+/* Define to enable cdio library (used by cdio). */
+#undef HAVE_CDIO
-/* support for features: cdparanoia */
-#undef HAVE_CDPARANOIA
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+ the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
/* Define if the host CPU is an Alpha */
#undef HAVE_CPU_ALPHA
@@ -38,6 +74,12 @@
/* Define if the host CPU is an ARM */
#undef HAVE_CPU_ARM
+/* Define if the host CPU is a CRIS */
+#undef HAVE_CPU_CRIS
+
+/* Define if the host CPU is a CRISv32 */
+#undef HAVE_CPU_CRISV32
+
/* Define if the host CPU is a HPPA */
#undef HAVE_CPU_HPPA
@@ -75,14 +117,17 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* support for features: */
-#undef HAVE_EXTERNAL
+/* define for working do while(0) macros */
+#undef HAVE_DOWHILE_MACROS
-/* FIONREAD ioctl found in sys/filio.h */
-#undef HAVE_FIONREAD_IN_SYS_FILIO
+/* Define to enable dvdread library (used by dvdreadsrc). */
+#undef HAVE_DVDREAD
-/* FIONREAD ioctl found in sys/ioclt.h */
-#undef HAVE_FIONREAD_IN_SYS_IOCTL
+/* Define to enable building of experimental plug-ins. */
+#undef HAVE_EXPERIMENTAL
+
+/* Define to enable building of plug-ins with external deps. */
+#undef HAVE_EXTERNAL
/* defined if the compiler implements __func__ */
#undef HAVE_FUNC
@@ -93,29 +138,17 @@
/* 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. */
+/* Define if you have the iconv() function and it works. */
#undef HAVE_ICONV
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define to 1 if you have the `asound' library (-lasound). */
-#undef HAVE_LIBASOUND
+/* Define to enable lame mp3 encoder library (used by lame). */
+#undef HAVE_LAME
-/* 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 enable mad mp3 decoder (used by mad). */
+#undef HAVE_MAD
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
@@ -123,11 +156,8 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
-/* support for features: oggdemux oggmux */
-#undef HAVE_OGG
-
-/* support for features: pango */
-#undef HAVE_PANGO
+/* Define to enable mpeg2dec (used by mpeg2dec). */
+#undef HAVE_MPEG2DEC
/* defined if the compiler implements __PRETTY_FUNCTION__ */
#undef HAVE_PRETTY_FUNCTION
@@ -135,8 +165,8 @@
/* Define if RDTSC is available */
#undef HAVE_RDTSC
-/* Define to 1 if you have the <regex.h> header file. */
-#undef HAVE_REGEX_H
+/* Define to enable libsidplay (used by sid). */
+#undef HAVE_SIDPLAY
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@@ -150,17 +180,14 @@
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H 1
+#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_TYPES_H 1
-/* support for features: theoradec theoraenc */
-#undef HAVE_THEORA
+/* Define to enable twolame (used by twolame). */
+#undef HAVE_TWOLAME
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
@@ -168,24 +195,25 @@
/* Define if valgrind should be used */
#undef HAVE_VALGRIND
-/* support for features: vorbisenc vorbisdec */
-#undef HAVE_VORBIS
+/* Define to 1 if you have the <winsock2.h> header file. */
+#define HAVE_WINSOCK2_H 1
-/* defined if vorbis_synthesis_restart is present */
-#undef HAVE_VORBIS_SYNTHESIS_RESTART
+/* Define to enable x264 plug-in (used by x264). */
+#undef HAVE_X264
-/* support for features: ximagesink */
-#undef HAVE_X
-
-/* support for features: xshm */
-#undef HAVE_XSHM
-
-/* support for features: xvimagesink */
-#undef HAVE_XVIDEO
+/* the host CPU */
+#define HOST_CPU "i686"
/* gettext locale dir */
#define LOCALEDIR PREFIX "\\share\\locale"
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
/* Name of package */
#define PACKAGE "gst-plugins-ugly"
@@ -193,33 +221,40 @@
#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 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.13.1"
+#define PACKAGE_STRING "GStreamer Ugly Plug-ins 0.10.13.1"
/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME "gst-plugins-ugly"
+#define PACKAGE_TARNAME "gst-plugins-ugly"
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
/* Define to the version of this package. */
-#undef PACKAGE_VERSION "0.10.13.1"
+#define PACKAGE_VERSION "0.10.13.1"
/* directory where plugins are located */
-#undef PLUGINDIR
+#ifdef _DEBUG
+# define PLUGINDIR PREFIX "\\debug\\lib\\gstreamer-0.10"
+#else
+# define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10"
+#endif
-/* The size of a `char', as computed by sizeof. */
+/* The size of `char', as computed by sizeof. */
#undef SIZEOF_CHAR
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
-/* The size of a `long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
-/* The size of a `short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
#undef SIZEOF_SHORT
-/* The size of a `void*', as computed by sizeof. */
+/* The size of `void*', as computed by sizeof. */
#undef SIZEOF_VOIDP
/* Define to 1 if you have the ANSI C header files. */
@@ -228,9 +263,14 @@
/* Version number of package */
#define VERSION "0.10.13.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 WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+# undef WORDS_BIGENDIAN
+# endif
+#endif