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

gtk, opengl: try out update-library 

opengl.gl: Only find the opengl library if we are on unix and not on macosx.
db4
Doug Coleman 2015-06-16 18:44:29 -07:00
parent 5908f301b9
commit 4eb6fd6624
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

17
basis/opengl/gl/gl.factor
View File

@ -3,9 +3,9 @@
! This file is based on the gl.h that comes with xorg-x11 6.8.2
USING: alien alien.c-types alien.libraries alien.syntax
combinators kernel parser sequences system words
opengl.gl.extensions io.encodings.ascii ;
USING: alien alien.c-types alien.libraries
alien.libraries.finder alien.syntax init io.encodings.ascii
kernel opengl.gl.extensions system ;
FROM: alien.c-types => short ;
IN: opengl.gl
@ -629,13 +629,10 @@ CONSTANT: GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF
LIBRARY: gl
<<
"gl" {
{ [ os windows? ] [ drop ] }
{ [ os macosx? ] [ drop ] }
{ [ os unix? ] [ "libGL.so" cdecl add-library ] }
} cond
>>
[
os [ linux? ] [ macosx? not ] bi and
[ "gl" "GL" find-library cdecl update-library ] when
] "find-gl" add-startup-hook
! Miscellaneous