From 2871454788278a6dd97314fd819c563acc772c39 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <steve.lhomme@free.fr>
Date: Sat, 12 Jun 2004 11:31:49 +0000
Subject: [PATCH] More code in debug builds to have logging capabilities

Original commit message from CVS:
More code in debug builds to have logging capabilities
---
 ChangeLog                        |  1 +
 gst/gstconfig.h.in               | 10 ++++++++++
 win32/GStreamer.vcproj           | 34 ++++++++++++++++++++------------
 win32/Makefile                   | 15 +++++++++++---
 win32/gst-inspect.vcproj         |  2 +-
 win32/gst-launch.vcproj          |  2 +-
 win32/gst-register.vcproj        |  2 +-
 win32/gstbytestream.vcproj       |  6 +++---
 win32/gstelements.vcproj         | 14 ++++++-------
 win32/gstoptimalscheduler.vcproj |  6 +++---
 win32/gstreamer-dbg.def          |  5 +++++
 win32/gstspider.vcproj           | 14 ++++++-------
 win32/vs7/GStreamer.vcproj       | 34 ++++++++++++++++++++------------
 win32/vs7/Makefile               | 15 +++++++++++---
 win32/vs7/gst-inspect.vcproj     |  2 +-
 win32/vs7/gst-launch.vcproj      |  2 +-
 win32/vs7/gst-register.vcproj    |  2 +-
 win32/vs7/gstelements.vcproj     | 14 ++++++-------
 win32/vs7/gstreamer-dbg.def      |  5 +++++
 19 files changed, 120 insertions(+), 65 deletions(-)
 create mode 100644 win32/gstreamer-dbg.def
 create mode 100644 win32/vs7/gstreamer-dbg.def

diff --git a/ChangeLog b/ChangeLog
index 57e1890602..4f8f2b17c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
 
 	* gst/gst.c:
 	* gst/gstbin.*:
+	* gst/config.h.in:
 	* gst/gstelement.*:
 	* gst/gstevent.h:
 	* gst/gstobject.*:
diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
index a528d01962..054fd10201 100644
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
@@ -67,4 +67,14 @@
 # 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__ */
diff --git a/win32/GStreamer.vcproj b/win32/GStreamer.vcproj
index e256b12ce4..2b9c63ca6f 100644
--- a/win32/GStreamer.vcproj
+++ b/win32/GStreamer.vcproj
@@ -21,8 +21,8 @@
 			<Tool
 				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;HAVE_WIN32;GST_DISABLE_GST_DEBUG"
+				AdditionalIncludeDirectories="D:\Perso\Programmes\GStreamer\gstreamer\win32;.\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\gettext\include;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\build\win32"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GSTREAMER_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -36,13 +36,13 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib"
+				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
 				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
 				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\libxml2\lib"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\gettext\lib;..\..\libxml2\lib"
 				IgnoreAllDefaultLibraries="FALSE"
-				ModuleDefinitionFile="gstreamer.def"
+				ModuleDefinitionFile="gst.def"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/GStreamer.pdb"
@@ -54,7 +54,8 @@
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				CommandLine="del gst.def"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
@@ -71,6 +72,8 @@ 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
+type gstreamer.def &gt; gst.def
+type gstreamer-dbg.def &gt;&gt; gst.def
 "/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
@@ -95,8 +98,8 @@ move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
 			CharacterSet="2">
 			<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;HAVE_WIN32;GST_DISABLE_GST_DEBUG"
+				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\gettext\include;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\win32"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GST_DISABLE_GST_DEBUG;GSTREAMER_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="config.h"
@@ -108,13 +111,13 @@ move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib"
+				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
 				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\libxml2\lib"
-				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile="gstreamer.def"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\gettext\lib;..\..\libxml2\lib"
+				IgnoreAllDefaultLibraries="FALSE"
+				ModuleDefinitionFile="gst.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -124,7 +127,8 @@ move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				CommandLine="del gst.def"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
@@ -141,6 +145,7 @@ 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
+type gstreamer.def &gt; gst.def
 "/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
@@ -255,6 +260,9 @@ move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
 			<File
 				RelativePath="..\gst\gstqueue.c">
 			</File>
+			<File
+				RelativePath=".\gstreamer.def">
+			</File>
 			<File
 				RelativePath="..\gst\gstregistry.c">
 			</File>
diff --git a/win32/Makefile b/win32/Makefile
index 236d1085af..bf802dd38a 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -79,12 +79,21 @@ clean:
 	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 lex._gst_parse_yy.c
