From ee29003d5335cefdff8a66e88b87f940ad6a6132 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Tue, 10 Dec 2024 09:20:15 +0900 Subject: [PATCH] debug --- .travis.sh | 3 --- lisp/xwindow/xforeign.c.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.sh b/.travis.sh index 9636582aa..95cc57cca 100755 --- a/.travis.sh +++ b/.travis.sh @@ -72,12 +72,9 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then export HOMEBREW_CURLRC=1 brew list jpeg &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install jpeg brew list libpng &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install libpng - brew list libx11 &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install libx11 brew list mesalib-glw &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install mesalib-glw brew list mesa-glu &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install mesa-glu brew list bullet &>/dev/null || HOMEBREW_NO_AUTO_UPDATE=1 brew install bullet - find /opt /usr | grep libGL || echo "OK" - find /opt /usr | grep libX11 || echo "OK" travis_time_end fi diff --git a/lisp/xwindow/xforeign.c.c b/lisp/xwindow/xforeign.c.c index 65eed4814..913c68138 100644 --- a/lisp/xwindow/xforeign.c.c +++ b/lisp/xwindow/xforeign.c.c @@ -427,6 +427,8 @@ char *xentry; #elif Darwin eusinteger_t dlhandle; dlhandle=(eusinteger_t)dlopen("/opt/X11/lib/libX11.dylib", RTLD_LAZY); + if( dlhandle==0 ) + dlhandle=(eusinteger_t)dlopen("/usr/local/lib/libX11.dylib", RTLD_LAZY); if( dlhandle==0 ) dlhandle=(eusinteger_t)dlopen("libX11.dylib", RTLD_LAZY); entry=(eusinteger_t)dlsym(dlhandle, xentry);