summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1083813)
raw | patch | inline | side by side (parent: 1083813)
author | Steve Lhomme <steve.lhomme@free.fr> | |
Sat, 12 Jun 2004 10:45:54 +0000 (10:45 +0000) | ||
committer | Steve Lhomme <steve.lhomme@free.fr> | |
Sat, 12 Jun 2004 10:45:54 +0000 (10:45 +0000) |
Original commit message from CVS:
Enable NLS under Windows
Enable NLS under Windows
ChangeLog | patch | blob | history | |
gst/gst-i18n-app.h | patch | blob | history | |
win32/README.txt | patch | blob | history | |
win32/config.h | patch | blob | history | |
win32/vs7/README.txt | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index c02bf3ee033e91968aed0d46be0bc6afca047029..9c90a80fe027b84702c37f2de381d87c188c0f72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
2004-06-12 Steve Lhomme <steve.lhomme@free.fr>
* win32/config.h:
+ * gst/gst-i18n-app.h:
enable NLS under Windows
2004-06-12 Jan Schmidt <thaytan@mad.scientist.com>
diff --git a/gst/gst-i18n-app.h b/gst/gst-i18n-app.h
index 19a59f37c5f70edad3f6f24cec3edda5b49ea19e..42239095bff2d601b17d0f78619cce252860fe01 100644 (file)
--- a/gst/gst-i18n-app.h
+++ b/gst/gst-i18n-app.h
#ifndef __GST_I18N_APP_H__
#define __GST_I18N_APP_H__
+#ifdef ENABLE_NLS
#include "gettext.h" /* included with gettext distribution and copied */
/* we want to use shorthand _() for translating and N_() for marking */
#define N_(String) gettext_noop (String)
/* FIXME: if we need it, we can add Q_ as well, like in glib */
+#else
+
+#define _(String) String
+#define N_(String) String
+
+#endif
+
#endif /* __GST_I18N_APP_H__ */
diff --git a/win32/README.txt b/win32/README.txt
index b58478bd8dcb319e271e1c1a3676212496b6a6c9..1f97578c626bfea42d14df054a3f27ed49b428eb 100644 (file)
--- a/win32/README.txt
+++ b/win32/README.txt
- GLib
- libpopt
- libxml
-- libintl
+- gettext
- 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)\gettext
$(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 : you can find Win32 versions of these libraries on http://gettext.sourceforge.net/ and
+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
diff --git a/win32/config.h b/win32/config.h
index babb95aba4a68591a5be24b080ea64681ad37248..f9f65a23940694a4cbddfdfae3853c51807cf505 100644 (file)
--- a/win32/config.h
+++ b/win32/config.h
/* config.h.in. Generated from configure.ac by autoheader. */
/* always defined to indicate that i18n is enabled */
-#undef ENABLE_NLS
+#define ENABLE_NLS 1
/* gettext package name */
-#undef GETTEXT_PACKAGE
+#define GETTEXT_PACKAGE "gstreamer-0.8"
/* Location of registry */
#define GST_CACHE_DIR ""
#define GST_LICENSE "LGPL"
/* Define the location where the catalogs will be installed */
-#undef GST_LOCALEDIR
+#define LOCALEDIR ".\locale"
/* package origin */
#define GST_ORIGIN "http://gstreamer.net"
#define GST_PACKAGE "GStreamer"
/* Define the version */
-#define GST_VERSION "0.8.1"
+#define GST_VERSION "0.8.3"
/* Define the release version */
#define GST_VERSION_RELEASE "20040129_103536"
#undef USE_POISONING
/* Version number of package */
-#define VERSION "0.8.1.0"
+#define VERSION "0.8.3.0"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
#define WORDS_BIGENDIAN 0
-#define GST_MAJORMINOR "GST_VERSION_MAJOR.GST_VERSION_MINOR"
+#define GST_MAJORMINOR "0.8"
diff --git a/win32/vs7/README.txt b/win32/vs7/README.txt
index b58478bd8dcb319e271e1c1a3676212496b6a6c9..1f97578c626bfea42d14df054a3f27ed49b428eb 100644 (file)
--- a/win32/vs7/README.txt
+++ b/win32/vs7/README.txt
- GLib
- libpopt
- libxml
-- libintl
+- gettext
- 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)\gettext
$(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 : you can find Win32 versions of these libraries on http://gettext.sourceforge.net/ and
+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