gst/gstinfo.h: Add missing inline function.

Original commit message from CVS: * gst/gstinfo.h: Add missing inline function. * gst/gsttrace.c: add include * gst/parse/grammar.y: remove unused code * gst/registries/gstxmlregistry.c: (make_dir): make mkdir call more portable. * tools/gst-register.c: wrap unistd.h More additions/fixes from Steve for the MSVC build. * win32/GStreamer.vcproj: * win32/Makefile: * win32/Makefile.inspect: * win32/Makefile.launch: * win32/Makefile.register: * win32/README.txt: * win32/gst-inspect.vcproj: * win32/gst-launch.vcproj: * win32/gst-register.vcproj: * win32/gstbytestream.def: * win32/gstbytestream.vcproj: * win32/gstconfig.h: * win32/gstelements.def: * win32/gstelements.vcproj: * win32/gstenumtypes.c: * win32/gstenumtypes.h: * win32/gstoptimalscheduler.def: * win32/gstoptimalscheduler.vcproj: * win32/gstreamer.def: * win32/gstspider.def: * win32/gstspider.vcproj: * win32/gstversion.h: * win32/msvc71.sln:
2024-06-08 09:09:26 +00:00 · 2004-05-10 18:07:24 +00:00 · 2004-05-10 18:07:24 +00:00 · 037c9d2b34
parent aafaa5b7e2
commit 037c9d2b34
41 changed files with 2842 additions and 344 deletions
--- a/34
+++ b/34
@ -1,3 +1,37 @@
+2004-05-10  David Schleef  <ds@schleef.org>
+
+	* gst/gstinfo.h: Add missing inline function.
+	* gst/gsttrace.c: add include
+	* gst/parse/grammar.y: remove unused code
+	* gst/registries/gstxmlregistry.c: (make_dir): make mkdir call
+	more portable.
+	* tools/gst-register.c: wrap unistd.h
+	
+	More additions/fixes from Steve for the MSVC build.
+	* win32/GStreamer.vcproj:
+	* win32/Makefile:
+	* win32/Makefile.inspect:
+	* win32/Makefile.launch:
+	* win32/Makefile.register:
+	* win32/README.txt:
+	* win32/gst-inspect.vcproj:
+	* win32/gst-launch.vcproj:
+	* win32/gst-register.vcproj:
+	* win32/gstbytestream.def:
+	* win32/gstbytestream.vcproj:
+	* win32/gstconfig.h:
+	* win32/gstelements.def:
+	* win32/gstelements.vcproj:
+	* win32/gstenumtypes.c:
+	* win32/gstenumtypes.h:
+	* win32/gstoptimalscheduler.def:
+	* win32/gstoptimalscheduler.vcproj:
+	* win32/gstreamer.def:
+	* win32/gstspider.def:
+	* win32/gstspider.vcproj:
+	* win32/gstversion.h:
+	* win32/msvc71.sln:
+
 2004-05-10  Benjamin Otte  <in7y118@public.uni-hamburg.de>

 	* gst/gstelement.c: (gst_element_class_init),
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@ -697,6 +697,12 @@ G_CONST_RETURN gchar*
 #define GST_LOG(args...)				/* NOP */

 #else
+static inline void
+GST_CAT_LEVEL_LOG_valist (GstDebugCategory * cat,
+    GstDebugLevel level, gpointer object, const char *format, va_list varargs)
+{
+}
+
 static inline void
 GST_CAT_ERROR_OBJECT (GstDebugCategory * cat, gpointer obj, const char *format,
    ...)
--- a/gst/gsttrace.c
+++ b/gst/gsttrace.c
@ -33,6 +33,7 @@
 #include <string.h>

 #include "gst_private.h"
+#include "gstinfo.h"

 #include "gsttrace.h"

--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@ -136,19 +136,6 @@ typedef struct {
   }G_STMT_END
 #endif

-#elif defined(G_HAVE_ISO_VARARGS)
-
-#define SET_ERROR(error, type, ...) G_STMT_START{ \
-  GST_CAT_ERROR (GST_CAT_PIPELINE, "error while parsing" ); \
-  if ((error) && !*(error)) { \
-    g_set_error ((error), GST_PARSE_ERROR, (type), "error while parsing"); \
-  } \
-}G_STMT_END
-#define ERROR(type, ...) SET_ERROR (((graph_t *) graph)->error, (type), "error while parsing")
-#ifndef GST_DISABLE_GST_DEBUG
-#  define YYDEBUG 1
-#endif
-
 #else

 static inline void
--- a/gst/registries/gstxmlregistry.c
+++ b/gst/registries/gstxmlregistry.c
@ -29,11 +29,27 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#include <fcntl.h>
+#ifdef _MSC_VER
+#include <sys/utime.h>
+#include <io.h>
+#ifndef F_OK
+#define F_OK 0
+#define W_OK 2
+#define R_OK 4
+#endif
+#ifndef S_ISREG
+#define S_ISREG(mode) ((mode)&_S_IFREG)
+#endif
+#ifndef S_ISDIR
+#define S_ISDIR(mode) ((mode)&_S_IFDIR)
+#endif
+#else /* _MSC_VER */
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <fcntl.h>
 #include <utime.h>
+#endif

 #include <gst/gst_private.h>
 #include <gst/gstelement.h>
@ -302,15 +318,18 @@ get_time (const char *path, gboolean * is_dir)
  return statbuf.st_ctime;
 }

