win32/common/config.h.in: Add GST_DATADIR, hard-code cpu to x86.

Original commit message from CVS:
* win32/common/config.h.in:
Add GST_DATADIR, hard-code cpu to x86.
* win32/common/libgstreamer.def:
Spaces to tabs.

diff --git a/ChangeLog b/ChangeLog
index 6031219..e3b87c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-09  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+       * win32/common/config.h.in:
+         Add GST_DATADIR, hard-code cpu to x86.
+
+       * win32/common/libgstreamer.def:
+         Spaces to tabs.
+
 2008-09-03  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
        * gst/gsttaglist.h:

diff --git a/common b/common
index 8d49485..1ff63d8 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 8d494854a6018336a80ece82ceb3df0033e2da9c
+Subproject commit 1ff63d8f92c36bf207434436f4ce75f2a4ea11a4

diff --git a/win32/common/config.h.in b/win32/common/config.h.in
index 2d1770d..ebc4267 100644 (file)
--- a/win32/common/config.h.in
+++ b/win32/common/config.h.in
@@ -11,6 +11,9 @@
 /* PREFIX - specifically added for Windows for easier moving */
 #define PREFIX "C:\\gstreamer"
 
+/* data dir */
+#define GST_DATADIR PREFIX "\\share"
+
 /* Location of registry */
 #define GST_CACHE_DIR PREFIX "\\var\\cache"
 
@@ -45,7 +48,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
@@ -172,7 +175,7 @@
 #define HAVE_WIN32 1
 
 /* Define host CPU */
-#define HOST_CPU "@HOST_CPU@"
+#define HOST_CPU "i686"
 
 /* library dir */
 #ifdef _DEBUG

diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def
index 2f55dbb..bf569e6 100644 (file)
--- a/win32/common/libgstreamer.def
+++ b/win32/common/libgstreamer.def
@@ -546,8 +546,8 @@ EXPORTS
        gst_pad_is_blocked
        gst_pad_is_blocking
        gst_pad_is_linked
-        gst_pad_iterate_internal_links
-        gst_pad_iterate_internal_links_default
+       gst_pad_iterate_internal_links
+       gst_pad_iterate_internal_links_default
        gst_pad_link
        gst_pad_link_return_get_type
        gst_pad_load_and_link