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

Merge commit 'jcg/master'

db4
Slava Pestov 2008-06-12 03:32:07 -05:00
parent 8b8a3d988f 1cb9f2342e
commit 92a8084f0f
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/ui/x11/x11.factor
View File

@ -258,7 +258,7 @@ M: x11-ui-backend ui ( -- )
] ui-running ;
M: x11-ui-backend beep ( -- )
dpy 100 XBell drop ;
dpy get 100 XBell drop ;
x11-ui-backend ui-backend set-global

2
extra/x11/xlib/xlib.factor
View File

@ -1354,6 +1354,8 @@ FUNCTION: Bool XSupportsLocale ( ) ;
FUNCTION: char* XSetLocaleModifiers ( char* modifier_list ) ;
FUNCTION: int XBell ( Display* dpy, int percent ) ;
SYMBOL: dpy
SYMBOL: scr
SYMBOL: root

2
vm/Config.macosx
View File

@ -6,7 +6,7 @@ PLAF_DLL_OBJS += vm/os-macosx.o vm/mach_signal.o
DLL_EXTENSION = .dylib
ifdef X11
LIBS = -lm -framework Foundation $(X11_UI_LIBS)
LIBS = -lm -framework Foundation $(X11_UI_LIBS) -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
else
LIBS = -lm -framework Cocoa -framework AppKit
endif