-/* same as 0755 */
-#define DIRMODE \
-  (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
+#ifdef _MSC_VER
+#define xmkdir(dirname) _mkdir (dirname)
+#else
+#define xmkdir(dirname) mkdir (dirname, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
+#endif

 static gboolean
 make_dir (gchar * filename)
 {
  struct stat dirstat;
  gchar *dirname;
+  int ret;

  if (strrchr (filename, '/') == NULL)
    return FALSE;
@ -318,19 +337,16 @@ make_dir (gchar * filename)
  dirname = g_strndup (filename, strrchr (filename, '/') - filename);

  if (stat (dirname, &dirstat) == -1 && errno == ENOENT) {
-#ifndef HAVE_WIN32
-    if (mkdir (dirname, DIRMODE) != 0) {
+    if (xmkdir (dirname) != 0) {
      if (make_dir (dirname) != TRUE) {
        g_free (dirname);
        return FALSE;
      } else {
-        if (mkdir (dirname, DIRMODE) != 0)
+        if (xmkdir (dirname) != 0) {
          return FALSE;
+        }
      }
    }
-#else
-    return FALSE;
-#endif
  }

  g_free (dirname);
--- a/tools/gst-register.c
+++ b/tools/gst-register.c
@ -30,7 +30,9 @@
 #include <stdio.h>

 #include <fcntl.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <string.h>
 #include <errno.h>
 #include <locale.h>
--- a/win32/GStreamer.vcproj
+++ b/win32/GStreamer.vcproj
@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="GStreamer"
+	Name="libgstreamer"
 	ProjectGUID="{FC47A187-6B10-4B19-93B5-ED7BCC75D466}"
 	RootNamespace="GStreamer"
 	Keyword="Win32Proj">
@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="D:\Perso\Programmes\GStreamer\gstreamer\win32;.\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\build\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;GSTREAMER_EXPORTS;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GST_DISABLE_GST_DEBUG"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -36,25 +36,42 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib GThread.lib GModule.lib libxml2.lib libpopt.lib wsock32.lib"
-				OutputFile="$(OutDir)/GStreamer.dll"
-				LinkIncremental="2"
+				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib"
+				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
+				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug;..\..\popt\lib;..\..\libxml2\lib"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\libxml2\lib"
 				IgnoreAllDefaultLibraries="FALSE"
-				ModuleDefinitionFile=""
+				ModuleDefinitionFile="gstreamer.def"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/GStreamer.pdb"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/GStreamer.lib"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				ImportLibrary="$(OutDir)/GStreamer-0.8.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
+copy $(ProjectDir)\gstversion.h $(ProjectDir)\..\gst\gstversion.h
+copy $(ProjectDir)\gstenumtypes.h $(ProjectDir)\..\gst\gstenumtypes.h
+copy $(ProjectDir)\gstenumtypes.c $(ProjectDir)\..\gst\gstenumtypes.c
+echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp
+$(ProjectDir)..\..\glib\gobject\glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
+move gstmarshal.h.tmp $(ProjectDir)..\gst\gstmarshal.h
+echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp
+echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp
+$(ProjectDir)..\..\glib\gobject\glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
+move gstmarshal.c.tmp $(ProjectDir)..\gst\gstmarshal.c
+bison -d -v -p_gst_parse__yy $(ProjectDir)..\gst\parse\grammar.y -o $(ProjectDir)..\gst\parse\grammar.tab.c
+flex -P_gst_parse_yy $(ProjectDir)..\gst\parse\parse.l
+move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
+"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@ -79,7 +96,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;GSTREAMER_EXPORTS;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GST_DISABLE_GST_DEBUG"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="config.h"
@ -91,25 +108,40 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib GThread.lib GModule.lib libxml2.lib libpopt.lib wsock32.lib"
-				OutputFile="$(OutDir)/GStreamer.dll"
+				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib"
+				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release;..\..\popt\lib;..\..\libxml2\lib"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\libxml2\lib"
 				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile=""
+				ModuleDefinitionFile="gstreamer.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/GStreamer.lib"
+				ImportLibrary="$(OutDir)/GStreamer-0.8.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
+copy $(ProjectDir)\gstversion.h $(ProjectDir)\..\gst\gstversion.h
+copy $(ProjectDir)\gstenumtypes.h $(ProjectDir)\..\gst\gstenumtypes.h
+copy $(ProjectDir)\gstenumtypes.c $(ProjectDir)\..\gst\gstenumtypes.c
+echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp
+$(ProjectDir)..\..\glib\gobject\glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
+move gstmarshal.h.tmp $(ProjectDir)..\gst\gstmarshal.h
+echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp
+echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp
+$(ProjectDir)..\..\glib\gobject\glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
+move gstmarshal.c.tmp $(ProjectDir)..\gst\gstmarshal.c
+bison -d -v -p_gst_parse__yy $(ProjectDir)..\gst\parse\grammar.y -o $(ProjectDir)..\gst\parse\grammar.tab.c
+flex -P_gst_parse_yy $(ProjectDir)..\gst\parse\parse.l
+move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
+"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@ -321,6 +353,12 @@
 			<File
 				RelativePath="..\gst\gstpad.h">
 			</File>
+			<File
+				RelativePath="..\gst\gstplugin.h">
+			</File>
+			<File
+				RelativePath="..\gst\gstscheduler.h">
+			</File>
 			<File
 				RelativePath="..\gst\gsttrace.h">
 			</File>
--- a/win32/Makefile
+++ b/win32/Makefile
@ -4,32 +4,61 @@
 # Uses the Free Visual C++ 2003 compiler from Microsoft
 # http://msdn.microsoft.com/visualc/vctoolkit2003/

-# Compile with debug information? IMPOSSIBLE with the free version of the compiler
-#DEBUG = yes
+# Compile with debug information ? IMPOSSIBLE with the free version of the compiler
+DEBUG = no

+# Link with MSVCRT as a DLL ? IMPOSSIBLE with the free version of the compiler
+MSVCRT = yes
+
+SRC_DIR=..\gst
+GLIB_DIR=..\..\glib

 #
 # Don't change anything below this line.
 #
 CXX  = cl /Tp
 CC   = cl /Tc
-SRC  = dirent.c ../gst/parse/grammar.tab.c ../gst/gst.c ../gst/gstatomic.c ../gst/gstbin.c ../gst/gstbuffer.c ..\gst\gstcaps.c ..\gst\gstclock.c ..\gst\gstcpu.c ..\gst\gstdata.c ..\gst\gstelement.c ..\gst\gstelementfactory.c ..\gst\gstenumtypes.c ..\gst\gsterror.c ..\gst\gstevent.c ..\gst\gstfilter.c ..\gst\gstformat.c ..\gst\gstindex.c ..\gst\gstinfo.c ..\gst\gstmarshal.c ..\gst\gstmemchunk.c ..\gst\gstobject.c ..\gst\gstpad.c ..\gst\gstparse.c ..\gst\gstpipeline.c ..\gst\gstplugin.c ..\gst\gstpluginfeature.c ..\gst\gstprobe.c ..\gst\gstquery.c ..\gst\gstqueue.c ..\gst\gstregistry.c ..\gst\gstregistrypool.c ..\gst\gstscheduler.c ..\gst\gststructure.c ..\gst\gstsystemclock.c ..\gst\gsttag.c ..\gst\gstthread.c ..\gst\gsttrace.c ..\gst\gsttypefind.c ..\gst\gsturi.c ..\gst\gsturitype.c ..\gst\gstutils.c ..\gst\gstvalue.c ..\gst\gstxml.c ..\gst\registries\gstxmlregistry.c ..\gst\parse\lex._gst_parse_yy.c
+SRC  = dirent.c $(SRC_DIR)\parse\grammar.tab.c $(SRC_DIR)\gst.c $(SRC_DIR)\gstatomic.c $(SRC_DIR)\gstbin.c $(SRC_DIR)\gstbuffer.c \
+$(SRC_DIR)\gstcaps.c $(SRC_DIR)\gstclock.c $(SRC_DIR)\gstcpu.c $(SRC_DIR)\gstdata.c $(SRC_DIR)\gstelement.c $(SRC_DIR)\gstelementfactory.c \
+$(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gsterror.c $(SRC_DIR)\gstevent.c $(SRC_DIR)\gstfilter.c $(SRC_DIR)\gstformat.c $(SRC_DIR)\gstindex.c \
+$(SRC_DIR)\gstinfo.c $(SRC_DIR)\gstmarshal.c $(SRC_DIR)\gstmemchunk.c $(SRC_DIR)\gstobject.c $(SRC_DIR)\gstpad.c $(SRC_DIR)\gstparse.c \
+$(SRC_DIR)\gstpipeline.c $(SRC_DIR)\gstplugin.c $(SRC_DIR)\gstpluginfeature.c $(SRC_DIR)\gstprobe.c $(SRC_DIR)\gstquery.c $(SRC_DIR)\gstqueue.c \
+$(SRC_DIR)\gstregistry.c $(SRC_DIR)\gstregistrypool.c $(SRC_DIR)\gstscheduler.c $(SRC_DIR)\gststructure.c $(SRC_DIR)\gstsystemclock.c \
+$(SRC_DIR)\gsttag.c $(SRC_DIR)\gstthread.c $(SRC_DIR)\gsttrace.c $(SRC_DIR)\gsttypefind.c $(SRC_DIR)\gsturi.c $(SRC_DIR)\gsturitype.c \
+$(SRC_DIR)\gstutils.c $(SRC_DIR)\gstvalue.c $(SRC_DIR)\gstxml.c $(SRC_DIR)\registries\gstxmlregistry.c $(SRC_DIR)\parse\lex._gst_parse_yy.c \
+$(SRC_DIR)\..\libs\gst\control\control.c $(SRC_DIR)\..\libs\gst\control\unitconvert.c $(SRC_DIR)\..\libs\gst\control\dparammanager.c \
+$(SRC_DIR)\..\libs\gst\control\dparam.c
 OBJ  = $(patsubst %.c,%.obj,$(SRC))
-INCS = /I. /I.. /I../libs /I../../popt/include /I../../glib/gmodule /I../../libiconv/include /I../../libxml2/include/libxml2 /I../../glib /I../../glib/glib /I../../glib/build/win32
-LDFLAGS = /NOLOGO /DLL /MAP:gstreamer.map /LIBPATH:../../glib/win32 /LIBPATH:../../popt/lib /LIBPATH:../../libxml2/lib
+INCS = /I. /I.. /I../libs /I../../popt/include /I../../libiconv/include /I../../libxml2/include/libxml2 /I$(GLIB_DIR) /I$(GLIB_DIR)\glib /I$(GLIB_DIR)\gmodule /I$(GLIB_DIR)\build\win32
+LDFLAGS = /NOLOGO /DLL /IMPLIB:gstreamer-0.8.lib /MAP:gstreamer.map /LIBPATH:$(GLIB_DIR)/glib /LIBPATH:$(GLIB_DIR)/gobject /LIBPATH:$(GLIB_DIR)/gmodule /LIBPATH:$(GLIB_DIR)/gthread /LIBPATH:../../popt/lib /LIBPATH:../../libxml2/lib
 OPTMIZ = /G6 /O2 /Oi /Wp64 /GL
-CXXFLAGS = $(INCS) /DWIN32 /D_WINDOWS /D_USRDLL /DHAVE_CONFIG_H /DGSTREAMER_EXPORTS /nologo
+CXXFLAGS = $(INCS) /DWIN32 /D_WINDOWS /DHAVE_CONFIG_H /D_USRDLL /DHAVE_WIN32 /nologo


+HEADERS = $(SRC_DIR)\gstversion.h $(SRC_DIR)\gstconfig.h $(SRC_DIR)\gstenumtypes.h $(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gstmarshal.h
+
 ifeq (yes,$(DEBUG))
-CXXFLAGS += /Zi /DDEBUG /D_DEBUG /MTd /RTC1
-LDFLAGS += /DEBUG
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MDd
 else
-CXXFLAGS += /MT /DGST_DISABLE_GST_DEBUG
+ CXXFLAGS += /MTd
+endif
+CXXFLAGS += /Zi /DDEBUG /D_DEBUG /RTC1
+LDFLAGS += /DEBUG
+
+else
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MD
+else
+ CXXFLAGS += /MT
+endif
+CXXFLAGS += /DGST_DISABLE_GST_DEBUG
 LDFLAGS += /OPT:REF
 endif

-LIBS = libgstreamer.dll
+LIBS = libgstreamer-0.8.dll

 .PHONY: all all-before all-after clean clean-custom

@ -40,14 +69,50 @@ LIBS = libgstreamer.dll
 	$(CC) $< /c $(CXXFLAGS) /Fo$@

 all: lib
+	make -f Makefile.inspect
+	make -f Makefile.launch
+	make -f Makefile.register

 lib: $(LIBS)

 clean:
-	$(RM) $(OBJ) libgstreamer.lib libgstreamer.dll
+	make -f Makefile.inspect  clean
+	make -f Makefile.launch   clean
+	make -f Makefile.register clean
+	$(RM) $(OBJ) $(HEADERS) gstreamer-0.8.lib libgstreamer-0.8.dll gstreamer.map gstreamer-0.8.exp

-libgstreamer.dll: $(OBJ) $(SRC)
-	link $(LDFLAGS) /OUT:$@ $(OBJ) libglib-2.0.lib libgobject-2.0.lib libgthread-2.0.lib libgmodule-2.0.lib libxml2.lib libpopt.lib wsock32.lib
+libgstreamer-0.8.dll: $(HEADERS) $(OBJ)
+	link $(LDFLAGS) /OUT:$@ $(OBJ) /DEF:gstreamer.def glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib libpopt.lib wsock32.lib
+
+
+$(SRC_DIR)\gstversion.h: gstversion.h
+	copy $< $@
+
+$(SRC_DIR)\gstconfig.h: gstconfig.h
+	copy $< $@
+
+$(SRC_DIR)\gstenumtypes.c: gstenumtypes.c
+	copy $< $@
+
+$(SRC_DIR)\gstenumtypes.h: gstenumtypes.h
+	copy $< $@
+
+
+$(SRC_DIR)\gstmarshal.h:
+	echo #include "gst/gstconfig.h"              > $(SRC_DIR)\gstmarshal.h
+	$(GLIB_DIR)\gobject\glib-genmarshal --header --prefix=gst_marshal $(SRC_DIR)/gstmarshal.list >> $(SRC_DIR)/gstmarshal.h
+$(SRC_DIR)\gstmarshal.c:
+	echo #include "glib-object.h" > $(SRC_DIR)\gstmarshal.c
+	echo #include "gstmarshal.h" >> $(SRC_DIR)\gstmarshal.c
+	$(GLIB_DIR)\gobject\glib-genmarshal --body --prefix=gst_marshal $(SRC_DIR)/gstmarshal.list >> $(SRC_DIR)/gstmarshal.c
+
+# generated sources, otherwise you should get these files from somewhere else
+$(SRC_DIR)\parse\grammar.tab.c:
+	bison -d -v -p_gst_parse__yy $(SRC_DIR)\parse\grammar.y -o $(SRC_DIR)\parse\grammar.tab.c
+
+$(SRC_DIR)\parse\lex._gst_parse_yy.c:
+	flex -P_gst_parse_yy $(SRC_DIR)\parse\parse.l
+	copy lex._gst_parse_yy.c $(SRC_DIR)\parse\lex._gst_parse_yy.c

 depend:
 	$(CXX) $(CXXFLAGS) -MM $(SRC) > .depend
--- a/win32/Makefile.inspect
+++ b/win32/Makefile.inspect
@ -0,0 +1,77 @@
+# Project: libgstreamer
+# Makefile to use with GNU Make
+#
+# Uses the Free Visual C++ 2003 compiler from Microsoft
+# http://msdn.microsoft.com/visualc/vctoolkit2003/
+
+# Compile with debug information ? IMPOSSIBLE with the free version of the compiler
+#DEBUG = yes
+
+# Link with MSVCRT as a DLL ? IMPOSSIBLE with the free version of the compiler
+MSVCRT = yes
+
+SRC_DIR=..\tools
+GLIB_DIR=..\..\glib
+
+#
+# Don't change anything below this line.
+#
+CXX  = cl /Tp
+CC   = cl /Tc
+SRC  = $(SRC_DIR)\gst-inspect.obj
+OBJ  = $(patsubst %.c,%.obj,$(SRC))
+INCS = /I. /I.. /I../libs /I../../popt/include /I../../libiconv/include /I../../libxml2/include/libxml2 /I$(GLIB_DIR) /I$(GLIB_DIR)\glib /I$(GLIB_DIR)\gmodule /I$(GLIB_DIR)\build\win32
+LDFLAGS = /NOLOGO /DLL /IMPLIB:gstreamer-0.8.lib /MAP:gst-inspect.map /LIBPATH:$(GLIB_DIR)/glib /LIBPATH:$(GLIB_DIR)/gobject /LIBPATH:$(GLIB_DIR)/gmodule /LIBPATH:$(GLIB_DIR)/gthread /LIBPATH:../../popt/lib /LIBPATH:../../libxml2/lib
+OPTMIZ = /G6 /O2 /Oi /Wp64 /GL
+CXXFLAGS = $(INCS) /DWIN32 /D_WINDOWS /DHAVE_CONFIG_H /D_USRDLL /DHAVE_WIN32 /nologo
+
+
+HEADERS = $(SRC_DIR)\gstconfig.h $(SRC_DIR)\gstenumtypes.h $(SRC_DIR)\gstversion.h $(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gstmarshal.h
+
+ifeq (yes,$(DEBUG))
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MDd
+else
+ CXXFLAGS += /MTd
+endif
+CXXFLAGS += /Zi /DDEBUG /D_DEBUG /RTC1
+LDFLAGS += /DEBUG
+
+else
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MD
+else
+ CXXFLAGS += /MT
+endif
+CXXFLAGS += /DGST_DISABLE_GST_DEBUG
+LDFLAGS += /OPT:REF
+endif
+
+.PHONY: all all-before all-after clean clean-custom
+
+%.obj : %.cpp
+	$(CXX) $< /c $(CXXFLAGS) /Fo$@
+
+%.obj : %.c
+	$(CC) $< /c $(CXXFLAGS) /Fo$@
+
+all: gst-inspect.exe
+
+clean:
+	$(RM) gst-inspect.*
+
+gst-inspect.exe:
+	$(CC) $(SRC_DIR)\gst-inspect.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib
+	
+
+depend:
+	$(CXX) $(CXXFLAGS) -MM $(SRC) > .depend
+
+#
+# include dependency files if they exist
+#
+ifneq ($(wildcard .depend),)
+include .depend
+endif
--- a/win32/Makefile.launch
+++ b/win32/Makefile.launch
@ -0,0 +1,77 @@
+# Project: libgstreamer
+# Makefile to use with GNU Make
+#
+# Uses the Free Visual C++ 2003 compiler from Microsoft
+# http://msdn.microsoft.com/visualc/vctoolkit2003/
+
+# Compile with debug information ? IMPOSSIBLE with the free version of the compiler
+#DEBUG = yes
+
+# Link with MSVCRT as a DLL ? IMPOSSIBLE with the free version of the compiler
+MSVCRT = yes
+
+SRC_DIR=..\tools
+GLIB_DIR=..\..\glib
+
+#
+# Don't change anything below this line.
+#
+CXX  = cl /Tp
+CC   = cl /Tc
+SRC  = $(SRC_DIR)\gst-launch.obj
+OBJ  = $(patsubst %.c,%.obj,$(SRC))
+INCS = /I. /I.. /I../libs /I../../popt/include /I../../libiconv/include /I../../libxml2/include/libxml2 /I$(GLIB_DIR) /I$(GLIB_DIR)\glib /I$(GLIB_DIR)\gmodule /I$(GLIB_DIR)\build\win32
+LDFLAGS = /NOLOGO /DLL /IMPLIB:gstreamer-0.8.lib /MAP:gst-launch.map /LIBPATH:$(GLIB_DIR)/glib /LIBPATH:$(GLIB_DIR)/gobject /LIBPATH:$(GLIB_DIR)/gmodule /LIBPATH:$(GLIB_DIR)/gthread /LIBPATH:../../popt/lib /LIBPATH:../../libxml2/lib
+OPTMIZ = /G6 /O2 /Oi /Wp64 /GL
+CXXFLAGS = $(INCS) /DWIN32 /D_WINDOWS /DHAVE_CONFIG_H /D_USRDLL /DHAVE_WIN32 /nologo
+
+
+HEADERS = $(SRC_DIR)\gstconfig.h $(SRC_DIR)\gstenumtypes.h $(SRC_DIR)\gstversion.h $(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gstmarshal.h
+
+ifeq (yes,$(DEBUG))
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MDd
+else
+ CXXFLAGS += /MTd
+endif
+CXXFLAGS += /Zi /DDEBUG /D_DEBUG /RTC1
+LDFLAGS += /DEBUG
+
+else
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MD
+else
+ CXXFLAGS += /MT
+endif
+CXXFLAGS += /DGST_DISABLE_GST_DEBUG
+LDFLAGS += /OPT:REF
+endif
+
+.PHONY: all all-before all-after clean clean-custom
+
+%.obj : %.cpp
+	$(CXX) $< /c $(CXXFLAGS) /Fo$@
+
+%.obj : %.c
+	$(CC) $< /c $(CXXFLAGS) /Fo$@
+
+all: gst-launch.exe
+
+clean:
+	$(RM) gst-launch.*
+
+gst-launch.exe:
+	$(CC) $(SRC_DIR)\gst-launch.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib
+	
+
+depend:
+	$(CXX) $(CXXFLAGS) -MM $(SRC) > .depend
+
+#
+# include dependency files if they exist
+#
+ifneq ($(wildcard .depend),)
+include .depend
+endif
--- a/win32/Makefile.register
+++ b/win32/Makefile.register
@ -0,0 +1,77 @@
+# Project: libgstreamer
+# Makefile to use with GNU Make
+#
+# Uses the Free Visual C++ 2003 compiler from Microsoft
+# http://msdn.microsoft.com/visualc/vctoolkit2003/
+
+# Compile with debug information ? IMPOSSIBLE with the free version of the compiler
+#DEBUG = yes
+
+# Link with MSVCRT as a DLL ? IMPOSSIBLE with the free version of the compiler
+MSVCRT = yes
+
+SRC_DIR=..\tools
+GLIB_DIR=..\..\glib
+
+#
+# Don't change anything below this line.
+#
+CXX  = cl /Tp
+CC   = cl /Tc
+SRC  = $(SRC_DIR)\gst-register.obj
+OBJ  = $(patsubst %.c,%.obj,$(SRC))
+INCS = /I. /I.. /I../libs /I../../popt/include /I../../libiconv/include /I../../libxml2/include/libxml2 /I$(GLIB_DIR) /I$(GLIB_DIR)\glib /I$(GLIB_DIR)\gmodule /I$(GLIB_DIR)\build\win32
+LDFLAGS = /NOLOGO /DLL /IMPLIB:gstreamer-0.8.lib /MAP:gst-register.map /LIBPATH:$(GLIB_DIR)/glib /LIBPATH:$(GLIB_DIR)/gobject /LIBPATH:$(GLIB_DIR)/gmodule /LIBPATH:$(GLIB_DIR)/gthread /LIBPATH:../../popt/lib /LIBPATH:../../libxml2/lib
+OPTMIZ = /G6 /O2 /Oi /Wp64 /GL
+CXXFLAGS = $(INCS) /DWIN32 /D_WINDOWS /DHAVE_CONFIG_H /D_USRDLL /DHAVE_WIN32 /nologo
+
+
+HEADERS = $(SRC_DIR)\gstconfig.h $(SRC_DIR)\gstenumtypes.h $(SRC_DIR)\gstversion.h $(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gstmarshal.h
+
+ifeq (yes,$(DEBUG))
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MDd
+else
+ CXXFLAGS += /MTd
+endif
+CXXFLAGS += /Zi /DDEBUG /D_DEBUG /RTC1
+LDFLAGS += /DEBUG
+
+else
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MD
+else
+ CXXFLAGS += /MT
+endif
+CXXFLAGS += /DGST_DISABLE_GST_DEBUG
+LDFLAGS += /OPT:REF
+endif
+
+.PHONY: all all-before all-after clean clean-custom
+
+%.obj : %.cpp
+	$(CXX) $< /c $(CXXFLAGS) /Fo$@
+
+%.obj : %.c
+	$(CC) $< /c $(CXXFLAGS) /Fo$@
+
+all: gst-register.exe
+
+clean:
+	$(RM) gst-register.*
+
+gst-register.exe:
+	$(CC) $(SRC_DIR)\gst-register.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib
+	
+
+depend:
+	$(CXX) $(CXXFLAGS) -MM $(SRC) > .depend
+
+#
+# include dependency files if they exist
+#
+ifneq ($(wildcard .depend),)
+include .depend
+endif
--- a/win32/README.txt
+++ b/win32/README.txt
@ -0,0 +1,41 @@
+There are different makefiles that can be used to build GStreamer with the usual Microsoft 
+compiling tools.
+
+The Makefile is meant to be used with the GNU make program and the free 
+version of the Microsoft compiler (http://msdn.microsoft.com/visualc/vctoolkit2003/). You also 
+have to modify your system environment variables to use it from the command-line. You will also 
+need a working Platform SDK for Windows that is available for free from Microsoft.
+
+The projects/makefiles will generate automatically some source files needed to compile 
+GStreamer. That requires that you have installed on your system some GNU tools and that they are 
+available in your system PATH.
+
+The GStreamer project depends on other libraries, namely :
+- GLib
+- libpopt
+- libxml
+- libintl
+- libiconv
+
+The sources should be organised in folders as follow :
+$(PROJECT_DIR)\glib
+$(PROJECT_DIR)\gstreamer (this package)
+$(PROJECT_DIR)\libiconv
+$(PROJECT_DIR)\libintl
+$(PROJECT_DIR)\libxml2
+$(PROJECT_DIR)\popt
+
+NOTE : you can find Win32 versions of these libraries on http://gnuwin32.sourceforge.net/ 
+You will need the Binaries and Developer files for each package.
+
+NOTE : GLib can be found on ftp://ftp.gtk.org/pub/gtk/v2.4/ and should be compiled from the 
+sources
+
+NOTE : GNU tools needed that you can find on http://gnuwin32.sourceforge.net/
+- GNU flex      (tested with 2.5.4)
+- GNU bison     (tested with 1.35)
+and http://www.mingw.org/
+- GNU make      (tested with 3.80)
+
+NOTE : the generated files from the -auto makefiles will be available soon separately on the net 
+for convenience (people who don't want to install GNU tools).
--- a/win32/gst-inspect.vcproj
+++ b/win32/gst-inspect.vcproj
@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="gst-inspect"
-	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}"
 	RootNamespace="gst-inspect"
 	Keyword="Win32Proj">
 	<Platforms>
@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
+				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-inspect.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-inspect.pdb"
@ -73,7 +73,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
+				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-inspect.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/win32/gst-launch.vcproj
+++ b/win32/gst-launch.vcproj
@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="gst-launch"
-	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}"
 	RootNamespace="gst-launch"
 	Keyword="Win32Proj">
 	<Platforms>
@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-launch.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-launch.pdb"
@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-launch.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/win32/gst-register.vcproj
+++ b/win32/gst-register.vcproj
@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-register.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-register.pdb"
@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-register.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/win32/gstbytestream.def
+++ b/win32/gstbytestream.def
@ -0,0 +1,17 @@
+EXPORTS
+	gst_plugin_desc
+	gst_bytestream_new
+	gst_bytestream_destroy
+	gst_bytestream_reset
+	gst_bytestream_read
+	gst_bytestream_tell
+	gst_bytestream_length
+	gst_bytestream_size_hint
+	gst_bytestream_seek
+	gst_bytestream_peek
+	gst_bytestream_peek_bytes
+	gst_bytestream_flush
+	gst_bytestream_flush_fast
+	gst_bytestream_get_status
+	gst_bytestream_get_timestamp
+	gst_bytestream_print_status
--- a/win32/gstbytestream.vcproj
+++ b/win32/gstbytestream.vcproj
@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="gstbytestream"
-	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}"
 	RootNamespace="gstbytestream"
 	Keyword="Win32Proj">
 	<Platforms>
@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gstbytestream.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gstbytestream.def"
 				GenerateDebugInformation="TRUE"
@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gstbytestream.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				ModuleDefinitionFile="gstbytestream.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
--- a/win32/gstconfig.h
+++ b/win32/gstconfig.h
@ -0,0 +1,80 @@
+/* This header interprets the various GST_* macros that are typically	*
+ * provided by the gstreamer-config or gstreamer.pc files.		*/
+
+#ifndef __GST_CONFIG_H__
+#define __GST_CONFIG_H__
+
+/***** trick gtk-doc into believing these symbols are defined (yes, it's ugly) */
+
+#if 0
+#define GST_DISABLE_LOADSAVE_REGISTRY 1
+#define GST_DISABLE_GST_DEBUG 1
+#define GST_DISABLE_LOADSAVE 1
+#define GST_DISABLE_PARSE 1
+#define GST_DISABLE_TRACE 1
+#define GST_DISABLE_ALLOC_TRACE 1
+#define GST_DISABLE_REGISTRY 1
+#define GST_DISABLE_ENUMTYPES 1
+#define GST_DISABLE_INDEX 1
+#define GST_DISABLE_PLUGIN 1
+#define GST_DISABLE_URI 1
+#endif
+
+
+/***** disabling of subsystems *****/
+
+/* wether or not the debugging subsystem is enabled */
+/* #undef GST_DISABLE_GST_DEBUG */
+
+/* DOES NOT WORK */
+/* #undef GST_DISABLE_LOADSAVE */
+
+/* DOES NOT WORK */
+/* #undef GST_DISABLE_PARSE */
+
+/* DOES NOT WORK */
+/* #undef GST_DISABLE_TRACE */
+
+/* DOES NOT WORK */
+/* #undef GST_DISABLE_ALLOC_TRACE */
+
+/* DOES NOT WORK */
+/* #undef GST_DISABLE_REGISTRY */
+
+/* DOES NOT WORK */
+/* #undef GST_DISABLE_ENUMTYPES */
+
+/* DOES NOT WORK */
+/* #undef GST_DISABLE_INDEX */
+
+/* DOES NOT WORK */
+/* #undef GST_DISABLE_PLUGIN */
+
+/* DOES NOT WORK */
+/* #undef GST_DISABLE_URI */
+
+/* printf extension format */
+#define GST_PTR_FORMAT "P"
+
+/* whether or not the CPU supports unaligned access */
+#define GST_HAVE_UNALIGNED_ACCESS 0
+
+/***** Deal with XML stuff, we have to handle both loadsave and registry *****/
+
+#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )
+# include <libxml/parser.h>
+#else
+# define GST_DISABLE_LOADSAVE_REGISTRY
+#endif
+
+#ifdef WIN32
+#ifdef GSTREAMER_EXPORTS
+#define GSTREAMER_EXPORT __declspec(dllexport)
+#else
+#define GSTREAMER_EXPORT __declspec(dllimport)
+#endif
+#else
+#define GSTREAMER_EXPORT 
+#endif
+
+#endif /* __GST_CONFIG_H__ */
--- a/win32/gstelements.def
+++ b/win32/gstelements.def
@ -0,0 +1,6 @@
+EXPORTS
+;g_module_check_init
+;g_module_unload
+;gst_plugin_desc
+;plugin_init
+	gst_plugin_desc
--- a/win32/gstelements.vcproj
+++ b/win32/gstelements.vcproj
@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="gstelements"
-	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}"
 	RootNamespace="gstelements"
 	Keyword="Win32Proj">
 	<Platforms>
@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gstelements.def"
 				GenerateDebugInformation="TRUE"
@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				ModuleDefinitionFile="gstelements.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
@ -158,9 +158,6 @@
 			<File
 				RelativePath="..\gst\elements\gstmd5sink.c">
 			</File>
-			<File
-				RelativePath="..\gst\elements\gstmultidisksrc.c">
-			</File>
 			<File
 				RelativePath="..\gst\elements\gstshaper.c">
 			</File>
--- a/win32/gstenumtypes.c
+++ b/win32/gstenumtypes.c
--- a/win32/gstenumtypes.h
+++ b/win32/gstenumtypes.h
@ -0,0 +1,209 @@
+
+/* Generated data (by glib-mkenums) */
+
+#ifndef __GST_ENUM_TYPES_H__
+#define __GST_ENUM_TYPES_H__
+
+#include <glib-object.h>
+#include <gst/gstconfig.h>
+
+G_BEGIN_DECLS
+
+/* enumerations from "gstobject.h" */
+
+GType gst_object_flags_get_type (void);
+#define GST_TYPE_OBJECT_FLAGS (gst_object_flags_get_type())
+
+/* enumerations from "gstbin.h" */
+
+GType gst_bin_flags_get_type (void);
+#define GST_TYPE_BIN_FLAGS (gst_bin_flags_get_type())
+
+/* enumerations from "gstbuffer.h" */
+
+GType gst_buffer_flag_get_type (void);
+#define GST_TYPE_BUFFER_FLAG (gst_buffer_flag_get_type())
+
+/* enumerations from "gstclock.h" */
+
+GType gst_clock_entry_status_get_type (void);
+#define GST_TYPE_CLOCK_ENTRY_STATUS (gst_clock_entry_status_get_type())
+
+GType gst_clock_entry_type_get_type (void);
+#define GST_TYPE_CLOCK_ENTRY_TYPE (gst_clock_entry_type_get_type())
+
+GType gst_clock_return_get_type (void);
+#define GST_TYPE_CLOCK_RETURN (gst_clock_return_get_type())
+
+GType gst_clock_flags_get_type (void);
+#define GST_TYPE_CLOCK_FLAGS (gst_clock_flags_get_type())
+
+/* enumerations from "gstcpu.h" */
+
+GType gst_cpu_flags_get_type (void);
+#define GST_TYPE_CPU_FLAGS (gst_cpu_flags_get_type())
+
+/* enumerations from "gstdata.h" */
+
+GType gst_data_flags_get_type (void);
+#define GST_TYPE_DATA_FLAGS (gst_data_flags_get_type())
+
+/* enumerations from "gstelement.h" */
+
+GType gst_element_flags_get_type (void);
+#define GST_TYPE_ELEMENT_FLAGS (gst_element_flags_get_type())
+
+/* enumerations from "gsterror.h" */
+
+GType gst_core_error_get_type (void);
+#define GST_TYPE_CORE_ERROR (gst_core_error_get_type())
+
+GType gst_library_error_get_type (void);
+#define GST_TYPE_LIBRARY_ERROR (gst_library_error_get_type())
+
+GType gst_resource_error_get_type (void);
+#define GST_TYPE_RESOURCE_ERROR (gst_resource_error_get_type())
+
+GType gst_stream_error_get_type (void);
+#define GST_TYPE_STREAM_ERROR (gst_stream_error_get_type())
+
+/* enumerations from "gstevent.h" */
+
+GType gst_event_type_get_type (void);
+#define GST_TYPE_EVENT_TYPE (gst_event_type_get_type())
+
+GType gst_event_flag_get_type (void);
+#define GST_TYPE_EVENT_FLAG (gst_event_flag_get_type())
+
+GType gst_seek_type_get_type (void);
+#define GST_TYPE_SEEK_TYPE (gst_seek_type_get_type())
+
+GType gst_seek_accuracy_get_type (void);
+#define GST_TYPE_SEEK_ACCURACY (gst_seek_accuracy_get_type())
+
+/* enumerations from "gstformat.h" */
+
+GType gst_format_get_type (void);
+#define GST_TYPE_FORMAT (gst_format_get_type())
+
+/* enumerations from "gstindex.h" */
+
+GType gst_index_certainty_get_type (void);
+#define GST_TYPE_INDEX_CERTAINTY (gst_index_certainty_get_type())
+
+GType gst_index_entry_type_get_type (void);
+#define GST_TYPE_INDEX_ENTRY_TYPE (gst_index_entry_type_get_type())
+
+GType gst_index_lookup_method_get_type (void);
+#define GST_TYPE_INDEX_LOOKUP_METHOD (gst_index_lookup_method_get_type())
+
+GType gst_assoc_flags_get_type (void);
+#define GST_TYPE_ASSOC_FLAGS (gst_assoc_flags_get_type())
+
+GType gst_index_resolver_method_get_type (void);
+#define GST_TYPE_INDEX_RESOLVER_METHOD (gst_index_resolver_method_get_type())
+
+GType gst_index_flags_get_type (void);
+#define GST_TYPE_INDEX_FLAGS (gst_index_flags_get_type())
+
+/* enumerations from "gstinfo.h" */
+
+GType gst_debug_level_get_type (void);
+#define GST_TYPE_DEBUG_LEVEL (gst_debug_level_get_type())
+
+GType gst_debug_color_flags_get_type (void);
+#define GST_TYPE_DEBUG_COLOR_FLAGS (gst_debug_color_flags_get_type())
+
+/* enumerations from "gstpad.h" */
+
+GType gst_pad_link_return_get_type (void);
+#define GST_TYPE_PAD_LINK_RETURN (gst_pad_link_return_get_type())
+
+GType gst_pad_direction_get_type (void);
+#define GST_TYPE_PAD_DIRECTION (gst_pad_direction_get_type())
+
+GType gst_pad_flags_get_type (void);
+#define GST_TYPE_PAD_FLAGS (gst_pad_flags_get_type())
+
+GType gst_pad_presence_get_type (void);
+#define GST_TYPE_PAD_PRESENCE (gst_pad_presence_get_type())
+
+GType gst_pad_template_flags_get_type (void);
+#define GST_TYPE_PAD_TEMPLATE_FLAGS (gst_pad_template_flags_get_type())
+
+/* enumerations from "gstplugin.h" */
+
+GType gst_plugin_error_get_type (void);
+#define GST_TYPE_PLUGIN_ERROR (gst_plugin_error_get_type())
+
+/* enumerations from "gstquery.h" */
+
+GType gst_query_type_get_type (void);
+#define GST_TYPE_QUERY_TYPE (gst_query_type_get_type())
+
+/* enumerations from "gstscheduler.h" */
+
+GType gst_scheduler_flags_get_type (void);
+#define GST_TYPE_SCHEDULER_FLAGS (gst_scheduler_flags_get_type())
+
+GType gst_scheduler_state_get_type (void);
+#define GST_TYPE_SCHEDULER_STATE (gst_scheduler_state_get_type())
+
+/* enumerations from "gsttag.h" */
+
+GType gst_tag_merge_mode_get_type (void);
+#define GST_TYPE_TAG_MERGE_MODE (gst_tag_merge_mode_get_type())
+
+GType gst_tag_flag_get_type (void);
+#define GST_TYPE_TAG_FLAG (gst_tag_flag_get_type())
+
+/* enumerations from "gstthread.h" */
+
+GType gst_thread_state_get_type (void);
+#define GST_TYPE_THREAD_STATE (gst_thread_state_get_type())
+
+/* enumerations from "gsttrace.h" */
+
+GType gst_alloc_trace_flags_get_type (void);
+#define GST_TYPE_ALLOC_TRACE_FLAGS (gst_alloc_trace_flags_get_type())
+
+/* enumerations from "gsttypefind.h" */
+
+GType gst_type_find_probability_get_type (void);
+#define GST_TYPE_TYPE_FIND_PROBABILITY (gst_type_find_probability_get_type())
+
+/* enumerations from "gsttypes.h" */
+
+GType gst_element_state_get_type (void);
+#define GST_TYPE_ELEMENT_STATE (gst_element_state_get_type())
+
+GType gst_element_state_return_get_type (void);
+#define GST_TYPE_ELEMENT_STATE_RETURN (gst_element_state_return_get_type())
+
+GType gst_result_get_type (void);
+#define GST_TYPE_RESULT (gst_result_get_type())
+
+/* enumerations from "gsturi.h" */
+
+GType gst_uri_type_get_type (void);
+#define GST_TYPE_URI_TYPE (gst_uri_type_get_type())
+
+/* enumerations from "gstregistry.h" */
+
+GType gst_registry_return_get_type (void);
+#define GST_TYPE_REGISTRY_RETURN (gst_registry_return_get_type())
+
+GType gst_registry_flags_get_type (void);
+#define GST_TYPE_REGISTRY_FLAGS (gst_registry_flags_get_type())
+
+/* enumerations from "gstparse.h" */
+
+GType gst_parse_error_get_type (void);
+#define GST_TYPE_PARSE_ERROR (gst_parse_error_get_type())
+
+G_END_DECLS
+
+#endif /* __GST_ENUM_TYPES_H__ */
+
+/* Generated data ends here */
+
--- a/win32/gstoptimalscheduler.def
+++ b/win32/gstoptimalscheduler.def
@ -0,0 +1,6 @@
+EXPORTS
+;g_module_check_init
+;g_module_unload
+;gst_plugin_desc
+;plugin_init
+	gst_plugin_desc
--- a/win32/gstoptimalscheduler.vcproj
+++ b/win32/gstoptimalscheduler.vcproj
@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="gstoptimalscheduler"
-	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7B}"
 	RootNamespace="gstoptimalscheduler"
 	Keyword="Win32Proj">
 	<Platforms>
@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gstoptimalscheduler.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gstoptimalscheduler.def"
 				GenerateDebugInformation="TRUE"
@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gstoptimalscheduler.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				ModuleDefinitionFile="gstoptimalscheduler.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
--- a/win32/gstreamer.def
+++ b/win32/gstreamer.def
@ -0,0 +1,190 @@
+EXPORTS
+	gst_init
+        gst_registry_pool_find_plugin
+        gst_uri_handler_get_type
+        gst_registry_pool_find_plugin
+        gst_uri_handler_get_type
+        gst_type_find_factory_get_type
+        gst_index_factory_get_type
+        gst_registry_pool_find_feature
+        gst_scheduler_factory_get_type
+        gst_element_factory_find
+        gst_control_init
+        gst_init_with_popt_table
+        gst_bin_get_list
+        gst_dpman_list_dparam_specs
+        gst_dpman_get_manager
+        gst_pad_get_internal_links_default
+        gst_pad_get_query_types
+        gst_pad_get_query_types_default
+        gst_pad_query_default
+        gst_pad_get_event_masks
+        gst_pad_get_event_masks_default
+        gst_pad_event_default
+        gst_pad_convert_default
+        gst_pad_get_formats
+        gst_pad_get_formats_default
+        _gst_ghost_pad_type
+        gst_pad_get_name
+        gst_pad_get_direction
+        _gst_real_pad_type
+        _gst_pad_type
+        gst_element_get_pad_list
+        gst_element_is_indexable
+        gst_element_get_clock
+        gst_element_provides_clock
+        gst_element_requires_clock
+        _gst_bin_type
+        gst_plugin_feature_get_type
+        _gst_element_type
+        _gst_object_type
+        gst_element_factory_create
+        gst_structure_foreach
+        gst_structure_get_name
+        gst_caps_get_structure
+        gst_caps_get_size
+        gst_caps_is_empty
+        gst_caps_is_any
+        gst_value_serialize
+        gst_format_get_details
+        gst_query_type_get_details
+        gst_value_get_caps
+        gst_caps_get_type
+        gst_uri_get_uri_type
+        gst_plugin_feature_get_name
+        gst_element_factory_get_type
+        gst_plugin_get_feature_list
+        gst_registry_pool_plugin_list
+        gst_object_get_name
+        gst_main_quit
+        gst_bin_iterate
+        gst_object_unref
+        gst_element_wait_state_change
+        gst_main
+        gst_bin_get_clock
+        gst_element_set_state
+        gst_bin_add
+        gst_element_factory_make
+        gst_xml_write_file
+        gst_element_default_error
+        gst_object_default_deep_notify
+        gst_parse_launchv
+        gst_alloc_trace_print_all
+        gst_alloc_trace_available
+        gst_alloc_trace_set_flags_all
+        gst_util_set_object_arg
+        gst_bin_get_by_name
+        gst_xml_get_topelements
+        gst_xml_parse_file
+        gst_xml_new
+        gst_tag_list_foreach
+        gst_tag_get_nick
+        gst_tag_list_get_value_index
+        gst_tag_list_get_string_index
+        gst_tag_get_type
+        gst_tag_list_get_tag_size
+        gst_registry_get_path_list      
+        gst_registry_load
+        gst_registry_save
+        gst_registry_rebuild
+        gst_registry_add_path
+        gst_registry_get_type
+        gst_registry_pool_list
+        _gst_registry_auto_load
+        gst_data_unref
+        gst_buffer_new
+        gst_buffer_create_sub
+        gst_buffer_merge
+        gst_buffer_is_span_fast
+        _gst_event_type
+        gst_pad_pull
+        gst_pad_send_event
+        gst_event_new_seek
+        gst_pad_query
+        gst_event_new_size
+        gst_element_class_set_details
+        gst_element_class_add_pad_template
+        gst_static_pad_template_get
+        gst_element_add_pad
+        gst_pad_set_getcaps_function
+        gst_pad_proxy_getcaps
+        gst_pad_new
+        gst_pad_set_chain_function
+        gst_pad_new_from_template
+        gst_pad_set_get_function
+        gst_element_set_loop_function
+        gst_pad_push
+        gst_pad_get_parent
+        gst_buffer_get_type
+        gst_data_ref
+        gst_buffer_new_and_alloc
+        gst_element_register
+        gst_util_dump_mem
+        gst_element_wait
+        gst_element_set_time
+        gst_element_error_full
+        gst_core_error_quark
+        _gst_element_error_printf
+        gst_pad_set_formats_function
+        gst_pad_set_query_type_function
+        gst_pad_set_query_function
+        gst_pad_set_event_mask_function
+        gst_pad_set_event_function
+        gst_element_set_eos
+        gst_event_new
+        gst_resource_error_quark
+        gst_uri_construct
+        gst_event_discont_get_value
+        gst_uri_get_location
+        gst_uri_get_protocol
+        gst_uri_handler_new_uri
+        gst_event_new_discontinuous
+        gst_pad_set_link_function
+        gst_pad_proxy_pad_link
+        gst_pad_set_element_private
+        gst_pad_set_internal_link_function
+        gst_caps_new_any
+        gst_pad_get_caps
+        gst_pad_get_element_private
+        gst_pad_try_set_caps
+        gst_pad_get_negotiated_caps
+        gst_data_ref_by_count
+        gst_pad_set_explicit_caps
+        gst_caps_copy
+        gst_pad_use_explicit_caps
+        gst_stream_error_quark
+        gst_type_find_factory_call_function
+        gst_type_find_factory_get_list
+        gst_caps_free
+        gst_element_get_state
+        gst_caps_replace
+        gst_pad_collectv
+        gst_atomic_int_read
+        gst_pad_set_active
+        gst_scheduler_get_type
+        gst_plugin_add_feature
+        gst_scheduler_factory_new
+        gst_pad_call_get_function
+        gst_object_ref
+        gst_pad_call_chain_function
+        gst_caps_intersect
+        gst_pad_template_get_type
+        gst_pad_template_get_caps
+        gst_element_add_ghost_pad
+        gst_registry_pool_feature_list
+        gst_object_replace
+        gst_pad_unlink
+        gst_pad_link
+        gst_bin_remove
+        gst_element_get_pad_template_list
+        gst_element_sync_state_with_parent
+        gst_element_link
+        gst_element_factory_get_element_type
+        gst_pad_get_allowed_caps
+        gst_element_interrupt
+        gst_seek_type_get_type
+        gst_event_type_get_type
+        gst_pad_unnegotiate
+        gst_marshal_VOID__UINT_BOXED
+        gst_marshal_BOOLEAN__POINTER
+        gst_marshal_VOID__POINTER_OBJECT
--- a/win32/gstspider.def
+++ b/win32/gstspider.def
@ -0,0 +1,6 @@
+EXPORTS
+;g_module_check_init
+;g_module_unload
+;gst_plugin_desc
+;plugin_init
+	gst_plugin_desc
--- a/win32/gstspider.vcproj
+++ b/win32/gstspider.vcproj
@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="gstspider"
-	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7A}"
 	RootNamespace="gstspider"
 	Keyword="Win32Proj">
 	<Platforms>
@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gstspider.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gstspider.def"
 				GenerateDebugInformation="TRUE"
@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gstspider.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				ModuleDefinitionFile="gstspider.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
--- a/win32/gstversion.h
+++ b/win32/gstversion.h
@ -0,0 +1,39 @@
+/* GStreamer
+ * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
+ *                    2000 Wim Taymans <wtay@chello.be>
+ *
+ * gstversion.h: Version information for GStreamer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
+#ifndef __GST_VERSION_H__
+#define __GST_VERSION_H__
+
+/*
+ * Use these only when you want to know what GStreamer version your stuff was
+ * compiled against.
+ * Use the #gst_version function if you want to know which version of 
+ * GStreamer you are currently linked against.
+ */
+#define GST_VERSION_MAJOR 0
+#define GST_VERSION_MINOR 8
+#define GST_VERSION_MICRO 1
+
+void    gst_version     (guint *major, guint *minor, guint *micro);
+
+#endif /* __GST_VERSION_H__ */
--- a/win32/msvc71.sln
+++ b/win32/msvc71.sln
@ -1,76 +1,41 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GStreamer", "GStreamer.vcproj", "{FC47A187-6B10-4B19-93B5-ED7BCC75D466}"
-	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLib", "..\..\glib\win32\GLib-msvc71.vcproj", "{54A61913-7439-41EF-BB66-45401FFBB9F7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstreamer", "GStreamer.vcproj", "{FC47A187-6B10-4B19-93B5-ED7BCC75D466}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GObject", "..\..\glib\win32\GObject-msvc71.vcproj", "{54A61913-7439-41EF-BB66-45401FFBB9F7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-launch", "gst-launch.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}"
 	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GModule", "..\..\glib\win32\GModule-msvc71.vcproj", "{54A61913-7439-41EF-BB66-45401FFBB9F7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GThread", "..\..\glib\win32\GThread-msvc71.vcproj", "{54A61913-7439-41EF-BB66-45401FFBB9F7}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-launch", "gst-launch.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-register", "gst-register.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
 	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-inspect", "gst-inspect.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstelements", "gstelements.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstoptimalscheduler", "gstoptimalscheduler.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-inspect", "gst-inspect.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstspider", "gstspider.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstelements", "gstelements.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstbytestream", "gstbytestream.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstoptimalscheduler", "gstoptimalscheduler.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-marshal", "..\..\glib\win32\glib-marshal-msvc71.vcproj", "{D009C213-89B9-4FFD-9C02-690E99996A28}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstspider", "gstspider.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstbytestream", "gstbytestream.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
 Global
@ -79,58 +44,38 @@ Global
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7B}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7B}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7B}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7B}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7A}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7A}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7A}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7A}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Release.Build.0 = Release|Win32
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.ActiveCfg = Debug|Win32
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.Build.0 = Debug|Win32
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.ActiveCfg = Release|Win32
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.Build.0 = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.ActiveCfg = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.Build.0 = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.ActiveCfg = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.Build.0 = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.ActiveCfg = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.Build.0 = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.ActiveCfg = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.Build.0 = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.ActiveCfg = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.Build.0 = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.ActiveCfg = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.Build.0 = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.ActiveCfg = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.Build.0 = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.ActiveCfg = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{D009C213-89B9-4FFD-9C02-690E99996A28}.Debug.ActiveCfg = Debug|Win32
-		{D009C213-89B9-4FFD-9C02-690E99996A28}.Debug.Build.0 = Debug|Win32
-		{D009C213-89B9-4FFD-9C02-690E99996A28}.Release.ActiveCfg = Release|Win32
-		{D009C213-89B9-4FFD-9C02-690E99996A28}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
--- a/win32/vs7/GStreamer.vcproj
+++ b/win32/vs7/GStreamer.vcproj
@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="GStreamer"
+	Name="libgstreamer"
 	ProjectGUID="{FC47A187-6B10-4B19-93B5-ED7BCC75D466}"
 	RootNamespace="GStreamer"
 	Keyword="Win32Proj">
