Merge branch 'master' of factorcode.org:/git/factor
commit
b3fba62f05
|
@ -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
|
||||
|
||||
<PRIVATE
|
||||
|
||||
: search-paths ( -- seq )
|
||||
"resource:" system-directory windows-directory 3array
|
||||
"resource:" normalize-path
|
||||
system-directory
|
||||
windows-directory 3array
|
||||
"PATH" os-env [ ";" split ] [ f ] if* append ;
|
||||
|
||||
: candidate-paths ( name -- seq )
|
||||
|
|
|
@ -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* ;
|
||||
|
||||
|
|
Loading…
Reference in New Issue