From 7b522ee407f3673cc96f2a2446d23e52715b19c1 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 11 Jun 2008 19:12:24 -0700 Subject: [PATCH] add XBell to xlib. workaround for Leopard linking to X11 libGL --- extra/x11/xlib/xlib.factor | 2 ++ vm/Config.macosx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/extra/x11/xlib/xlib.factor b/extra/x11/xlib/xlib.factor index 3c0ae24a70..6cf165f2fd 100755 --- a/extra/x11/xlib/xlib.factor +++ b/extra/x11/xlib/xlib.factor @@ -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 diff --git a/vm/Config.macosx b/vm/Config.macosx index 40eeb91322..54078cfe8d 100644 --- a/vm/Config.macosx +++ b/vm/Config.macosx @@ -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