+	$(RM) $(OBJ) $(HEADERS) gstreamer-0.8.lib libgstreamer-0.8.dll gstreamer.map gstreamer-0.8.exp lex._gst_parse_yy.c gst.def
 
-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
+libgstreamer-0.8.dll: gst.def $(HEADERS) $(OBJ)
+	link $(LDFLAGS) /OUT:$@ $(OBJ) /DEF:gst.def glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib libpopt.lib wsock32.lib
 
 
+ifeq (yes,$(DEBUG))
+gst.def:
+	type gstreamer.def > gst.def
+	type gstreamer-dbg.def >> gst.def
+else
+gst.def:
+	type gstreamer.def > gst.def
+endif
+
 $(SRC_DIR)\gstversion.h: gstversion.h
 	copy $< $@
 
diff --git a/win32/gst-inspect.vcproj b/win32/gst-inspect.vcproj
index e6985fb6fe..65cb2df035 100644
--- a/win32/gst-inspect.vcproj
+++ b/win32/gst-inspect.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/win32/gst-launch.vcproj b/win32/gst-launch.vcproj
index 626e1f7070..c1a91aa201 100644
--- a/win32/gst-launch.vcproj
+++ b/win32/gst-launch.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/win32/gst-register.vcproj b/win32/gst-register.vcproj
index 56b537bf29..90aac86044 100644
--- a/win32/gst-register.vcproj
+++ b/win32/gst-register.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/win32/gstbytestream.vcproj b/win32/gstbytestream.vcproj
index 93fbf5c51b..71267ca4fd 100644
--- a/win32/gstbytestream.vcproj
+++ b/win32/gstbytestream.vcproj
@@ -20,8 +20,8 @@
 			<Tool
 				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;HAVE_WIN32"
+				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -73,7 +73,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
+				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/win32/gstelements.vcproj b/win32/gstelements.vcproj
index 4215b9cba8..8cb3e07408 100644
--- a/win32/gstelements.vcproj
+++ b/win32/gstelements.vcproj
@@ -20,8 +20,8 @@
 			<Tool
 				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;HAVE_WIN32"
+				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib"
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gstelements.def"
 				GenerateDebugInformation="TRUE"
@@ -73,7 +73,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
+				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib"
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
 				ModuleDefinitionFile="gstelements.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
diff --git a/win32/gstoptimalscheduler.vcproj b/win32/gstoptimalscheduler.vcproj
index 228488a0e3..0eb085254b 100644
--- a/win32/gstoptimalscheduler.vcproj
+++ b/win32/gstoptimalscheduler.vcproj
@@ -20,8 +20,8 @@
 			<Tool
 				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;HAVE_WIN32"
+				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -73,7 +73,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
+				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/win32/gstreamer-dbg.def b/win32/gstreamer-dbg.def
new file mode 100644
index 0000000000..4c7c9a0384
--- /dev/null
+++ b/win32/gstreamer-dbg.def
@@ -0,0 +1,5 @@
+        GST_CAT_DEFAULT
+        _gst_debug_register_funcptr
+        _gst_debug_nameof_funcptr
+        _gst_debug_category_new
+        gst_debug_log_valist
diff --git a/win32/gstspider.vcproj b/win32/gstspider.vcproj
index ca60bfe541..936b54c863 100644
--- a/win32/gstspider.vcproj
+++ b/win32/gstspider.vcproj
@@ -20,8 +20,8 @@
 			<Tool
 				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;HAVE_WIN32"
+				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib"
 				OutputFile="$(OutDir)/gstspider.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gstspider.def"
 				GenerateDebugInformation="TRUE"
@@ -73,7 +73,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
+				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib"
 				OutputFile="$(OutDir)/gstspider.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
 				ModuleDefinitionFile="gstspider.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
diff --git a/win32/vs7/GStreamer.vcproj b/win32/vs7/GStreamer.vcproj
index e256b12ce4..2b9c63ca6f 100644
--- a/win32/vs7/GStreamer.vcproj
+++ b/win32/vs7/GStreamer.vcproj
@@ -21,8 +21,8 @@
 			<Tool
 				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;HAVE_WIN32;GST_DISABLE_GST_DEBUG"
+				AdditionalIncludeDirectories="D:\Perso\Programmes\GStreamer\gstreamer\win32;.\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\gettext\include;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\build\win32"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GSTREAMER_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -36,13 +36,13 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib"
+				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
 				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
 				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\libxml2\lib"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\gettext\lib;..\..\libxml2\lib"
 				IgnoreAllDefaultLibraries="FALSE"
