gtk: add library references.

diff --git a/basis/atk/ffi/ffi.factor b/basis/atk/ffi/ffi.factor
index 8a7be511c6b88dc038fd375fb4a08af573c11133..3f7ad28b917237b3bf6445cbafc0f100d0f461cf 100644 (file)
--- a/basis/atk/ffi/ffi.factor
+++ b/basis/atk/ffi/ffi.factor
@@ -13,7 +13,8 @@ LIBRARY: atk
 <<
 "atk" {
     { [ os windows? ] [ "libatk-1.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ "libatk-1.0.dylib" cdecl add-library ] }
+    { [ os unix? ] [ "libatk-1.0.so" cdecl add-library ] }
 } cond
 >>
 

diff --git a/basis/cairo/ffi/ffi.factor b/basis/cairo/ffi/ffi.factor
index 6f0001d5d88aa43b32e9301ec738762d95279272..d04564c8d593549a83d2ae27e6f970fe487c05dd 100644 (file)
--- a/basis/cairo/ffi/ffi.factor
+++ b/basis/cairo/ffi/ffi.factor
@@ -8,10 +8,10 @@ IN: cairo.ffi
 
 ! Adapted from cairo.h, version 1.8.10
 
-<< {
-    { [ os windows? ] [ "cairo" "libcairo-2.dll" cdecl add-library ] }
-    { [ os macosx? ] [ "cairo" "libcairo.dylib" cdecl add-library ] }
-    { [ os unix? ] [ ] }
+<< "cairo" {
+    { [ os windows? ] [ "libcairo-2.dll" cdecl add-library ] }
+    { [ os macosx? ] [ "libcairo.dylib" cdecl add-library ] }
+    { [ os unix? ] [ "libcairo.so" cdecl add-library ] }
 } cond >>
 
 LIBRARY: cairo

diff --git a/basis/gdk/ffi/ffi.factor b/basis/gdk/ffi/ffi.factor
index 8a3f0da6d3706ae6d9eb857b3ff3a1daf57a93f8..ad095ba66e540bf690b705dd3f316441a5a7023f 100644 (file)
--- a/basis/gdk/ffi/ffi.factor
+++ b/basis/gdk/ffi/ffi.factor
@@ -16,7 +16,8 @@ LIBRARY: gdk
 <<
 "gdk" {
     { [ os windows? ] [ "libgdk-win32-2.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ drop ] }
+    { [ os unix? ] [ "libgdk-x11-2.0.so" cdecl add-library ] }
 } cond
 >>
 

diff --git a/basis/gdk/gl/ffi/ffi.factor b/basis/gdk/gl/ffi/ffi.factor
index 507550ff9830e774ed3627e2488ba0b92e60fbd8..a1ff666c2e46474ab2880672edde7d8b8e8dca88 100644 (file)
--- a/basis/gdk/gl/ffi/ffi.factor
+++ b/basis/gdk/gl/ffi/ffi.factor
@@ -10,4 +10,12 @@ IN: gdk.gl.ffi
 
 LIBRARY: gdk.gl
 
+<<
+"gdk.gl" {
+    { [ os windows? ] [ "libgdkglext-win32-1.0-0.dll" cdecl add-library ] }
+    { [ os macosx? ] [ drop ] }
+    { [ os unix? ] [ "libgdkglext-x11-1.0.so" cdecl add-library ] }
+} cond
+>>
+
 GIR: vocab:gdk/gl/GdkGLExt-1.0.gir

diff --git a/basis/gdk/pixbuf/ffi/ffi.factor b/basis/gdk/pixbuf/ffi/ffi.factor
index f8a8c7db883f4fa1a3c9388d869a57aa510686d8..4f9fe23f59e1650632c128cf94751446a80a39e3 100644 (file)
--- a/basis/gdk/pixbuf/ffi/ffi.factor
+++ b/basis/gdk/pixbuf/ffi/ffi.factor
@@ -15,7 +15,8 @@ LIBRARY: gdk.pixbuf
 <<
 "gdk.pixbuf" {
     { [ os windows? ] [ "libgdk_pixbuf-2.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ "libgdk_pixbuf-2.0.dylib" cdecl add-library ] }
+    { [ os unix? ] [ "libgdk_pixbuf-2.0.so" cdecl add-library ] }
 } cond
 >>
 

diff --git a/basis/gio/ffi/ffi.factor b/basis/gio/ffi/ffi.factor
index 96227b4679aca47b9307ea8f7ce7bd6b62cd5bb0..e4df71e69ba8b969c2a10a8de8356ab3c8594c08 100644 (file)
--- a/basis/gio/ffi/ffi.factor
+++ b/basis/gio/ffi/ffi.factor
@@ -13,7 +13,8 @@ LIBRARY: gio
 <<
 "gio" {
     { [ os windows? ] [ "libgio-2.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ "libgio-2.0.dylib" cdecl add-library ] }
+    { [ os unix? ] [ "libgio-2.0.so" cdecl add-library ] }
 } cond
 >>
 

diff --git a/basis/glib/ffi/ffi.factor b/basis/glib/ffi/ffi.factor
index c7bca2e8be3034b2ef55012fda70efbbdc4b8283..eb96dd01337fb28074b4aa5c75e33eca9bfb20cc 100644 (file)
--- a/basis/glib/ffi/ffi.factor
+++ b/basis/glib/ffi/ffi.factor
@@ -12,7 +12,7 @@ LIBRARY: glib
 "glib" {
     { [ os windows? ] [ "libglib-2.0-0.dll" cdecl add-library ] }
     { [ os macosx? ] [ "libglib-2.0.0.dylib" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os unix? ] [ "libglib-2.0.so" cdecl add-library ] }
 } cond
 >>
 

diff --git a/basis/gobject/ffi/ffi.factor b/basis/gobject/ffi/ffi.factor
index 919f9daa0faa7fc93fecfbcb72db1deb8a2adc20..ccdf210a1e118e89be3dc30bce78b2026edde2ee 100644 (file)
--- a/basis/gobject/ffi/ffi.factor
+++ b/basis/gobject/ffi/ffi.factor
@@ -16,7 +16,8 @@ LIBRARY: gobject
 <<
 "gobject" {
     { [ os windows? ] [ "libobject-2.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ "libgobject-2.0.dylib" cdecl add-library ] }
+    { [ os unix? ] [ "libgobject-2.0.so" cdecl add-library ] }
 } cond
 >>
 

diff --git a/basis/gtk/ffi/ffi.factor b/basis/gtk/ffi/ffi.factor
index 18e5615c70c1e48d514e187aaedd6b207f2abdcf..5e2a379f22b07706c7e779df7486e0ff7aab0213 100644 (file)
--- a/basis/gtk/ffi/ffi.factor
+++ b/basis/gtk/ffi/ffi.factor
@@ -16,7 +16,8 @@ LIBRARY: gtk
 <<
 "gtk" {
     { [ os windows? ] [ "libgtk-win32-2.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
+    { [ os macosx? ] [ drop ] }
+    { [ os unix? ] [ "libgtk-x11-2.0.so" cdecl add-library ] }
 } cond
 >>
 

diff --git a/basis/opengl/gl/gl.factor b/basis/opengl/gl/gl.factor
index ca4eec9dbd943674fd6ba6265ac24aa47ee8915a..32f769342488369415038d0dc2f1fbbc95b64d64 100644 (file)
--- a/basis/opengl/gl/gl.factor
+++ b/basis/opengl/gl/gl.factor
@@ -3,8 +3,9 @@
 
 ! This file is based on the gl.h that comes with xorg-x11 6.8.2
 
-USING: alien alien.c-types alien.syntax combinators kernel parser
-sequences system words opengl.gl.extensions io.encodings.ascii ;
+USING: alien alien.c-types alien.libraries alien.syntax
+combinators kernel parser sequences system words
+opengl.gl.extensions io.encodings.ascii ;
 FROM: alien.c-types => short ;
 IN: opengl.gl
 
@@ -628,6 +629,13 @@ CONSTANT: GL_CLIENT_ALL_ATTRIB_BITS         0xFFFFFFFF
 
 LIBRARY: gl
 
+<<
+"gl" {
+    { [ os macosx? ] [ drop ] }
+    { [ os unix? ] [ "libGL.so" cdecl add-library ] }
+} cond
+>>
+
 ! Miscellaneous
 
 FUNCTION: void glClearIndex ( GLfloat c ) ;

diff --git a/basis/pango/cairo/ffi/ffi.factor b/basis/pango/cairo/ffi/ffi.factor
index d9038090d1b6168759c74a6398ae1c60d7d9b011..6537d86c3aca6492e86605baa31049197a11523b 100644 (file)
--- a/basis/pango/cairo/ffi/ffi.factor
+++ b/basis/pango/cairo/ffi/ffi.factor
@@ -14,7 +14,7 @@ LIBRARY: pango.cairo
 "pango.cairo" {
     { [ os windows? ] [ "libpangocairo-1.0-0.dll" cdecl add-library ] }
     { [ os macosx? ] [ drop ] }
-    { [ os unix? ] [ drop ] }
+    { [ os unix? ] [ "libpangocairo-1.0.so" cdecl add-library ] }
 } cond 
 >>
 

diff --git a/basis/pango/ffi/ffi.factor b/basis/pango/ffi/ffi.factor
index 5c7d99dc5e885cbbbe374bee71bbfa0fd4cd9718..21ccfa41d24fd37a623e1566abab53573cd599e3 100644 (file)
--- a/basis/pango/ffi/ffi.factor
+++ b/basis/pango/ffi/ffi.factor
@@ -14,8 +14,9 @@ LIBRARY: pango
 << 
 "pango" {
     { [ os windows? ] [ "libpango-1.0-0.dll" cdecl add-library ] }
-    { [ os unix? ] [ drop ] }
-} cond 
+    { [ os macosx? ] [ drop ] }
+    { [ os unix? ] [ "libpango-1.0.so" cdecl add-library ] }
+} cond
 >>
 
 IMPLEMENT-STRUCTS: PangoRectangle ;