projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d5ae66e)
Disable NLS for now literaly export GST_CAT_DEFAULT
authorSteve Lhomme <steve.lhomme@free.fr>
Sat, 24 Jul 2004 16:07:01 +0000 (16:07 +0000)
committerSteve Lhomme <steve.lhomme@free.fr>
Sat, 24 Jul 2004 16:07:01 +0000 (16:07 +0000)
Original commit message from CVS:
Disable NLS for now
literaly export GST_CAT_DEFAULT

ChangeLog patch | blob | history
gst/gstinfo.h patch | blob | history
win32/config.h patch | blob | history
win32/gst-inspect.vcproj patch | blob | history
win32/gst-launch.vcproj patch | blob | history
win32/vs7/gst-inspect.vcproj patch | blob | history
win32/vs7/gst-launch.vcproj patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 43aa94b..86101e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2004-07-24  Steve Lhomme  <steve.lhomme at free dot fr>
 
+       * gst/gstinfo.h:
+       Marc was right, we need to export literraly GST_CAT_DEFAULT
+
+2004-07-24  Steve Lhomme  <steve.lhomme at free dot fr>
+
+       * win32/config.h:
+       NLS crashes in gettext, disabled until this is solved
+
+2004-07-24  Steve Lhomme  <steve.lhomme at free dot fr>
+
+       * win32/gst-inspect.vcproj:
+       * win32/gst-launch.vcproj:
+       Should use NLS when available
+
+2004-07-24  Steve Lhomme  <steve.lhomme at free dot fr>
+
        * gst/registries/gstxmlregistry.c:
        removing the file doesn't seem to be a good idea on Linux
 
diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index 90f08cf..fb2570d 100644 (file)
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -276,7 +276,7 @@ GSList *
 gchar *        gst_debug_construct_term_color  (guint colorinfo);
 
 
-extern GstDebugCategory *      GST_CAT_DEFAULT;
+GST_EXPORT GstDebugCategory *  GST_CAT_DEFAULT;
 /* this symbol may not be used */
 extern gboolean                        __gst_debug_enabled;
 
diff --git a/win32/config.h b/win32/config.h
index f9f65a2..3897a62 100644 (file)
--- a/win32/config.h
+++ b/win32/config.h
@@ -1,7 +1,8 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 1
+/*#define ENABLE_NLS 1*/
+#undef ENABLE_NLS
 
 /* gettext package name */
 #define GETTEXT_PACKAGE "gstreamer-0.8"
diff --git a/win32/gst-inspect.vcproj b/win32/gst-inspect.vcproj
index 65cb2df..8b7d63c 100644 (file)
--- a/win32/gst-inspect.vcproj
+++ b/win32/gst-inspect.vcproj
@@ -20,8 +20,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+                               AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
                                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)/gst-inspect.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                IgnoreAllDefaultLibraries="FALSE"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/gst-inspect.pdb"
@@ -73,8 +73,8 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
+                               AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -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)/gst-inspect.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"
diff --git a/win32/gst-launch.vcproj b/win32/gst-launch.vcproj
index c1a91aa..0591215 100644 (file)
--- a/win32/gst-launch.vcproj
+++ b/win32/gst-launch.vcproj
@@ -20,8 +20,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
                                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)/gst-launch.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                IgnoreAllDefaultLibraries="FALSE"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/gst-launch.pdb"
@@ -73,8 +73,8 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
+                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -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)/gst-launch.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"
diff --git a/win32/vs7/gst-inspect.vcproj b/win32/vs7/gst-inspect.vcproj
index 65cb2df..8b7d63c 100644 (file)
--- a/win32/vs7/gst-inspect.vcproj
+++ b/win32/vs7/gst-inspect.vcproj
@@ -20,8 +20,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+                               AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
                                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)/gst-inspect.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                IgnoreAllDefaultLibraries="FALSE"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/gst-inspect.pdb"
@@ -73,8 +73,8 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
+                               AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -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)/gst-inspect.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"
diff --git a/win32/vs7/gst-launch.vcproj b/win32/vs7/gst-launch.vcproj
index c1a91aa..0591215 100644 (file)
--- a/win32/vs7/gst-launch.vcproj
+++ b/win32/vs7/gst-launch.vcproj
@@ -20,8 +20,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
                                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)/gst-launch.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                IgnoreAllDefaultLibraries="FALSE"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(OutDir)/gst-launch.pdb"
@@ -73,8 +73,8 @@
                        CharacterSet="2">
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG"
+                               AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -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)/gst-launch.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject"
+                               AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
                                GenerateDebugInformation="TRUE"
                                SubSystem="1"
                                OptimizeReferences="2"
Domain: Multimedia / Media Common;