steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of factorcode.org:/git/factor

db4
Doug Coleman 2014-07-08 01:34:46 -05:00
parent 6612867742 a8b78071ff
commit b3fba62f05
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
basis/alien/libraries/finder/windows/windows.factor
View File

@ -2,15 +2,17 @@
! See http://factorcode.org/license.txt for BSD license ! See http://factorcode.org/license.txt for BSD license
USING: alien.libraries.finder arrays combinators.short-circuit USING: alien.libraries.finder arrays combinators.short-circuit
environment io.files io.files.info io.pathnames kernel sequences environment io.backend io.files io.files.info io.pathnames kernel
splitting system system-info.windows ; sequences splitting system system-info.windows ;
IN: alien.libraries.finder.windows IN: alien.libraries.finder.windows
<PRIVATE <PRIVATE
: search-paths ( -- seq ) : search-paths ( -- seq )
"resource:" system-directory windows-directory 3array "resource:" normalize-path
system-directory
windows-directory 3array
"PATH" os-env [ ";" split ] [ f ] if* append ; "PATH" os-env [ ";" split ] [ f ] if* append ;
: candidate-paths ( name -- seq ) : candidate-paths ( name -- seq )

1
basis/alien/libraries/libraries.factor
View File

@ -26,7 +26,6 @@ ERROR: no-library name ;
: lookup-library ( name -- library ) libraries get at ; : lookup-library ( name -- library ) libraries get at ;
: open-dll ( path -- dll dll-error/f ) : open-dll ( path -- dll dll-error/f )
normalize-path
[ dlopen dup dll-valid? [ f ] [ dlerror ] if ] [ dlopen dup dll-valid? [ f ] [ dlerror ] if ]
[ f f ] if* ; [ f f ] if* ;