-				ModuleDefinitionFile="gstreamer.def"
+				ModuleDefinitionFile="gst.def"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/GStreamer.pdb"
@@ -54,7 +54,8 @@
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				CommandLine="del gst.def"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
@@ -71,6 +72,8 @@ 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
+type gstreamer.def &gt; gst.def
+type gstreamer-dbg.def &gt;&gt; gst.def
 "/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
@@ -95,8 +98,8 @@ move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
 			CharacterSet="2">
 			<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;HAVE_WIN32;GST_DISABLE_GST_DEBUG"
+				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\gettext\include;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\win32"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GST_DISABLE_GST_DEBUG;GSTREAMER_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="config.h"
@@ -108,13 +111,13 @@ move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib"
+				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
 				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\libxml2\lib"
-				IgnoreAllDefaultLibraries="TRUE"
-				ModuleDefinitionFile="gstreamer.def"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\gettext\lib;..\..\libxml2\lib"
+				IgnoreAllDefaultLibraries="FALSE"
+				ModuleDefinitionFile="gst.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -124,7 +127,8 @@ move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				CommandLine="del gst.def"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
@@ -141,6 +145,7 @@ 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
+type gstreamer.def &gt; gst.def
 "/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
@@ -255,6 +260,9 @@ move lex._gst_parse_yy.c $(ProjectDir)..\gst\parse\lex._gst_parse_yy.c
 			<File
 				RelativePath="..\gst\gstqueue.c">
 			</File>
+			<File
+				RelativePath=".\gstreamer.def">
+			</File>
 			<File
 				RelativePath="..\gst\gstregistry.c">
 			</File>
diff --git a/win32/vs7/Makefile b/win32/vs7/Makefile
index 236d1085af..bf802dd38a 100644
--- a/win32/vs7/Makefile
+++ b/win32/vs7/Makefile
@@ -79,12 +79,21 @@ clean:
 	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 lex._gst_parse_yy.c
+	$(RM) $(OBJ) $(HEADERS) gstreamer-0.8.lib libgstreamer-0.8.dll gstreamer.map gstreamer-0.8.exp lex._gst_parse_yy.c gst.def
 
-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
+libgstreamer-0.8.dll: gst.def $(HEADERS) $(OBJ)
+	link $(LDFLAGS) /OUT:$@ $(OBJ) /DEF:gst.def glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib libpopt.lib wsock32.lib
 
 
+ifeq (yes,$(DEBUG))
+gst.def:
+	type gstreamer.def > gst.def
+	type gstreamer-dbg.def >> gst.def
+else
+gst.def:
+	type gstreamer.def > gst.def
+endif
+
 $(SRC_DIR)\gstversion.h: gstversion.h
 	copy $< $@
 
diff --git a/win32/vs7/gst-inspect.vcproj b/win32/vs7/gst-inspect.vcproj
index e6985fb6fe..65cb2df035 100644
--- a/win32/vs7/gst-inspect.vcproj
+++ b/win32/vs7/gst-inspect.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/win32/vs7/gst-launch.vcproj b/win32/vs7/gst-launch.vcproj
index 626e1f7070..c1a91aa201 100644
--- a/win32/vs7/gst-launch.vcproj
+++ b/win32/vs7/gst-launch.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/win32/vs7/gst-register.vcproj b/win32/vs7/gst-register.vcproj
index 56b537bf29..90aac86044 100644
--- a/win32/vs7/gst-register.vcproj
+++ b/win32/vs7/gst-register.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/win32/vs7/gstelements.vcproj b/win32/vs7/gstelements.vcproj
index 4215b9cba8..8cb3e07408 100644
--- a/win32/vs7/gstelements.vcproj
+++ b/win32/vs7/gstelements.vcproj
@@ -20,8 +20,8 @@
 			<Tool
 				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;HAVE_WIN32"
+				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -34,11 +34,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib"
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gstelements.def"
 				GenerateDebugInformation="TRUE"
@@ -73,7 +73,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\libintl\include"
+				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -85,11 +85,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib intl.lib"
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
 				ModuleDefinitionFile="gstelements.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
diff --git a/win32/vs7/gstreamer-dbg.def b/win32/vs7/gstreamer-dbg.def
new file mode 100644
index 0000000000..4c7c9a0384
--- /dev/null
+++ b/win32/vs7/gstreamer-dbg.def
@@ -0,0 +1,5 @@
+        GST_CAT_DEFAULT
+        _gst_debug_register_funcptr
+        _gst_debug_nameof_funcptr
+        _gst_debug_category_new
+        gst_debug_log_valist