[gegl] Revert "gegl: Properly build module_path for win32"
- From: Martin Nordholts <martinn src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gegl] Revert "gegl: Properly build module_path for win32"
- Date: Fri, 7 Aug 2009 19:36:44 +0000 (UTC)
commit 883bb919333cf34c7757ac5339dff4412bef04e4
Author: Martin Nordholts <martinn src gnome org>
Date: Wed Aug 5 22:29:00 2009 +0200
Revert "gegl: Properly build module_path for win32"
This reverts commit d9023a0a88215475e1a1b63f9ffb1f0463f34378 which
didn't fix what it indended to fix, and breaks separate GEGL and GIMP
prefixes on Windows. See bug 589667.
gegl/gegl-init.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gegl/gegl-init.c b/gegl/gegl-init.c
index 81b50ad..89542bf 100644
--- a/gegl/gegl-init.c
+++ b/gegl/gegl-init.c
@@ -502,11 +502,10 @@ gegl_post_parse_hook (GOptionContext *context,
gchar *module_path;
#ifdef G_OS_WIN32
- {
- gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL);
- module_path = g_build_filename (prefix, "lib", GEGL_LIBRARY, NULL);
- g_free (prefix);
- }
+ module_path =
+ g_win32_get_package_installation_subdirectory (NULL,
+ "lib" GEGL_LIBRARY "-0.dll",
+ "lib/" GEGL_LIBRARY);
#else
module_path = g_build_filename (LIBDIR, GEGL_LIBRARY, NULL);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]