@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="D:\Perso\Programmes\GStreamer\gstreamer\win32;.\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\build\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;GSTREAMER_EXPORTS;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GST_DISABLE_GST_DEBUG"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -36,25 +36,42 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib GThread.lib GModule.lib libxml2.lib libpopt.lib wsock32.lib"
-				OutputFile="$(OutDir)/GStreamer.dll"
-				LinkIncremental="2"
+				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib"
+				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
+				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug;..\..\popt\lib;..\..\libxml2\lib"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\libxml2\lib"
 				IgnoreAllDefaultLibraries="FALSE"
-				ModuleDefinitionFile=""
+				ModuleDefinitionFile="gstreamer.def"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/GStreamer.pdb"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/GStreamer.lib"
+				OptimizeReferences="0"
+				EnableCOMDATFolding="0"
+				ImportLibrary="$(OutDir)/GStreamer-0.8.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
+copy $(ProjectDir)\gstversion.h $(ProjectDir)\..\gst\gstversion.h
+copy $(ProjectDir)\gstenumtypes.h $(ProjectDir)\..\gst\gstenumtypes.h
+copy $(ProjectDir)\gstenumtypes.c $(ProjectDir)\..\gst\gstenumtypes.c
+echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp
+$(ProjectDir)..\..\glib\gobject\glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
+move gstmarshal.h.tmp $(ProjectDir)..\gst\gstmarshal.h
+echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp
+echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp
+$(ProjectDir)..\..\glib\gobject\glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
+move gstmarshal.c.tmp $(ProjectDir)..\gst\gstmarshal.c
+bison -d -v -p_gst_parse__yy $(ProjectDir)..\gst\parse\grammar.y -o $(ProjectDir)..\gst\parse\grammar.tab.c
+flex -P_gst_parse_yy $(ProjectDir)..\gst\parse\parse.l
+move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
+"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@ -79,7 +96,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;GSTREAMER_EXPORTS;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GST_DISABLE_GST_DEBUG"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="config.h"
@ -91,25 +108,40 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib GThread.lib GModule.lib libxml2.lib libpopt.lib wsock32.lib"
-				OutputFile="$(OutDir)/GStreamer.dll"
+				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib"
+				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release;..\..\popt\lib;..\..\libxml2\lib"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\libxml2\lib"
 				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile=""
