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

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

db4
Slava Pestov 2011-02-27 16:36:01 -06:00
parent ebce40a4c0
commit d6fe7f4c28
11 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
basis/atk/ffi/ffi.factor
View File

@ -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
>>

3
basis/gdk/ffi/ffi.factor
View File

@ -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
>>

8
basis/gdk/gl/ffi/ffi.factor
View File

@ -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

3
basis/gdk/pixbuf/ffi/ffi.factor
View File

@ -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
>>

3
basis/gio/ffi/ffi.factor
View File

@ -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
>>

6
basis/glib/ffi/ffi.factor
View File

@ -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
>>

5
basis/gobject/ffi/ffi.factor
View File

@ -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
>>

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

@ -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
>>

6
basis/pango/cairo/ffi/ffi.factor
View File

@ -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
>>

5
basis/pango/ffi/ffi.factor
View File

@ -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
>>

2
vm/Config.unix
View File

@ -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