From 9bbf0af6e859fde1237c2d909f50f31b55164c1c Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 7 Jul 2014 23:31:59 -0700 Subject: [PATCH 1/2] Revert "alien.libraries: Normalize the path before opening a dll since" This reverts commit 05aabb13f4f6e151fc0b9da0db3fce0125dc74da. --- basis/alien/libraries/libraries.factor | 1 - 1 file changed, 1 deletion(-) diff --git a/basis/alien/libraries/libraries.factor b/basis/alien/libraries/libraries.factor index 9dc22f5df3..5a06b01a84 100755 --- a/basis/alien/libraries/libraries.factor +++ b/basis/alien/libraries/libraries.factor @@ -26,7 +26,6 @@ ERROR: no-library name ; : lookup-library ( name -- library ) libraries get at ; : open-dll ( path -- dll dll-error/f ) - normalize-path [ dlopen dup dll-valid? [ f ] [ dlerror ] if ] [ f f ] if* ; From a8b78071ffbfb55b844c5d8b724d0d06bc99565c Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 7 Jul 2014 23:34:10 -0700 Subject: [PATCH 2/2] alien.libraries.finder.windows: Better fix for finding the right library path. --- basis/alien/libraries/finder/windows/windows.factor | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/basis/alien/libraries/finder/windows/windows.factor b/basis/alien/libraries/finder/windows/windows.factor index d23f2e8d7e..1f1fbbe38d 100644 --- a/basis/alien/libraries/finder/windows/windows.factor +++ b/basis/alien/libraries/finder/windows/windows.factor @@ -2,15 +2,17 @@ ! See http://factorcode.org/license.txt for BSD license USING: alien.libraries.finder arrays combinators.short-circuit -environment io.files io.files.info io.pathnames kernel sequences -splitting system system-info.windows ; +environment io.backend io.files io.files.info io.pathnames kernel +sequences splitting system system-info.windows ; IN: alien.libraries.finder.windows