add /opt/homebrew/lib for MacOS13

euslisp · Dec 9, 2024 · c1278a7 · c1278a7
1 parent 05907c4
commit c1278a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/fix-dylib-location.patch b/.github/workflows/fix-dylib-location.patch
@@ -2,20 +2,22 @@ diff --git a/irteus/irtgl.l b/irteus/irtgl.l
 index 4c417e61..afd606bc 100644
 --- a/irteus/irtgl.l
 +++ b/irteus/irtgl.l
-@@ -51,6 +51,8 @@
+@@ -51,6 +51,10 @@
     (cond
      ((probe-file "/opt/local/lib/libGL.dylib")
       (setq gl-lib ( load-foreign "/opt/local/lib/libGL.dylib")))
 +    ((probe-file "/usr/local/lib/libGL.dylib")
 +     (setq gl-lib ( load-foreign "/usr/local/lib/libGL.dylib")))
++    ((probe-file "/opt/homebrew/lib/libGL.dylib")
++     (setq gl-lib ( load-foreign "/opt/homebrew/lib/libGL.dylib")))
      (t
       (setq gl-lib ( load-foreign "/opt/X11/lib/libGL.dylib")))))
  #+:cygwin
 diff --git a/irteus/irtx.l b/irteus/irtx.l
 index 6a6761d4..4477b6ce 100644
 --- a/irteus/irtx.l
 +++ b/irteus/irtx.l
-@@ -76,9 +76,12 @@
+@@ -76,9 +76,14 @@
  (let (x-lib pname)
  #+:darwin
  #+:darwin
@@ -26,6 +28,8 @@ index 6a6761d4..4477b6ce 100644
 +        (setq pname "/opt/local/lib/libX11.dylib"))
 +       ((probe-file "/usr/local/lib/libX11.dylib")
 +        (setq pname "/usr/local/lib/libX11.dylib"))
++       ((probe-file "/opt/homebrew/lib/libX11.dylib")
++        (setq pname "/opt/homebrew/lib/libX11.dylib"))
 +       (t
 +        (setq pname "/opt/X11/lib/libX11.dylib")))
  #+:cygwin

diff --git a/lisp/Makefile.Darwin b/lisp/Makefile.Darwin
@@ -78,11 +78,11 @@ LD=gcc
 # On Solaris, XLIB and EUSLIB are combined together into lib/libeusx.so.
 
 RAWLIB=-ldl -lm -lpthread
-XLIB= -L/opt/local/lib -L/opt/X11/lib -lX11
+XLIB= -L/opt/local/lib -L/opt/X11/lib -L/opt/homebrew/lib -lX11
 
 # specify directories where euslisp's libraries are located.
 EUSLIB= -L$(ADLIBDIR)
-GLLIB= -L$/opt/X11/lib -lGLU -lGL -lXext -leusgl
+GLLIB= -L/opt/X11/lib -L/opt/homebrew/lib -lGLU -lGL -lXext -leusgl
 
 # POSIX Thread 
 THREADDEP=mthread_posix.c