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

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

db4
Slava Pestov 2009-03-26 18:20:30 -05:00
parent 50b8bae937 785e3bcfd0
commit 5632061425
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -160,7 +160,7 @@ factor-console: $(DLL_OBJS) $(EXE_OBJS)
$(CFLAGS) $(CFLAGS_CONSOLE) -o factor$(EXE_SUFFIX)$(CONSOLE_EXTENSION) $(EXE_OBJS)
factor-ffi-test: $(TEST_OBJS)
$(CC) $(LIBPATH) $(CFLAGS) $(SHARED_FLAG) -o libfactor-ffi-test$(DLL_EXTENSION) $(TEST_OBJS)
$(CC) $(LIBPATH) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o libfactor-ffi-test$(DLL_EXTENSION) $(TEST_OBJS)
clean:
rm -f vm/*.o

2
basis/alien/fortran/fortran.factor
View File

@ -5,7 +5,7 @@ byte-arrays combinators combinators.short-circuit fry generalizations
kernel lexer macros math math.parser namespaces parser sequences
splitting stack-checker vectors vocabs.parser words locals
io.encodings.ascii io.encodings.string shuffle effects math.ranges
math.order sorting strings system ;
math.order sorting strings system alien.libraries ;
IN: alien.fortran
SINGLETONS: f2c-abi gfortran-abi intel-unix-abi intel-windows-abi ;

2
basis/compiler/tests/alien.factor
View File

@ -4,7 +4,7 @@ namespaces namespaces tools.test sequences stack-checker
stack-checker.errors words arrays parser quotations
continuations effects namespaces.private io io.streams.string
memory system threads tools.test math accessors combinators
specialized-arrays.float ;
specialized-arrays.float alien.libraries ;
<<
: libfactor-ffi-tests-path ( -- string )

3
basis/math/blas/ffi/ffi.factor
View File

@ -1,4 +1,5 @@
USING: alien alien.fortran kernel system combinators ;
USING: alien alien.fortran kernel system combinators
alien.libraries ;
IN: math.blas.ffi
<<

3
basis/pango/cairo/cairo.factor
View File

@ -3,7 +3,8 @@
! See http://factorcode.org/license.txt for BSD license.
!
! pangocairo bindings, from pango/pangocairo.h
USING: alien alien.syntax combinators system cairo.ffi ;
USING: alien alien.syntax combinators system cairo.ffi
alien.libraries ;
IN: pango.cairo
<< {

1
core/alien/alien-docs.factor
View File

@ -266,7 +266,6 @@ $nl
{ $warning "C does not perform runtime type checking, automatic memory management or array bounds checks. Incorrect usage of C library functions can lead to crashes, data corruption, and security exploits." }
{ $subsection "loading-libs" }
{ $subsection "aliens" }
{ $subsection "alien.libraries" }
{ $subsection "alien-invoke" }
{ $subsection "alien-callback" }
{ $subsection "c-data" }

1
vm/Config.linux.x86.64
View File

@ -1,3 +1,4 @@
include vm/Config.linux
include vm/Config.x86.64
LIBPATH = -L/usr/X11R6/lib64 -L/usr/X11R6/lib
FFI_TEST_CFLAGS = -fPIC