summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2019-02-11 17:37:52 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2019-02-12 00:48:18 +0800
commitb44561aeacb704d87ec58b2e1767f6901c806cc2 (patch)
treee451dc1dc6a52bb83b46a77174e9ca7c3c9b1d2b
parenta7ef13c79fa53b2d944ed9c7734b53bd1351183f (diff)
downloadcogl-b44561aeacb704d87ec58b2e1767f6901c806cc2.tar.gz
cogl/cogl.c: Do not hardcode COGL_LOCALEDIR on Windows
Instead, we construct it according to where the Cogl DLL is found, as it is likely that the Cogl DLL will land in somewhere that is not the initial $(PREFIX)\bin on Windows.
-rw-r--r--cogl/cogl.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/cogl/cogl.c b/cogl/cogl.c
index 577ae72f..a93a654d 100644
--- a/cogl/cogl.c
+++ b/cogl/cogl.c
@@ -758,8 +758,17 @@ _cogl_init (void)
if (initialized == FALSE)
{
#ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, COGL_LOCALEDIR);
+ char *localedir = NULL;
+#ifdef _WIN32
+ char *basedir = g_win32_get_package_installation_directory_of_module (NULL);
+ localedir = g_build_filename (basedir, "share", "locale", NULL);
+ g_free (basedir);
+#else
+ localedir = g_strdup (COGL_LOCALEDIR);
+#endif
+ bindtextdomain (GETTEXT_PACKAGE, localedir);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ g_free (localedir);
#endif
#if defined(COGL_HAS_GTYPE_SUPPORT) && !GLIB_CHECK_VERSION (2, 36, 0)