+				ModuleDefinitionFile="gstreamer.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/GStreamer.lib"
+				ImportLibrary="$(OutDir)/GStreamer-0.8.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
+copy $(ProjectDir)\gstversion.h $(ProjectDir)\..\gst\gstversion.h
+copy $(ProjectDir)\gstenumtypes.h $(ProjectDir)\..\gst\gstenumtypes.h
+copy $(ProjectDir)\gstenumtypes.c $(ProjectDir)\..\gst\gstenumtypes.c
+echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp
+$(ProjectDir)..\..\glib\gobject\glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
+move gstmarshal.h.tmp $(ProjectDir)..\gst\gstmarshal.h
+echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp
+echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp
+$(ProjectDir)..\..\glib\gobject\glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
+move gstmarshal.c.tmp $(ProjectDir)..\gst\gstmarshal.c
+bison -d -v -p_gst_parse__yy $(ProjectDir)..\gst\parse\grammar.y -o $(ProjectDir)..\gst\parse\grammar.tab.c
+flex -P_gst_parse_yy $(ProjectDir)..\gst\parse\parse.l
+move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
+"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@ -321,6 +353,12 @@
 			<File
 				RelativePath="..\gst\gstpad.h">
 			</File>
+			<File
+				RelativePath="..\gst\gstplugin.h">
+			</File>
+			<File
+				RelativePath="..\gst\gstscheduler.h">
+			</File>
 			<File
 				RelativePath="..\gst\gsttrace.h">
 			</File>
