diff options
| -rw-r--r-- | midori/midori-app.c | 13 | ||||
| -rwxr-xr-x | win32/makedist/makedist.midori | 6 |
2 files changed, 19 insertions, 0 deletions
diff --git a/midori/midori-app.c b/midori/midori-app.c index 15b0a470..a4c71df5 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -1223,6 +1223,19 @@ midori_app_setup (gint *argc, /* Preserve argument vector */ midori_paths_init_exec_path (*argument_vector, *argc); + #ifdef G_OS_WIN32 + { + gchar* exec_dir = g_win32_get_package_installation_directory_of_module (NULL); + gchar* dr_mingw_dll = g_build_filename (exec_dir, "bin", "exchndl.dll", NULL); + + if (g_file_test (dr_mingw_dll, G_FILE_TEST_EXISTS)) { + LoadLibrary(dr_mingw_dll); + } + g_free (exec_dir); + g_free (dr_mingw_dll); + } + #endif + #if ENABLE_NLS if (g_getenv ("MIDORI_NLSPATH")) bindtextdomain (GETTEXT_PACKAGE, g_getenv ("MIDORI_NLSPATH")); diff --git a/win32/makedist/makedist.midori b/win32/makedist/makedist.midori index 7ec3a15c..0d3ef438 100755 --- a/win32/makedist/makedist.midori +++ b/win32/makedist/makedist.midori @@ -278,6 +278,12 @@ rpm -qf /etc/pki/tls/certs/ca-bundle.crt >> $temp_dir/packages_used.lst rpm -qf /usr/share/icons/Faenza/ >> $temp_dir/packages_used.lst echo "https://github.com/shimmerproject/Greybird/archive/v$GREYBIRD_VER.tar.gz" >> $temp_dir/packages_used.lst +pushd $temp_dir > /dev/null +wget --no-verbose "https://github.com/jrfonseca/drmingw/releases/download/0.7.3/drmingw-0.7.3-win32.zip" -P $temp_dir +unzip "$temp_dir/drmingw-0.7.3-win32.zip" +cp -Lr $temp_dir/drmingw-0.7.3-win32/bin/{mgwhelp.dll,exchndl.dll} $workdir/bin +popd > /dev/null + # copy locales for gtk # so we have translated stock items, file dialogs |