On Unix, link VM with GTK libraries instead of loading them dynamically

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

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

diff --git a/basis/gdk/gl/ffi/ffi.factor b/basis/gdk/gl/ffi/ffi.factor
index 27ea883919ded5eec435988a21e81eba60d05175..d1f93cf62aeda35204719545b597b39b06f5ca18 100644 (file)
--- a/basis/gdk/gl/ffi/ffi.factor
+++ b/basis/gdk/gl/ffi/ffi.factor
@@ -10,12 +10,4 @@ IN: gdk.gl.ffi
 
 LIBRARY: gdk.gl
 
-<<
-"gdk.gl" {
-    { [ os winnt? ] [ drop ] }
-    { [ 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 ecc73bd5d4e6f0c5fd47e5a45a52a43fd2ff248c..113cf8d0c860cfae358c600ac9473c490afca31c 100644 (file)
--- a/basis/gdk/pixbuf/ffi/ffi.factor
+++ b/basis/gdk/pixbuf/ffi/ffi.factor
@@ -13,8 +13,7 @@ LIBRARY: gdk.pixbuf
 <<
 "gdk.pixbuf" {
     { [ os winnt? ] [ "libgdk_pixbuf-2.0-0.dll" cdecl add-library ] }
-    { [ os macosx? ] [ drop ] }
-    { [ os unix? ] [ "libgdk_pixbuf-2.0.so" cdecl add-library ] }
+    { [ os unix? ] [ drop ] }
 } cond
 >>
 

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

diff --git a/basis/glib/ffi/ffi.factor b/basis/glib/ffi/ffi.factor
index 0fd972f2269f500586343507280226f78ab089ea..860d34bb8d2277b6a89b9e5ce53ff043795bc81b 100644 (file)
--- a/basis/glib/ffi/ffi.factor
+++ b/basis/glib/ffi/ffi.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.destructors alien.libraries alien.syntax
-combinators gobject-introspection gobject-introspection.standard-types
-system ;
+combinators kernel gobject-introspection
+gobject-introspection.standard-types system ;
 IN: glib.ffi
 
 LIBRARY: glib
@@ -11,7 +11,7 @@ LIBRARY: glib
 "glib" {
     { [ os winnt? ] [ "libglib-2.0-0.dll" cdecl add-library ] }
     { [ os macosx? ] [ "/opt/local/lib/libglib-2.0.0.dylib" cdecl add-library ] }
-    { [ os unix? ] [ "libglib-2.0.so" cdecl add-library ] }
+    { [ os unix? ] [ drop ] }
 } cond
 >>
 

diff --git a/basis/gobject/ffi/ffi.factor b/basis/gobject/ffi/ffi.factor
index 070a2c5dea587e05442af11fc2de863203de0894..705adedb7e7fd8d4f3b3ca82f81851bd3ba78ef7 100644 (file)
--- a/basis/gobject/ffi/ffi.factor
+++ b/basis/gobject/ffi/ffi.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.destructors alien.libraries alien.syntax
+USING: alien alien.destructors alien.libraries alien.syntax kernel
 combinators gobject-introspection literals math system vocabs.loader ;
 IN: gobject.ffi
 
@@ -13,8 +13,7 @@ LIBRARY: gobject
 <<
 "gobject" {
     { [ os winnt? ] [ "libobject-2.0-0.dll" cdecl add-library ] }
-    { [ os macosx? ] [ "/opt/local/lib/libgobject-2.0.0.dylib" cdecl add-library ] }
-    { [ os unix? ] [ "libgobject-2.0.so" cdecl add-library ] }
+    { [ os unix? ] [ drop ] }
 } cond
 >>
 

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

diff --git a/basis/pango/cairo/ffi/ffi.factor b/basis/pango/cairo/ffi/ffi.factor
index 1b19ba6ab788b37e2371e37c363d99d06685623f..4cb61326e26a54b5268c17b42318c1969fd75005 100644 (file)
--- a/basis/pango/cairo/ffi/ffi.factor
+++ b/basis/pango/cairo/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax cairo.ffi combinators
-gobject-introspection system vocabs.loader ;
+kernel gobject-introspection system vocabs.loader ;
 IN: pango.cairo.ffi
 
 <<
@@ -13,8 +13,8 @@ LIBRARY: pango.cairo
 << 
 "pango.cairo" {
     { [ os winnt? ] [ "libpangocairo-1.0-0.dll" cdecl add-library ] }
-    { [ os macosx? ] [ "/opt/local/lib/libpangocairo-1.0.0.dylib" cdecl add-library ] }
-    { [ os unix? ] [ "libpangocairo-1.0.so" cdecl add-library ] }
+    { [ os macosx? ] [ drop ] }
+    { [ os unix? ] [ drop ] }
 } cond 
 >>
 

diff --git a/basis/pango/ffi/ffi.factor b/basis/pango/ffi/ffi.factor
index 4e05226edc75cba242c38ae3daf9d7924fca8d97..fb3cb3cdbfe6bac951d86669859eaf5f3860ebee 100644 (file)
--- a/basis/pango/ffi/ffi.factor
+++ b/basis/pango/ffi/ffi.factor
@@ -1,7 +1,7 @@
 ! 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
+alien.syntax combinators kernel gobject-introspection
 gobject-introspection.standard-types system vocabs.loader ;
 IN: pango.ffi
 
@@ -14,8 +14,7 @@ LIBRARY: pango
 << 
 "pango" {
     { [ os winnt? ] [ "libpango-1.0-0.dll" cdecl add-library ] }
-    { [ os macosx? ] [ "/opt/local/lib/libpango-1.0.0.dylib" cdecl add-library ] }
-    { [ os unix? ] [ "libpango-1.0.so" cdecl add-library ] }
+    { [ os unix? ] [ drop ] }
 } cond 
 >>
 

diff --git a/vm/Config.unix b/vm/Config.unix
index d7214a622b2a730c661eff77fc1f6d7279b5d78f..9289ae0ad48b22a65e4b1b5859362026ecea1ebe 100644 (file)
--- a/vm/Config.unix
+++ b/vm/Config.unix
@@ -14,7 +14,7 @@ PLAF_EXE_OBJS += vm/main-unix.o
 ifdef NO_UI
        X11_UI_LIBS =
 else
-       X11_UI_LIBS = -lpango-1.0 -lpangocairo-1.0 -lcairo -lglib-2.0 -lgobject-2.0 -lGL -lX11
+       X11_UI_LIBS = -lpango-1.0 -lpangocairo-1.0 -lcairo -lglib-2.0 -lgobject-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lgtkglext-x11-1.0 -latk-1.0 -lgio-2.0 -lgdkglext-x11-1.0 -lGL
 endif
 
 # CFLAGS += -fPIC