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

Revert "alien.libraries.finder: using find-library for some often missing libs" 

This reverts commit a6b3f50e2c.

Conflicts:
	basis/gtk/ffi/ffi.factor
db4
John Benediktsson 2014-11-13 09:33:30 -08:00
parent d89ae96c64
commit 3a0c04340e
3 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
basis/db/sqlite/ffi/ffi.factor
View File

@ -2,12 +2,15 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
! An interface to the sqlite database. Tested against sqlite v3.1.3. ! An interface to the sqlite database. Tested against sqlite v3.1.3.
! Not all functions have been wrapped. ! Not all functions have been wrapped.
USING: alien alien.libraries alien.libraries.finder compiler kernel USING: alien compiler kernel math namespaces sequences strings alien.syntax
math namespaces sequences strings alien.syntax system combinators system combinators alien.c-types alien.libraries ;
alien.c-types ;
IN: db.sqlite.ffi IN: db.sqlite.ffi
<< "sqlite" "sqlite3" find-library cdecl add-library >> << "sqlite" {
{ [ os windows? ] [ "sqlite3.dll" ] }
{ [ os macosx? ] [ "/usr/lib/libsqlite3.dylib" ] }
{ [ os unix? ] [ "libsqlite3.so" ] }
} cond cdecl add-library >>
! Return values from sqlite functions ! Return values from sqlite functions
CONSTANT: SQLITE_OK 0 ! Successful result CONSTANT: SQLITE_OK 0 ! Successful result

9
basis/gtk/ffi/ffi.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2010 Anton Gorenko. ! Copyright (C) 2010 Anton Gorenko.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: alien alien.c-types alien.destructors alien.libraries USING: alien alien.c-types alien.destructors alien.libraries
alien.libraries.finder alien.syntax assocs gobject-introspection alien.syntax combinators gobject-introspection
gobject-introspection.standard-types kernel pango.ffi system gobject-introspection.standard-types kernel pango.ffi system
vocabs ; vocabs ;
IN: gtk.ffi IN: gtk.ffi
@ -15,9 +15,10 @@ LIBRARY: gtk
<< <<
"gtk" { "gtk" {
{ linux "gtk-x11-2.0" } { [ os windows? ] [ "libgtk-win32-2.0-0.dll" cdecl add-library ] }
{ windows "libgtk-win32-2.0-0" } { [ os macosx? ] [ drop ] }
} os of [ find-library cdecl add-library ] [ drop ] if* { [ os unix? ] [ "libgtk-x11-2.0.so" cdecl add-library ] }
} cond
>> >>
IMPLEMENT-STRUCTS: GtkTreeIter ; IMPLEMENT-STRUCTS: GtkTreeIter ;

14
extra/readline/ffi/ffi.factor
View File

@ -1,11 +1,17 @@
! Copyright (C) 2010 Erik Charlebois ! Copyright (C) 2010 Erik Charlebois
! See http:// factorcode.org/license.txt for BSD license. ! See http:// factorcode.org/license.txt for BSD license.
USING: alien alien.c-types alien.syntax alien.libraries.finder USING: alien alien.c-types kernel alien.syntax classes.struct
classes.struct accessors kernel libc math make unix.types namespaces accessors libc math make unix.types namespaces system
system combinators alien.libraries ; combinators alien.libraries ;
IN: readline.ffi IN: readline.ffi
<< "readline" dup find-library cdecl add-library >> <<
"readline" {
{ [ os windows? ] [ "readline.dll" ] }
{ [ os macosx? ] [ "libreadline.dylib" ] }
{ [ os unix? ] [ "libreadline.so" ] }
} cond cdecl add-library
>>
LIBRARY: readline LIBRARY: readline
TYPEDEF: void* histdata_t TYPEDEF: void* histdata_t