From 1db1f8e0124e46046f5fd26249196393c0234efd Mon Sep 17 00:00:00 2001 From: sergiotarxz Date: Sun, 10 Jul 2022 16:53:14 +0200 Subject: [PATCH] Trying again to move the dll to destdir --- package.pl | 4 ---- src/windows/launcher.c | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package.pl b/package.pl index 3ecbba6..2f75472 100644 --- a/package.pl +++ b/package.pl @@ -15,13 +15,9 @@ $resources->mkpath; copy_recursive('/home/sergio/recuento_root/usr/bin/recuento{,_launcher_windows}.exe', $recuento_inner); copy_recursive('/home/sergio/recuento_root/usr/bin/rsvg-convert.exe', $recuento_inner); copy_recursive('/home/sergio/recuento_root/usr/bin/rsvg-convert.exe', $destdir); -copy_recursive('/home/sergio/recuento_root/usr/bin/*.{dll,DLL}', $recuento_inner); copy_recursive('/home/sergio/recuento_root/usr/bin/*.{dll,DLL}', $destdir); -copy_recursive('/usr/lib/gcc/x86_64-w64-mingw32/11.3.0/libgcc_s_seh-1.dll', $recuento_inner); copy_recursive('/usr/lib/gcc/x86_64-w64-mingw32/11.3.0/libgcc_s_seh-1.dll', $destdir); -copy_recursive('/usr/x86_64-w64-mingw32/usr/bin/libwinpthread-1.dll', $recuento_inner); copy_recursive('/usr/x86_64-w64-mingw32/usr/bin/libwinpthread-1.dll', $destdir); -copy_recursive('/usr/lib/gcc/x86_64-w64-mingw32/11.3.0/libstdc++-6.dll', $recuento_inner); copy_recursive('/usr/lib/gcc/x86_64-w64-mingw32/11.3.0/libstdc++-6.dll', $destdir); copy_recursive('/home/sergio/recuento_root/usr/share/recuento/', $resources); move_launcher ($recuento_inner, $destdir); diff --git a/src/windows/launcher.c b/src/windows/launcher.c index aaccbca..052d1ed 100644 --- a/src/windows/launcher.c +++ b/src/windows/launcher.c @@ -101,6 +101,7 @@ WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR pCmdLine, int nCmdShow) _putenv_s("GSETTINGS_SCHEMA_DIR", "share\\\\glib-2.0\\\\schemas"); _putenv_s("XDG_DATA_HOME", "share"); _putenv_s("XDG_CONFIG_DIRS", "etc"); + _putenv_s("PATH", owl_path_get_path (owl_path_cwd ())); int return_value = execvp(argument_list[0], argument_list); if (return_value == -1) {