--- a/win32/vs7/Makefile
+++ b/win32/vs7/Makefile
@ -4,32 +4,61 @@
 # Uses the Free Visual C++ 2003 compiler from Microsoft
 # http://msdn.microsoft.com/visualc/vctoolkit2003/

-# Compile with debug information? IMPOSSIBLE with the free version of the compiler
-#DEBUG = yes
+# Compile with debug information ? IMPOSSIBLE with the free version of the compiler
+DEBUG = no

+# Link with MSVCRT as a DLL ? IMPOSSIBLE with the free version of the compiler
+MSVCRT = yes
+
+SRC_DIR=..\gst
+GLIB_DIR=..\..\glib

 #
 # Don't change anything below this line.
 #
 CXX  = cl /Tp
 CC   = cl /Tc
-SRC  = dirent.c ../gst/parse/grammar.tab.c ../gst/gst.c ../gst/gstatomic.c ../gst/gstbin.c ../gst/gstbuffer.c ..\gst\gstcaps.c ..\gst\gstclock.c ..\gst\gstcpu.c ..\gst\gstdata.c ..\gst\gstelement.c ..\gst\gstelementfactory.c ..\gst\gstenumtypes.c ..\gst\gsterror.c ..\gst\gstevent.c ..\gst\gstfilter.c ..\gst\gstformat.c ..\gst\gstindex.c ..\gst\gstinfo.c ..\gst\gstmarshal.c ..\gst\gstmemchunk.c ..\gst\gstobject.c ..\gst\gstpad.c ..\gst\gstparse.c ..\gst\gstpipeline.c ..\gst\gstplugin.c ..\gst\gstpluginfeature.c ..\gst\gstprobe.c ..\gst\gstquery.c ..\gst\gstqueue.c ..\gst\gstregistry.c ..\gst\gstregistrypool.c ..\gst\gstscheduler.c ..\gst\gststructure.c ..\gst\gstsystemclock.c ..\gst\gsttag.c ..\gst\gstthread.c ..\gst\gsttrace.c ..\gst\gsttypefind.c ..\gst\gsturi.c ..\gst\gsturitype.c ..\gst\gstutils.c ..\gst\gstvalue.c ..\gst\gstxml.c ..\gst\registries\gstxmlregistry.c ..\gst\parse\lex._gst_parse_yy.c
+SRC  = dirent.c $(SRC_DIR)\parse\grammar.tab.c $(SRC_DIR)\gst.c $(SRC_DIR)\gstatomic.c $(SRC_DIR)\gstbin.c $(SRC_DIR)\gstbuffer.c \
+$(SRC_DIR)\gstcaps.c $(SRC_DIR)\gstclock.c $(SRC_DIR)\gstcpu.c $(SRC_DIR)\gstdata.c $(SRC_DIR)\gstelement.c $(SRC_DIR)\gstelementfactory.c \
+$(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gsterror.c $(SRC_DIR)\gstevent.c $(SRC_DIR)\gstfilter.c $(SRC_DIR)\gstformat.c $(SRC_DIR)\gstindex.c \
+$(SRC_DIR)\gstinfo.c $(SRC_DIR)\gstmarshal.c $(SRC_DIR)\gstmemchunk.c $(SRC_DIR)\gstobject.c $(SRC_DIR)\gstpad.c $(SRC_DIR)\gstparse.c \
+$(SRC_DIR)\gstpipeline.c $(SRC_DIR)\gstplugin.c $(SRC_DIR)\gstpluginfeature.c $(SRC_DIR)\gstprobe.c $(SRC_DIR)\gstquery.c $(SRC_DIR)\gstqueue.c \
+$(SRC_DIR)\gstregistry.c $(SRC_DIR)\gstregistrypool.c $(SRC_DIR)\gstscheduler.c $(SRC_DIR)\gststructure.c $(SRC_DIR)\gstsystemclock.c \
+$(SRC_DIR)\gsttag.c $(SRC_DIR)\gstthread.c $(SRC_DIR)\gsttrace.c $(SRC_DIR)\gsttypefind.c $(SRC_DIR)\gsturi.c $(SRC_DIR)\gsturitype.c \
+$(SRC_DIR)\gstutils.c $(SRC_DIR)\gstvalue.c $(SRC_DIR)\gstxml.c $(SRC_DIR)\registries\gstxmlregistry.c $(SRC_DIR)\parse\lex._gst_parse_yy.c \
+$(SRC_DIR)\..\libs\gst\control\control.c $(SRC_DIR)\..\libs\gst\control\unitconvert.c $(SRC_DIR)\..\libs\gst\control\dparammanager.c \
+$(SRC_DIR)\..\libs\gst\control\dparam.c
 OBJ  = $(patsubst %.c,%.obj,$(SRC))
-INCS = /I. /I.. /I../libs /I../../popt/include /I../../glib/gmodule /I../../libiconv/include /I../../libxml2/include/libxml2 /I../../glib /I../../glib/glib /I../../glib/build/win32
-LDFLAGS = /NOLOGO /DLL /MAP:gstreamer.map /LIBPATH:../../glib/win32 /LIBPATH:../../popt/lib /LIBPATH:../../libxml2/lib
+INCS = /I. /I.. /I../libs /I../../popt/include /I../../libiconv/include /I../../libxml2/include/libxml2 /I$(GLIB_DIR) /I$(GLIB_DIR)\glib /I$(GLIB_DIR)\gmodule /I$(GLIB_DIR)\build\win32
+LDFLAGS = /NOLOGO /DLL /IMPLIB:gstreamer-0.8.lib /MAP:gstreamer.map /LIBPATH:$(GLIB_DIR)/glib /LIBPATH:$(GLIB_DIR)/gobject /LIBPATH:$(GLIB_DIR)/gmodule /LIBPATH:$(GLIB_DIR)/gthread /LIBPATH:../../popt/lib /LIBPATH:../../libxml2/lib
 OPTMIZ = /G6 /O2 /Oi /Wp64 /GL
-CXXFLAGS = $(INCS) /DWIN32 /D_WINDOWS /D_USRDLL /DHAVE_CONFIG_H /DGSTREAMER_EXPORTS /nologo
+CXXFLAGS = $(INCS) /DWIN32 /D_WINDOWS /DHAVE_CONFIG_H /D_USRDLL /DHAVE_WIN32 /nologo


+HEADERS = $(SRC_DIR)\gstversion.h $(SRC_DIR)\gstconfig.h $(SRC_DIR)\gstenumtypes.h $(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gstmarshal.h
+
 ifeq (yes,$(DEBUG))
-CXXFLAGS += /Zi /DDEBUG /D_DEBUG /MTd /RTC1
-LDFLAGS += /DEBUG
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MDd
 else
-CXXFLAGS += /MT /DGST_DISABLE_GST_DEBUG
+ CXXFLAGS += /MTd
+endif
+CXXFLAGS += /Zi /DDEBUG /D_DEBUG /RTC1
+LDFLAGS += /DEBUG
+
+else
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MD
+else
+ CXXFLAGS += /MT
+endif
+CXXFLAGS += /DGST_DISABLE_GST_DEBUG
 LDFLAGS += /OPT:REF
 endif

-LIBS = libgstreamer.dll
+LIBS = libgstreamer-0.8.dll

 .PHONY: all all-before all-after clean clean-custom

@ -40,14 +69,50 @@ LIBS = libgstreamer.dll
 	$(CC) $< /c $(CXXFLAGS) /Fo$@

 all: lib
+	make -f Makefile.inspect
+	make -f Makefile.launch
+	make -f Makefile.register

 lib: $(LIBS)

 clean:
-	$(RM) $(OBJ) libgstreamer.lib libgstreamer.dll
+	make -f Makefile.inspect  clean
+	make -f Makefile.launch   clean
+	make -f Makefile.register clean
+	$(RM) $(OBJ) $(HEADERS) gstreamer-0.8.lib libgstreamer-0.8.dll gstreamer.map gstreamer-0.8.exp

-libgstreamer.dll: $(OBJ) $(SRC)
-	link $(LDFLAGS) /OUT:$@ $(OBJ) libglib-2.0.lib libgobject-2.0.lib libgthread-2.0.lib libgmodule-2.0.lib libxml2.lib libpopt.lib wsock32.lib
+libgstreamer-0.8.dll: $(HEADERS) $(OBJ)
+	link $(LDFLAGS) /OUT:$@ $(OBJ) /DEF:gstreamer.def glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib libpopt.lib wsock32.lib
+
+
+$(SRC_DIR)\gstversion.h: gstversion.h
+	copy $< $@
+
+$(SRC_DIR)\gstconfig.h: gstconfig.h
+	copy $< $@
+
+$(SRC_DIR)\gstenumtypes.c: gstenumtypes.c
+	copy $< $@
+
+$(SRC_DIR)\gstenumtypes.h: gstenumtypes.h
+	copy $< $@
+
+
+$(SRC_DIR)\gstmarshal.h:
+	echo #include "gst/gstconfig.h"              > $(SRC_DIR)\gstmarshal.h
+	$(GLIB_DIR)\gobject\glib-genmarshal --header --prefix=gst_marshal $(SRC_DIR)/gstmarshal.list >> $(SRC_DIR)/gstmarshal.h
+$(SRC_DIR)\gstmarshal.c:
+	echo #include "glib-object.h" > $(SRC_DIR)\gstmarshal.c
+	echo #include "gstmarshal.h" >> $(SRC_DIR)\gstmarshal.c
+	$(GLIB_DIR)\gobject\glib-genmarshal --body --prefix=gst_marshal $(SRC_DIR)/gstmarshal.list >> $(SRC_DIR)/gstmarshal.c
+
+# generated sources, otherwise you should get these files from somewhere else
+$(SRC_DIR)\parse\grammar.tab.c:
+	bison -d -v -p_gst_parse__yy $(SRC_DIR)\parse\grammar.y -o $(SRC_DIR)\parse\grammar.tab.c
+
+$(SRC_DIR)\parse\lex._gst_parse_yy.c:
+	flex -P_gst_parse_yy $(SRC_DIR)\parse\parse.l
+	copy lex._gst_parse_yy.c $(SRC_DIR)\parse\lex._gst_parse_yy.c

 depend:
 	$(CXX) $(CXXFLAGS) -MM $(SRC) > .depend
--- a/win32/vs7/Makefile.inspect
+++ b/win32/vs7/Makefile.inspect
@ -0,0 +1,77 @@
+# Project: libgstreamer
+# Makefile to use with GNU Make
+#
+# Uses the Free Visual C++ 2003 compiler from Microsoft
+# http://msdn.microsoft.com/visualc/vctoolkit2003/
+
+# Compile with debug information ? IMPOSSIBLE with the free version of the compiler
+#DEBUG = yes
+
+# Link with MSVCRT as a DLL ? IMPOSSIBLE with the free version of the compiler
+MSVCRT = yes
+
+SRC_DIR=..\tools
+GLIB_DIR=..\..\glib
+
+#
+# Don't change anything below this line.
+#
+CXX  = cl /Tp
+CC   = cl /Tc
+SRC  = $(SRC_DIR)\gst-inspect.obj
+OBJ  = $(patsubst %.c,%.obj,$(SRC))
+INCS = /I. /I.. /I../libs /I../../popt/include /I../../libiconv/include /I../../libxml2/include/libxml2 /I$(GLIB_DIR) /I$(GLIB_DIR)\glib /I$(GLIB_DIR)\gmodule /I$(GLIB_DIR)\build\win32
+LDFLAGS = /NOLOGO /DLL /IMPLIB:gstreamer-0.8.lib /MAP:gst-inspect.map /LIBPATH:$(GLIB_DIR)/glib /LIBPATH:$(GLIB_DIR)/gobject /LIBPATH:$(GLIB_DIR)/gmodule /LIBPATH:$(GLIB_DIR)/gthread /LIBPATH:../../popt/lib /LIBPATH:../../libxml2/lib
+OPTMIZ = /G6 /O2 /Oi /Wp64 /GL
+CXXFLAGS = $(INCS) /DWIN32 /D_WINDOWS /DHAVE_CONFIG_H /D_USRDLL /DHAVE_WIN32 /nologo
+
+
+HEADERS = $(SRC_DIR)\gstconfig.h $(SRC_DIR)\gstenumtypes.h $(SRC_DIR)\gstversion.h $(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gstmarshal.h
+
+ifeq (yes,$(DEBUG))
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MDd
+else
+ CXXFLAGS += /MTd
+endif
+CXXFLAGS += /Zi /DDEBUG /D_DEBUG /RTC1
+LDFLAGS += /DEBUG
+
+else
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MD
+else
+ CXXFLAGS += /MT
+endif
+CXXFLAGS += /DGST_DISABLE_GST_DEBUG
+LDFLAGS += /OPT:REF
+endif
+
+.PHONY: all all-before all-after clean clean-custom
+
+%.obj : %.cpp
+	$(CXX) $< /c $(CXXFLAGS) /Fo$@
+
+%.obj : %.c
+	$(CC) $< /c $(CXXFLAGS) /Fo$@
+
+all: gst-inspect.exe
+
+clean:
+	$(RM) gst-inspect.*
+
+gst-inspect.exe:
+	$(CC) $(SRC_DIR)\gst-inspect.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib
+	
+
+depend:
+	$(CXX) $(CXXFLAGS) -MM $(SRC) > .depend
+
+#
+# include dependency files if they exist
+#
+ifneq ($(wildcard .depend),)
+include .depend
+endif
--- a/win32/vs7/Makefile.launch
+++ b/win32/vs7/Makefile.launch
@ -0,0 +1,77 @@
+# Project: libgstreamer
+# Makefile to use with GNU Make
+#
+# Uses the Free Visual C++ 2003 compiler from Microsoft
+# http://msdn.microsoft.com/visualc/vctoolkit2003/
+
+# Compile with debug information ? IMPOSSIBLE with the free version of the compiler
+#DEBUG = yes
+
+# Link with MSVCRT as a DLL ? IMPOSSIBLE with the free version of the compiler
+MSVCRT = yes
+
+SRC_DIR=..\tools
+GLIB_DIR=..\..\glib
+
+#
+# Don't change anything below this line.
+#
+CXX  = cl /Tp
+CC   = cl /Tc
+SRC  = $(SRC_DIR)\gst-launch.obj
+OBJ  = $(patsubst %.c,%.obj,$(SRC))
+INCS = /I. /I.. /I../libs /I../../popt/include /I../../libiconv/include /I../../libxml2/include/libxml2 /I$(GLIB_DIR) /I$(GLIB_DIR)\glib /I$(GLIB_DIR)\gmodule /I$(GLIB_DIR)\build\win32
+LDFLAGS = /NOLOGO /DLL /IMPLIB:gstreamer-0.8.lib /MAP:gst-launch.map /LIBPATH:$(GLIB_DIR)/glib /LIBPATH:$(GLIB_DIR)/gobject /LIBPATH:$(GLIB_DIR)/gmodule /LIBPATH:$(GLIB_DIR)/gthread /LIBPATH:../../popt/lib /LIBPATH:../../libxml2/lib
+OPTMIZ = /G6 /O2 /Oi /Wp64 /GL
+CXXFLAGS = $(INCS) /DWIN32 /D_WINDOWS /DHAVE_CONFIG_H /D_USRDLL /DHAVE_WIN32 /nologo
+
+
+HEADERS = $(SRC_DIR)\gstconfig.h $(SRC_DIR)\gstenumtypes.h $(SRC_DIR)\gstversion.h $(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gstmarshal.h
+
+ifeq (yes,$(DEBUG))
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MDd
+else
+ CXXFLAGS += /MTd
+endif
+CXXFLAGS += /Zi /DDEBUG /D_DEBUG /RTC1
+LDFLAGS += /DEBUG
+
+else
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MD
+else
+ CXXFLAGS += /MT
+endif
+CXXFLAGS += /DGST_DISABLE_GST_DEBUG
+LDFLAGS += /OPT:REF
+endif
+
+.PHONY: all all-before all-after clean clean-custom
+
+%.obj : %.cpp
+	$(CXX) $< /c $(CXXFLAGS) /Fo$@
+
+%.obj : %.c
+	$(CC) $< /c $(CXXFLAGS) /Fo$@
+
+all: gst-launch.exe
+
+clean:
+	$(RM) gst-launch.*
+
+gst-launch.exe:
+	$(CC) $(SRC_DIR)\gst-launch.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib
+	
+
+depend:
+	$(CXX) $(CXXFLAGS) -MM $(SRC) > .depend
+
+#
+# include dependency files if they exist
+#
+ifneq ($(wildcard .depend),)
+include .depend
+endif
--- a/win32/vs7/Makefile.register
+++ b/win32/vs7/Makefile.register
@ -0,0 +1,77 @@
+# Project: libgstreamer
+# Makefile to use with GNU Make
+#
+# Uses the Free Visual C++ 2003 compiler from Microsoft
+# http://msdn.microsoft.com/visualc/vctoolkit2003/
+
+# Compile with debug information ? IMPOSSIBLE with the free version of the compiler
+#DEBUG = yes
+
+# Link with MSVCRT as a DLL ? IMPOSSIBLE with the free version of the compiler
+MSVCRT = yes
+
+SRC_DIR=..\tools
+GLIB_DIR=..\..\glib
+
+#
+# Don't change anything below this line.
+#
+CXX  = cl /Tp
+CC   = cl /Tc
+SRC  = $(SRC_DIR)\gst-register.obj
+OBJ  = $(patsubst %.c,%.obj,$(SRC))
+INCS = /I. /I.. /I../libs /I../../popt/include /I../../libiconv/include /I../../libxml2/include/libxml2 /I$(GLIB_DIR) /I$(GLIB_DIR)\glib /I$(GLIB_DIR)\gmodule /I$(GLIB_DIR)\build\win32
+LDFLAGS = /NOLOGO /DLL /IMPLIB:gstreamer-0.8.lib /MAP:gst-register.map /LIBPATH:$(GLIB_DIR)/glib /LIBPATH:$(GLIB_DIR)/gobject /LIBPATH:$(GLIB_DIR)/gmodule /LIBPATH:$(GLIB_DIR)/gthread /LIBPATH:../../popt/lib /LIBPATH:../../libxml2/lib
+OPTMIZ = /G6 /O2 /Oi /Wp64 /GL
+CXXFLAGS = $(INCS) /DWIN32 /D_WINDOWS /DHAVE_CONFIG_H /D_USRDLL /DHAVE_WIN32 /nologo
+
+
+HEADERS = $(SRC_DIR)\gstconfig.h $(SRC_DIR)\gstenumtypes.h $(SRC_DIR)\gstversion.h $(SRC_DIR)\gstenumtypes.c $(SRC_DIR)\gstmarshal.h
+
+ifeq (yes,$(DEBUG))
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MDd
+else
+ CXXFLAGS += /MTd
+endif
+CXXFLAGS += /Zi /DDEBUG /D_DEBUG /RTC1
+LDFLAGS += /DEBUG
+
+else
+
+ifeq (yes,$(MSVCRT))
+ CXXFLAGS += /MD
+else
+ CXXFLAGS += /MT
+endif
+CXXFLAGS += /DGST_DISABLE_GST_DEBUG
+LDFLAGS += /OPT:REF
+endif
+
+.PHONY: all all-before all-after clean clean-custom
+
+%.obj : %.cpp
+	$(CXX) $< /c $(CXXFLAGS) /Fo$@
+
+%.obj : %.c
+	$(CC) $< /c $(CXXFLAGS) /Fo$@
+
+all: gst-register.exe
+
+clean:
+	$(RM) gst-register.*
+
+gst-register.exe:
+	$(CC) $(SRC_DIR)\gst-register.c $(CXXFLAGS) gstreamer-0.8.lib $(GLIB_DIR)/glib/glib-2.0.lib $(GLIB_DIR)/gobject/gobject-2.0.lib
+	
+
+depend:
+	$(CXX) $(CXXFLAGS) -MM $(SRC) > .depend
+
+#
+# include dependency files if they exist
+#
+ifneq ($(wildcard .depend),)
+include .depend
+endif
--- a/win32/vs7/README.txt
+++ b/win32/vs7/README.txt
@ -0,0 +1,41 @@
+There are different makefiles that can be used to build GStreamer with the usual Microsoft 
+compiling tools.
+
+The Makefile is meant to be used with the GNU make program and the free 
+version of the Microsoft compiler (http://msdn.microsoft.com/visualc/vctoolkit2003/). You also 
+have to modify your system environment variables to use it from the command-line. You will also 
+need a working Platform SDK for Windows that is available for free from Microsoft.
+
+The projects/makefiles will generate automatically some source files needed to compile 
+GStreamer. That requires that you have installed on your system some GNU tools and that they are 
+available in your system PATH.
+
+The GStreamer project depends on other libraries, namely :
+- GLib
+- libpopt
+- libxml
+- libintl
+- libiconv
+
+The sources should be organised in folders as follow :
+$(PROJECT_DIR)\glib
+$(PROJECT_DIR)\gstreamer (this package)
+$(PROJECT_DIR)\libiconv
+$(PROJECT_DIR)\libintl
+$(PROJECT_DIR)\libxml2
+$(PROJECT_DIR)\popt
+
+NOTE : you can find Win32 versions of these libraries on http://gnuwin32.sourceforge.net/ 
+You will need the Binaries and Developer files for each package.
+
+NOTE : GLib can be found on ftp://ftp.gtk.org/pub/gtk/v2.4/ and should be compiled from the 
+sources
+
+NOTE : GNU tools needed that you can find on http://gnuwin32.sourceforge.net/
+- GNU flex      (tested with 2.5.4)
+- GNU bison     (tested with 1.35)
+and http://www.mingw.org/
+- GNU make      (tested with 3.80)
+
+NOTE : the generated files from the -auto makefiles will be available soon separately on the net 
+for convenience (people who don't want to install GNU tools).
--- a/win32/vs7/gst-inspect.vcproj
+++ b/win32/vs7/gst-inspect.vcproj
@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="gst-inspect"
-	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}"
 	RootNamespace="gst-inspect"
 	Keyword="Win32Proj">
 	<Platforms>
@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
+				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-inspect.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-inspect.pdb"
@ -73,7 +73,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
+				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-inspect.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/win32/vs7/gst-launch.vcproj
+++ b/win32/vs7/gst-launch.vcproj
@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="gst-launch"
-	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}"
 	RootNamespace="gst-launch"
 	Keyword="Win32Proj">
 	<Platforms>
@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-launch.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-launch.pdb"
@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-launch.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/win32/vs7/gst-register.vcproj
+++ b/win32/vs7/gst-register.vcproj
@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-register.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-register.pdb"
@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gst-register.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/win32/vs7/gstelements.vcproj
+++ b/win32/vs7/gstelements.vcproj
@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="gstelements"
-	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+	ProjectGUID="{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}"
 	RootNamespace="gstelements"
 	Keyword="Win32Proj">
 	<Platforms>
@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Debug"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gstelements.def"
 				GenerateDebugInformation="TRUE"
@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="GLib.lib GObject.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\win32\Release"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
 				ModuleDefinitionFile="gstelements.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
@ -158,9 +158,6 @@
 			<File
 				RelativePath="..\gst\elements\gstmd5sink.c">
 			</File>
-			<File
-				RelativePath="..\gst\elements\gstmultidisksrc.c">
-			</File>
 			<File
 				RelativePath="..\gst\elements\gstshaper.c">
 			</File>
--- a/win32/vs7/gstreamer.def
+++ b/win32/vs7/gstreamer.def
@ -0,0 +1,190 @@
+EXPORTS
+	gst_init
+        gst_registry_pool_find_plugin
+        gst_uri_handler_get_type
+        gst_registry_pool_find_plugin
+        gst_uri_handler_get_type
+        gst_type_find_factory_get_type
+        gst_index_factory_get_type
+        gst_registry_pool_find_feature
+        gst_scheduler_factory_get_type
+        gst_element_factory_find
+        gst_control_init
+        gst_init_with_popt_table
+        gst_bin_get_list
+        gst_dpman_list_dparam_specs
+        gst_dpman_get_manager
+        gst_pad_get_internal_links_default
+        gst_pad_get_query_types
+        gst_pad_get_query_types_default
+        gst_pad_query_default
+        gst_pad_get_event_masks
+        gst_pad_get_event_masks_default
+        gst_pad_event_default
+        gst_pad_convert_default
+        gst_pad_get_formats
+        gst_pad_get_formats_default
+        _gst_ghost_pad_type
+        gst_pad_get_name
+        gst_pad_get_direction
+        _gst_real_pad_type
+        _gst_pad_type
+        gst_element_get_pad_list
+        gst_element_is_indexable
+        gst_element_get_clock
+        gst_element_provides_clock
+        gst_element_requires_clock
+        _gst_bin_type
+        gst_plugin_feature_get_type
+        _gst_element_type
+        _gst_object_type
+        gst_element_factory_create
+        gst_structure_foreach
+        gst_structure_get_name
+        gst_caps_get_structure
+        gst_caps_get_size
+        gst_caps_is_empty
+        gst_caps_is_any
+        gst_value_serialize
+        gst_format_get_details
+        gst_query_type_get_details
+        gst_value_get_caps
+        gst_caps_get_type
+        gst_uri_get_uri_type
+        gst_plugin_feature_get_name
+        gst_element_factory_get_type
+        gst_plugin_get_feature_list
+        gst_registry_pool_plugin_list
+        gst_object_get_name
+        gst_main_quit
+        gst_bin_iterate
+        gst_object_unref
+        gst_element_wait_state_change
+        gst_main
+        gst_bin_get_clock
+        gst_element_set_state
+        gst_bin_add
+        gst_element_factory_make
+        gst_xml_write_file
+        gst_element_default_error
+        gst_object_default_deep_notify
+        gst_parse_launchv
+        gst_alloc_trace_print_all
+        gst_alloc_trace_available
+        gst_alloc_trace_set_flags_all
+        gst_util_set_object_arg
+        gst_bin_get_by_name
+        gst_xml_get_topelements
+        gst_xml_parse_file
+        gst_xml_new
+        gst_tag_list_foreach
+        gst_tag_get_nick
+        gst_tag_list_get_value_index
+        gst_tag_list_get_string_index
+        gst_tag_get_type
+        gst_tag_list_get_tag_size
+        gst_registry_get_path_list      
+        gst_registry_load
+        gst_registry_save
+        gst_registry_rebuild
+        gst_registry_add_path
+        gst_registry_get_type
+        gst_registry_pool_list
+        _gst_registry_auto_load
+        gst_data_unref
+        gst_buffer_new
+        gst_buffer_create_sub
+        gst_buffer_merge
+        gst_buffer_is_span_fast
+        _gst_event_type
+        gst_pad_pull
+        gst_pad_send_event
+        gst_event_new_seek
+        gst_pad_query
+        gst_event_new_size
+        gst_element_class_set_details
+        gst_element_class_add_pad_template
+        gst_static_pad_template_get
+        gst_element_add_pad
+        gst_pad_set_getcaps_function
+        gst_pad_proxy_getcaps
+        gst_pad_new
+        gst_pad_set_chain_function
+        gst_pad_new_from_template
+        gst_pad_set_get_function
+        gst_element_set_loop_function
+        gst_pad_push
+        gst_pad_get_parent
+        gst_buffer_get_type
+        gst_data_ref
+        gst_buffer_new_and_alloc
+        gst_element_register
+        gst_util_dump_mem
+        gst_element_wait
+        gst_element_set_time
+        gst_element_error_full
+        gst_core_error_quark
+        _gst_element_error_printf
+        gst_pad_set_formats_function
+        gst_pad_set_query_type_function
+        gst_pad_set_query_function
+        gst_pad_set_event_mask_function
+        gst_pad_set_event_function
+        gst_element_set_eos
+        gst_event_new
+        gst_resource_error_quark
+        gst_uri_construct
+        gst_event_discont_get_value
+        gst_uri_get_location
+        gst_uri_get_protocol
+        gst_uri_handler_new_uri
+        gst_event_new_discontinuous
+        gst_pad_set_link_function
+        gst_pad_proxy_pad_link
+        gst_pad_set_element_private
+        gst_pad_set_internal_link_function
+        gst_caps_new_any
+        gst_pad_get_caps
+        gst_pad_get_element_private
+        gst_pad_try_set_caps
+        gst_pad_get_negotiated_caps
+        gst_data_ref_by_count
+        gst_pad_set_explicit_caps
+        gst_caps_copy
+        gst_pad_use_explicit_caps
+        gst_stream_error_quark
+        gst_type_find_factory_call_function
+        gst_type_find_factory_get_list
+        gst_caps_free
+        gst_element_get_state
+        gst_caps_replace
+        gst_pad_collectv
+        gst_atomic_int_read
+        gst_pad_set_active
+        gst_scheduler_get_type
+        gst_plugin_add_feature
+        gst_scheduler_factory_new
+        gst_pad_call_get_function
+        gst_object_ref
+        gst_pad_call_chain_function
+        gst_caps_intersect
+        gst_pad_template_get_type
+        gst_pad_template_get_caps
+        gst_element_add_ghost_pad
+        gst_registry_pool_feature_list
+        gst_object_replace
+        gst_pad_unlink
+        gst_pad_link
+        gst_bin_remove
+        gst_element_get_pad_template_list
+        gst_element_sync_state_with_parent
+        gst_element_link
+        gst_element_factory_get_element_type
+        gst_pad_get_allowed_caps
+        gst_element_interrupt
+        gst_seek_type_get_type
+        gst_event_type_get_type
+        gst_pad_unnegotiate
+        gst_marshal_VOID__UINT_BOXED
+        gst_marshal_BOOLEAN__POINTER
+        gst_marshal_VOID__POINTER_OBJECT
--- a/win32/vs7/msvc71.sln
+++ b/win32/vs7/msvc71.sln
@ -1,76 +1,41 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GStreamer", "GStreamer.vcproj", "{FC47A187-6B10-4B19-93B5-ED7BCC75D466}"
-	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLib", "..\..\glib\win32\GLib-msvc71.vcproj", "{54A61913-7439-41EF-BB66-45401FFBB9F7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstreamer", "GStreamer.vcproj", "{FC47A187-6B10-4B19-93B5-ED7BCC75D466}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GObject", "..\..\glib\win32\GObject-msvc71.vcproj", "{54A61913-7439-41EF-BB66-45401FFBB9F7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-launch", "gst-launch.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}"
 	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GModule", "..\..\glib\win32\GModule-msvc71.vcproj", "{54A61913-7439-41EF-BB66-45401FFBB9F7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GThread", "..\..\glib\win32\GThread-msvc71.vcproj", "{54A61913-7439-41EF-BB66-45401FFBB9F7}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-launch", "gst-launch.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-register", "gst-register.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
 	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-inspect", "gst-inspect.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstelements", "gstelements.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
-		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstoptimalscheduler", "gstoptimalscheduler.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-inspect", "gst-inspect.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstspider", "gstspider.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstelements", "gstelements.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstbytestream", "gstbytestream.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstoptimalscheduler", "gstoptimalscheduler.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7B}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-marshal", "..\..\glib\win32\glib-marshal-msvc71.vcproj", "{D009C213-89B9-4FFD-9C02-690E99996A28}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstspider", "gstspider.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{54A61913-7439-41EF-BB66-45401FFBB9F7} = {54A61913-7439-41EF-BB66-45401FFBB9F7}
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstbytestream", "gstbytestream.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
 Global
@ -79,58 +44,38 @@ Global
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB70}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7B}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7B}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7B}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7B}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7A}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7A}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7A}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7A}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7D}.Release.Build.0 = Release|Win32
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.ActiveCfg = Debug|Win32
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Debug.Build.0 = Debug|Win32
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.ActiveCfg = Release|Win32
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466}.Release.Build.0 = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.ActiveCfg = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.Build.0 = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.ActiveCfg = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.Build.0 = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.ActiveCfg = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.Build.0 = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.ActiveCfg = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.Build.0 = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.ActiveCfg = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.Build.0 = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.ActiveCfg = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.Build.0 = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.ActiveCfg = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Debug.Build.0 = Debug|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.ActiveCfg = Release|Win32
-		{54A61913-7439-41EF-BB66-45401FFBB9F7}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.ActiveCfg = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Debug.Build.0 = Debug|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.ActiveCfg = Release|Win32
-		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7E}.Release.Build.0 = Release|Win32
-		{D009C213-89B9-4FFD-9C02-690E99996A28}.Debug.ActiveCfg = Debug|Win32
-		{D009C213-89B9-4FFD-9C02-690E99996A28}.Debug.Build.0 = Debug|Win32
-		{D009C213-89B9-4FFD-9C02-690E99996A28}.Release.ActiveCfg = Release|Win32
-		{D009C213-89B9-4FFD-9C02-690E99996A28}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection