debug

euslisp · Dec 10, 2024 · ee29003 · ee29003
1 parent 8e86010
commit ee29003
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);