summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 90386d8)
raw | patch | inline | side by side (parent: 90386d8)
author | Steve Lhomme <steve.lhomme@free.fr> | |
Sat, 12 Jun 2004 11:31:49 +0000 (11:31 +0000) | ||
committer | Steve Lhomme <steve.lhomme@free.fr> | |
Sat, 12 Jun 2004 11:31:49 +0000 (11:31 +0000) |
Original commit message from CVS:
More code in debug builds to have logging capabilities
More code in debug builds to have logging capabilities
19 files changed:
ChangeLog | patch | blob | history | |
gst/gstconfig.h.in | patch | blob | history | |
win32/GStreamer.vcproj | patch | blob | history | |
win32/Makefile | patch | blob | history | |
win32/gst-inspect.vcproj | patch | blob | history | |
win32/gst-launch.vcproj | patch | blob | history | |
win32/gst-register.vcproj | patch | blob | history | |
win32/gstbytestream.vcproj | patch | blob | history | |
win32/gstelements.vcproj | patch | blob | history | |
win32/gstoptimalscheduler.vcproj | patch | blob | history | |
win32/gstreamer-dbg.def | [new file with mode: 0644] | patch | blob |
win32/gstspider.vcproj | patch | blob | history | |
win32/vs7/GStreamer.vcproj | patch | blob | history | |
win32/vs7/Makefile | patch | blob | history | |
win32/vs7/gst-inspect.vcproj | patch | blob | history | |
win32/vs7/gst-launch.vcproj | patch | blob | history | |
win32/vs7/gst-register.vcproj | patch | blob | history | |
win32/vs7/gstelements.vcproj | patch | blob | history | |
win32/vs7/gstreamer-dbg.def | [new file with mode: 0644] | patch | blob |
diff --git a/ChangeLog b/ChangeLog
index 57e189060284de1113ac19315867ad3199f4ecab..4f8f2b17c295cefcc140e5cf67d2ff7417ef49c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
* 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 a528d01962b3b85af2207a107216fb61fcb58388..054fd10201056a0bbbcf5da30cc981ac7d4b8196 100644 (file)
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
# 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 e256b12ce4abfa2c0fae709d6921111e3a6ecb32..2b9c63ca6f87a6e65665f98a7ca131020c227f5b 100644 (file)
--- a/win32/GStreamer.vcproj
+++ b/win32/GStreamer.vcproj
<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"
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"
<Tool
Name="VCMIDLTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ CommandLine="del gst.def"/>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
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 > gst.def
+type gstreamer-dbg.def >> gst.def
"/>
<Tool
Name="VCPreLinkEventTool"/>
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"
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"
<Tool
Name="VCMIDLTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ CommandLine="del gst.def"/>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
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 > gst.def
"/>
<Tool
Name="VCPreLinkEventTool"/>
<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 236d1085af9cb1c600a4789cf48edf3f3d9104e4..bf802dd38a4295690c8614495769d3b0f9bf3734 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
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 $< $@
index e6985fb6fe5c4ecd7b071f16798bb01f816a7cf8..65cb2df035605d9b83e733ffbaee6c54b35a56ef 100644 (file)
--- a/win32/gst-inspect.vcproj
+++ b/win32/gst-inspect.vcproj
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"
index 626e1f7070b4c093cf99b93ce57ae72f7147ff5d..c1a91aa2015a1a0b5f79ced205183350b2487a7e 100644 (file)
--- a/win32/gst-launch.vcproj
+++ b/win32/gst-launch.vcproj
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"
index 56b537bf299643915e6c77ab8902d35b8bc9e370..90aac86044b39464e6191008a79dba6db00c1b10 100644 (file)
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"
index 93fbf5c51b3c733393474f67d9dab49c41d929fc..71267ca4fddb9536761ea356a004ba4af9798613 100644 (file)
<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"
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"
index 4215b9cba897cd9b7d338846bbb9e1761b9366a6..8cb3e07408a5cb8fe90e1e74907d48ae7520b9ad 100644 (file)
--- a/win32/gstelements.vcproj
+++ b/win32/gstelements.vcproj
<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"
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"
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"
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"
index 228488a0e33feda22589ba6f643387cf33d85bb7..0eb085254b93ea152f1a37968614df9e12e0d42d 100644 (file)
<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"
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
--- /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 ca60bfe541b68f1ae24ddd54870b5bcb5ea65c04..936b54c8630eb983c56a3fe7c2b2d31411c3f173 100644 (file)
--- a/win32/gstspider.vcproj
+++ b/win32/gstspider.vcproj
<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"
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"
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"
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"
index e256b12ce4abfa2c0fae709d6921111e3a6ecb32..2b9c63ca6f87a6e65665f98a7ca131020c227f5b 100644 (file)
<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"
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"
<Tool
Name="VCMIDLTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ CommandLine="del gst.def"/>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
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 > gst.def
+type gstreamer-dbg.def >> gst.def
"/>
<Tool
Name="VCPreLinkEventTool"/>
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"
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"
<Tool
Name="VCMIDLTool"/>
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCPostBuildEventTool"
+ CommandLine="del gst.def"/>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
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 > gst.def
"/>
<Tool
Name="VCPreLinkEventTool"/>
<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 236d1085af9cb1c600a4789cf48edf3f3d9104e4..bf802dd38a4295690c8614495769d3b0f9bf3734 100644 (file)
--- a/win32/vs7/Makefile
+++ b/win32/vs7/Makefile
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 $< $@
index e6985fb6fe5c4ecd7b071f16798bb01f816a7cf8..65cb2df035605d9b83e733ffbaee6c54b35a56ef 100644 (file)
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"
index 626e1f7070b4c093cf99b93ce57ae72f7147ff5d..c1a91aa2015a1a0b5f79ced205183350b2487a7e 100644 (file)
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"
index 56b537bf299643915e6c77ab8902d35b8bc9e370..90aac86044b39464e6191008a79dba6db00c1b10 100644 (file)
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"
index 4215b9cba897cd9b7d338846bbb9e1761b9366a6..8cb3e07408a5cb8fe90e1e74907d48ae7520b9ad 100644 (file)
<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"
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"
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"
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
--- /dev/null
@@ -0,0 +1,5 @@
+ GST_CAT_DEFAULT
+ _gst_debug_register_funcptr
+ _gst_debug_nameof_funcptr
+ _gst_debug_category_new
+ gst_debug_log_valist