From 6029771ed588ae494f19f78be1dada09ae2edbc5 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Sat, 12 Jun 2004 10:45:54 +0000 Subject: [PATCH] Enable NLS under Windows Original commit message from CVS: Enable NLS under Windows --- ChangeLog | 1 + gst/gst-i18n-app.h | 8 ++++++++ win32/README.txt | 8 ++++---- win32/config.h | 12 ++++++------ win32/vs7/README.txt | 8 ++++---- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index c02bf3ee03..9c90a80fe0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ 2004-06-12 Steve Lhomme * win32/config.h: + * gst/gst-i18n-app.h: enable NLS under Windows 2004-06-12 Jan Schmidt diff --git a/gst/gst-i18n-app.h b/gst/gst-i18n-app.h index 19a59f37c5..42239095bf 100644 --- a/gst/gst-i18n-app.h +++ b/gst/gst-i18n-app.h @@ -23,6 +23,7 @@ #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 */ @@ -30,4 +31,11 @@ #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 b58478bd8d..1f97578c62 100644 --- a/win32/README.txt +++ b/win32/README.txt @@ -14,19 +14,19 @@ The GStreamer project depends on other libraries, namely : - 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 babb95aba4..f9f65a2394 100644 --- a/win32/config.h +++ b/win32/config.h @@ -1,10 +1,10 @@ /* 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 "" @@ -19,7 +19,7 @@ #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" @@ -28,7 +28,7 @@ #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" @@ -189,11 +189,11 @@ #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 b58478bd8d..1f97578c62 100644 --- a/win32/vs7/README.txt +++ b/win32/vs7/README.txt @@ -14,19 +14,19 @@ The GStreamer project depends on other libraries, namely : - 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