From e074699bebaeea7013032324c841b63d92a90040 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@lellan.com>
Date: Sat, 18 Feb 2023 22:44:26 -0800
Subject: [PATCH 01/26] Add extra arg to makeright to allow choice of arm64 or
 x64 on Darwin (MacOS) platform.  Enables cross-compiles bertween x64 and
 arm64 Macs.

---
 bin/makefile-darwin.aarch64-x |  4 ++--
 bin/makefile-darwin.x86_64-x  |  3 ++-
 bin/makeright                 | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x
index a92219f..0d513bd 100644
--- a/bin/makefile-darwin.aarch64-x
+++ b/bin/makefile-darwin.aarch64-x
@@ -1,6 +1,6 @@
-# Options for MacOS, x86 processor, X windows
+# Options for MacOS, arm64 (aka aarch64)  processor, X windows
 
-CC = clang $(CLANG_CFLAGS)
+CC = clang  -target arm64-apple-darwin13 $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \
diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x
index e17f10b..46cad50 100644
--- a/bin/makefile-darwin.x86_64-x
+++ b/bin/makefile-darwin.x86_64-x
@@ -1,6 +1,6 @@
 # Options for MacOS, x86 processor, X windows
 
-CC = clang -m64 $(CLANG_CFLAGS)
+CC = clang -target x86_64-apple-darwin13 $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \
@@ -26,3 +26,4 @@ LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm
 OBJECTDIR = ../$(RELEASENAME)/
 
 default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
+
diff --git a/bin/makeright b/bin/makeright
index 1fde522..e8407a0 100755
--- a/bin/makeright
+++ b/bin/makeright
@@ -54,9 +54,30 @@ if test $# -gt 0
 	shift
 fi
 
+target_arch="$1"
+
+if test $# -gt 0
+    then
+	shift
+fi
+
 architecture=`machinetype`
 osversion=`osversion`
+
+if test "$osversion" != "darwin"
+   then
+       echo "WARNING: target architecture applies only to the Darwin (MacOS) platform":
+       echo "Ignoring target architecture argument: $target"
+elif test "$target_arch" = "x86_64"
+   then
+       architecure=$target_arch
+elif test "$target_arch" = "aarch64"
+   then
+       architecure=$target_arch
+fi
+
 echo "making so far for ${osversion} on ${architecture}."
+
 case "$display" in
 	init)	display=single
 		releasename=init-${osversion}.${architecture}

From 6d575a8f2240093169057b693a88f0fb86eb64e1 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@lellan.com>
Date: Sun, 19 Feb 2023 00:33:27 -0800
Subject: [PATCH 02/26] Updating darwin makefile-inits for cross-compilation

---
 bin/makefile-init-darwin.aarch64 |  2 +-
 bin/makefile-init-darwin.x86_64  |  2 +-
 bin/makeright                    | 24 +++++++++++++++---------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/bin/makefile-init-darwin.aarch64 b/bin/makefile-init-darwin.aarch64
index 1314d4f..9a51ad1 100644
--- a/bin/makefile-init-darwin.aarch64
+++ b/bin/makefile-init-darwin.aarch64
@@ -1,6 +1,6 @@
 # Options for MacOS, aarch64 processor, X windows, for INIT processing
 
-CC = clang $(CLANG_CFLAGS)
+CC = clang -target arm64-apple-darwin13 $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
         $(OBJECTDIR)xbbt.o \
diff --git a/bin/makefile-init-darwin.x86_64 b/bin/makefile-init-darwin.x86_64
index 322b4a8..f8f205c 100644
--- a/bin/makefile-init-darwin.x86_64
+++ b/bin/makefile-init-darwin.x86_64
@@ -1,6 +1,6 @@
 # Options for MacOS, x86_64 processor, X windows, for INIT processing
 
-CC = clang -m64 $(CLANG_CFLAGS)
+CC = clang -m64 -target x86_64-apple-darwin13 $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \
diff --git a/bin/makeright b/bin/makeright
index e8407a0..0bbb5d0 100755
--- a/bin/makeright
+++ b/bin/makeright
@@ -64,16 +64,22 @@ fi
 architecture=`machinetype`
 osversion=`osversion`
 
-if test "$osversion" != "darwin"
+if test "$target_arch" != ""
    then
-       echo "WARNING: target architecture applies only to the Darwin (MacOS) platform":
-       echo "Ignoring target architecture argument: $target"
-elif test "$target_arch" = "x86_64"
-   then
-       architecure=$target_arch
-elif test "$target_arch" = "aarch64"
-   then
-       architecure=$target_arch
+       if test "$osversion" != "darwin"
+          then
+              echo "!!!!!!!!!! WARNING: target architecture applies only to the Darwin (MacOS) platform"
+              echo "!!!!!!!!!! Ignoring target architecture argument: $target_arch"
+       elif test "$target_arch" = "x86_64"
+          then
+               architecture=$target_arch
+       elif test "$target_arch" = "aarch64"
+          then
+               architecture=$target_arch
+       else
+          echo "!!!!!!!!! WARNING: Unknown target architecture: $target_arch"
+          echo "!!!!!!!!! Ignoring second argument."
+       fi
 fi
 
 echo "making so far for ${osversion} on ${architecture}."

From 6f71e2b1979438980621facaf73cde53e8c91f64 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@lellan.com>
Date: Sun, 19 Feb 2023 22:20:01 -0800
Subject: [PATCH 03/26] Return makeright to original and use LDEARCH env
 variable instaed; update darwin makefielsd with --target param; update
 buildReleaseInclDocker workflow to build both x86_64 and aarch64 binaries as
 well as universal binaries.

---
 .github/workflows/buildReleaseInclDocker.yml | 81 ++++++++++++++------
 .gitignore                                   |  1 +
 bin/makefile-darwin.aarch64-x                |  2 +-
 bin/makefile-darwin.x86_64-x                 |  2 +-
 bin/makefile-init-darwin.aarch64             |  2 +-
 bin/makefile-init-darwin.x86_64              |  2 +-
 bin/makeright                                | 27 -------
 7 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 5ac0481..410a60c 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -27,6 +27,12 @@ env:
 on: 
     workflow_dispatch:
       inputs:
+        draft:
+          description: "Mark this as a draft release"
+          type: choice
+          options:
+          - 'false'
+          - 'true'
         force:
           description: "Force build even if build already successfully completed for this commit"
           type: choice
@@ -45,6 +51,11 @@ on:
           description: "'True' if maiko build completed successully"
           value: ${{ jobs.complete.outputs.build_successful }}
       inputs:
+        draft:
+          description: "Mark this as a draft release"
+          required: false
+          type: string
+          default: 'false'
         force:
           description: "Force build even if build already successfully completed for this commit"
           required: false
@@ -60,7 +71,8 @@ defaults:
 #  1.  Linux: Build/push a multiplatform Linux Docker image and use results to
 #      build/push Linux release assets.
 #
-#  2.  MacOs_x86_64:  Build maiko for MacOS on X86_64 then create and push release assets.
+#  2.  MacOs:  Build maiko for MacOS (x86_64, aarch64, and universal)  then create
+#      and push release assets.
 #
 
 jobs:
@@ -73,13 +85,20 @@ jobs:
   inputs:
     runs-on: ubuntu-latest
     outputs:
-      force: ${{ steps.force.outputs.force }}
+      draft: ${{ steps.one.outputs.draft }}
+      force: ${{ steps.one.outputs.force }}
     steps:
-      - id: force
+      - id: one
         run: >
           if [ '${{ toJSON(inputs) }}' = 'null'  ];
-          then echo ::set-output name=force::'${{ github.event.inputs.force }}'; echo "workflow_dispatch";
-          else echo ::set-output name=force::'${{ inputs.force }}'; echo "workflow_call";
+          then
+              echo "workflow_dispatch";
+              echo "draft=${{ github.event.inputs.draft }}" >> $GITHUB_OUTPUT;
+              echo "force=${{ github.event.inputs.force }}" >> $GITHUB_OUTPUT;
+          else
+              echo "workflow_call";
+              echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT;
+              echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT;
           fi
         
 
@@ -234,7 +253,7 @@ jobs:
 
       # Push Release to github
       - name: Push the release
-        uses: ncipollo/release-action@v1.8.10
+        uses: ncipollo/release-action@v1
         with: 
           allowUpdates: true
           artifacts:
@@ -242,22 +261,22 @@ jobs:
             /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-linux.aarch64.tgz,
             /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-linux.armv7l.tgz
           tag: ${{ steps.tag.outputs.release_tag }}
-          draft: true
+          draft: ${{ needs.inputs.outputs.draft }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
 
 ######################################################################################
 
-  # MacOS: build for MacOS (X86_64) and use results to
+  # MacOS: build for MacOS (x86_64, aarch64, universal) and use results to
   # create and push release assets to github
-  macos_x86_64:
+  macos:
 
     needs: [inputs, sentry]
     if: |
       needs.sentry.outputs.release_not_built == 'true'
       || needs.inputs.outputs.force == 'true'
 
-    runs-on: macos-10.15
+    runs-on: macos-latest
 
     steps:
 
@@ -287,8 +306,20 @@ jobs:
       - name: Build
         working-directory: ./bin
         run: |
+          export LDEARCH=x86_64
           ./makeright x
           ./makeright init
+          export LDEARCH=aarch64
+          ./makeright x   
+          ./makeright init
+          mkdir -p ../darwin.universal
+          for exe in ldeinit lde ldex 
+          do
+            lipo -create \
+                 -arch arm64 ../darwin.aarch64/$exe}  \
+                 -arch x86_64 ../darwin.x86_64/${exe} \
+                 -output ../darwin.universal/${exe}
+          done
 
       # Create release tar for github.
       - name: Make release tar(s)
@@ -296,25 +327,29 @@ jobs:
           RELEASE_TAG: ${{ steps.tag.outputs.release_tag }}
         run: |
           mkdir -p /tmp/release_tars
-          pushd ${GITHUB_WORKSPACE}/../ >/dev/null
-          tar -c -z                                                       \
-            -f /tmp/release_tars/${RELEASE_TAG}-darwin.x86_64.tgz                  \
-            maiko/bin/osversion                                                    \
-            maiko/bin/machinetype                                                  \
-            maiko/bin/config.guess                                                 \
-            maiko/bin/config.sub                                                   \
-            maiko/darwin.x86_64/lde*
-          popd >/dev/null
+          cd ${GITHUB_WORKSPACE}/../
+          for arch in x86_64 aarch64 universal
+          do
+            tar -c -z                                                                \
+              -f /tmp/release_tars/${RELEASE_TAG}-darwin.${arch}.tgz                 \
+              maiko/bin/osversion                                                    \
+              maiko/bin/machinetype                                                  \
+              maiko/bin/config.guess                                                 \
+              maiko/bin/config.sub                                                   \
+              maiko/darwin.${arch}/lde*
+          done
 
       # Push Release
       - name: Push the release
-        uses: ncipollo/release-action@v1.8.10
+        uses: ncipollo/release-action@v1
         with: 
           allowUpdates: true
           artifacts:
-            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-darwin.x86_64.tgz
+            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-darwin.x86_64.tgz,
+            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-darwin.aarch64.tgz,
+            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-darwin.universal.tgz
           tag: ${{ steps.tag.outputs.release_tag }}
-          draft: true
+          draft: ${{ needs.inputs.outputs.draft }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
 
@@ -331,7 +366,7 @@ jobs:
     outputs:
       build_successful: ${{ steps.output.outputs.build_successful }}
 
-    needs: [inputs, sentry, linux, macos_x86_64]
+    needs: [inputs, sentry, linux, macos]
 
     steps: 
       # Checkout the actions for this repo owner
diff --git a/.gitignore b/.gitignore
index e809c7c..e5e23cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ cmake-build-*/**
 *.aarch64-x/**
 *.aarch64/**
 init.386/**
+*.universal/**
 # core files
 core
 *.core
diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x
index 0d513bd..f8948a0 100644
--- a/bin/makefile-darwin.aarch64-x
+++ b/bin/makefile-darwin.aarch64-x
@@ -1,6 +1,6 @@
 # Options for MacOS, arm64 (aka aarch64)  processor, X windows
 
-CC = clang  -target arm64-apple-darwin13 $(CLANG_CFLAGS)
+CC = clang  -target aarch64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \
diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x
index 46cad50..54d61d4 100644
--- a/bin/makefile-darwin.x86_64-x
+++ b/bin/makefile-darwin.x86_64-x
@@ -1,6 +1,6 @@
 # Options for MacOS, x86 processor, X windows
 
-CC = clang -target x86_64-apple-darwin13 $(CLANG_CFLAGS)
+CC = clang -target x86_64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \
diff --git a/bin/makefile-init-darwin.aarch64 b/bin/makefile-init-darwin.aarch64
index 9a51ad1..65cdfb3 100644
--- a/bin/makefile-init-darwin.aarch64
+++ b/bin/makefile-init-darwin.aarch64
@@ -1,6 +1,6 @@
 # Options for MacOS, aarch64 processor, X windows, for INIT processing
 
-CC = clang -target arm64-apple-darwin13 $(CLANG_CFLAGS)
+CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
         $(OBJECTDIR)xbbt.o \
diff --git a/bin/makefile-init-darwin.x86_64 b/bin/makefile-init-darwin.x86_64
index f8f205c..71288cf 100644
--- a/bin/makefile-init-darwin.x86_64
+++ b/bin/makefile-init-darwin.x86_64
@@ -1,6 +1,6 @@
 # Options for MacOS, x86_64 processor, X windows, for INIT processing
 
-CC = clang -m64 -target x86_64-apple-darwin13 $(CLANG_CFLAGS)
+CC = clang -m64 -target x86_64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \
diff --git a/bin/makeright b/bin/makeright
index 0bbb5d0..1fde522 100755
--- a/bin/makeright
+++ b/bin/makeright
@@ -54,36 +54,9 @@ if test $# -gt 0
 	shift
 fi
 
-target_arch="$1"
-
-if test $# -gt 0
-    then
-	shift
-fi
-
 architecture=`machinetype`
 osversion=`osversion`
-
-if test "$target_arch" != ""
-   then
-       if test "$osversion" != "darwin"
-          then
-              echo "!!!!!!!!!! WARNING: target architecture applies only to the Darwin (MacOS) platform"
-              echo "!!!!!!!!!! Ignoring target architecture argument: $target_arch"
-       elif test "$target_arch" = "x86_64"
-          then
-               architecture=$target_arch
-       elif test "$target_arch" = "aarch64"
-          then
-               architecture=$target_arch
-       else
-          echo "!!!!!!!!! WARNING: Unknown target architecture: $target_arch"
-          echo "!!!!!!!!! Ignoring second argument."
-       fi
-fi
-
 echo "making so far for ${osversion} on ${architecture}."
-
 case "$display" in
 	init)	display=single
 		releasename=init-${osversion}.${architecture}

From 10093bad15d03ae8056217f582ba9570f088fa72 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@lellan.com>
Date: Sun, 19 Feb 2023 22:41:08 -0800
Subject: [PATCH 04/26] Fixing LDEARCH in buildRelease....yml

---
 .github/workflows/buildReleaseInclDocker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 410a60c..6910d74 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -306,17 +306,17 @@ jobs:
       - name: Build
         working-directory: ./bin
         run: |
-          export LDEARCH=x86_64
+          export LDEARCH=x86_64-apple-darwin
           ./makeright x
           ./makeright init
-          export LDEARCH=aarch64
+          export LDEARCH=aarch64-apple-darwin
           ./makeright x   
           ./makeright init
           mkdir -p ../darwin.universal
           for exe in ldeinit lde ldex 
           do
             lipo -create \
-                 -arch arm64 ../darwin.aarch64/$exe}  \
+                 -arch arm64 ../darwin.aarch64/${exe}  \
                  -arch x86_64 ../darwin.x86_64/${exe} \
                  -output ../darwin.universal/${exe}
           done

From 29078cbb2cf19815598328273d33173da9fdd45c Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Sun, 4 Jun 2023 23:20:14 -0700
Subject: [PATCH 05/26] Updating actions versions as per move from node 12 to
 node 16; update set-output to be >> as per set-output being deprecated.

---
 .github/workflows/buildReleaseInclDocker.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 6910d74..7dba9cd 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -171,8 +171,8 @@ jobs:
           echo "DOCKER_NAMESPACE=${DOCKER_NAMESPACE}" >> ${GITHUB_ENV}
           DOCKER_IMAGE=${DOCKER_NAMESPACE}/${{ steps.tag.outputs.repo_name }}
           DOCKER_TAGS="${DOCKER_IMAGE}:latest,${DOCKER_IMAGE}:${RELEASE_TAG#*-}"
-          echo ::set-output name=build_time::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-          echo ::set-output name=docker_tags::${DOCKER_TAGS}
+          echo "build_time=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
+          echo "docker_tags=${DOCKER_TAGS}"  >> $GITHUB_OUTPUT
 
       # Setup the Docker Machine Emulation environment.  
       - name: Set up QEMU
@@ -187,7 +187,7 @@ jobs:
 
       # Login into DockerHub - required to store the created image
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -201,7 +201,7 @@ jobs:
       #
       - name: Build Docker Image for Push to Docker Hub
         if: ${{ true }}
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           builder: ${{ steps.buildx.outputs.name }}
           build-args: |
@@ -217,7 +217,7 @@ jobs:
       # Redo the Docker Build (hopefully mostly using the cache from the previous build).
       # But save the results in a directory under /tmp to be used for creating release tars.
       - name: Rebuild Docker Image For Saving Locally
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           builder: ${{ steps.buildx.outputs.name }}
           build-args: |
@@ -387,6 +387,7 @@ jobs:
       - name: Output
         id: output
         run: |
-          echo ::set-output name=build_successful::'true'
+          echo "build_successful=true"  >> $GITHUB_OUTPUT
+
           
 ######################################################################################

From 7b42a5b51ee0d59550b990698895445577c3bebf Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Mon, 5 Jun 2023 18:21:48 -0700
Subject: [PATCH 06/26] Update makefile-darwin*-sdl for cross compiling. 
 Update buildRelease workflow to handle compiling Darwin/SDL versions

---
 .github/workflows/buildReleaseInclDocker.yml | 19 +++++++++++--------
 bin/makefile-darwin.aarch64-sdl              |  4 ++--
 bin/makefile-darwin.aarch64-x                |  4 ++--
 bin/makefile-darwin.x86_64-sdl               |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 7dba9cd..bf4cdc0 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -139,9 +139,9 @@ jobs:
   linux:
   
     needs: [inputs, sentry]
-    if: |
-      needs.sentry.outputs.release_not_built == 'true'
-      || needs.inputs.outputs.force == 'true'
+    if: ${{ false }}
+#      needs.sentry.outputs.release_not_built == 'true'
+#      || needs.inputs.outputs.force == 'true'
     
     runs-on: ubuntu-latest
 
@@ -297,10 +297,11 @@ jobs:
         id: tag
         uses: ./../actions/release-tag-action
 
-      # Install X11 dependencies
+      # Install X11 and SDL dependencies
       - name: Install X11 dependencies on MacOS
-        if: ${{ runner.os == 'macOS'}}
-        run: brew install --cask xquartz
+        run: |
+          brew install --cask xquartz
+          brew install SDL2
 
       # Build maiko   
       - name: Build
@@ -308,12 +309,14 @@ jobs:
         run: |
           export LDEARCH=x86_64-apple-darwin
           ./makeright x
+          ./makeright sdl
           ./makeright init
           export LDEARCH=aarch64-apple-darwin
-          ./makeright x   
+          ./makeright x
+          ./makeright sdl 
           ./makeright init
           mkdir -p ../darwin.universal
-          for exe in ldeinit lde ldex 
+          for exe in ldeinit lde ldex ldesdl 
           do
             lipo -create \
                  -arch arm64 ../darwin.aarch64/${exe}  \
diff --git a/bin/makefile-darwin.aarch64-sdl b/bin/makefile-darwin.aarch64-sdl
index dc56a02..a527eb7 100644
--- a/bin/makefile-darwin.aarch64-sdl
+++ b/bin/makefile-darwin.aarch64-sdl
@@ -1,6 +1,6 @@
-# Options for MacOS, x86 processor, SDL
+# Options for MacOS, arm64 (aka aarch64) processor, SDL
 
-CC = clang $(CLANG_CFLAGS)
+CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x
index f8948a0..867eb5d 100644
--- a/bin/makefile-darwin.aarch64-x
+++ b/bin/makefile-darwin.aarch64-x
@@ -1,6 +1,6 @@
-# Options for MacOS, arm64 (aka aarch64)  processor, X windows
+# Options for MacOS, arm64 (aka aarch64) processor, X windows
 
-CC = clang  -target aarch64-apple-darwin $(CLANG_CFLAGS)
+CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \
diff --git a/bin/makefile-darwin.x86_64-sdl b/bin/makefile-darwin.x86_64-sdl
index 94604b0..f84e13e 100644
--- a/bin/makefile-darwin.x86_64-sdl
+++ b/bin/makefile-darwin.x86_64-sdl
@@ -1,6 +1,6 @@
 # Options for MacOS, x86 processor, SDL
 
-CC = clang -m64 $(CLANG_CFLAGS)
+CC = clang -m64 -target x86_64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 

From c49fa46c707e0e150c218e342518de0f9a0b498e Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Mon, 5 Jun 2023 23:13:48 -0700
Subject: [PATCH 07/26] Change way we download Darwin SDL framework since brew
 places things in wrong place

---
 .github/workflows/buildReleaseInclDocker.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index bf4cdc0..addb5b1 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -297,11 +297,19 @@ jobs:
         id: tag
         uses: ./../actions/release-tag-action
 
-      # Install X11 and SDL dependencies
+      # Install X11 dependencies
       - name: Install X11 dependencies on MacOS
         run: |
           brew install --cask xquartz
-          brew install SDL2
+
+      # Install SDL dependencies
+      - name: Install SDL2 dependencies on MacOS
+        run: |
+          gh release download release-2.26.5 --repo libsdl-org/SDL --pattern SDL2-2.26.5.dmg
+          hdiutil attach SDL2-2.26.5.dmg
+          cd /Volumes/SDL2/
+          cp SDL2.framework /Library/Frameworks
+          hdiutil detach /Volumes/SDL2/
 
       # Build maiko   
       - name: Build

From f6f6653de06f3210cf94065073799ec472943bc0 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Mon, 5 Jun 2023 23:23:18 -0700
Subject: [PATCH 08/26] Add GH_TOKEN to gh download release of SDL2 for MacOS

---
 .github/workflows/buildReleaseInclDocker.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index addb5b1..9283026 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -304,6 +304,8 @@ jobs:
 
       # Install SDL dependencies
       - name: Install SDL2 dependencies on MacOS
+        env:
+          GH_TOKEN: ${{ github.token }}
         run: |
           gh release download release-2.26.5 --repo libsdl-org/SDL --pattern SDL2-2.26.5.dmg
           hdiutil attach SDL2-2.26.5.dmg

From 1b52f9fa44dc49e99134173e013235235e7bccd0 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Tue, 6 Jun 2023 12:01:15 -0700
Subject: [PATCH 09/26] Fix copy of SDL2.framework

---
 .github/workflows/buildReleaseInclDocker.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 9283026..8d06380 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -309,8 +309,7 @@ jobs:
         run: |
           gh release download release-2.26.5 --repo libsdl-org/SDL --pattern SDL2-2.26.5.dmg
           hdiutil attach SDL2-2.26.5.dmg
-          cd /Volumes/SDL2/
-          cp SDL2.framework /Library/Frameworks
+          cp -r /Volumes/SDL2/SDL2.framework /Library/Frameworks
           hdiutil detach /Volumes/SDL2/
 
       # Build maiko   

From c7c25e7c4d7bb7b054734ad9241e2fa161deae1c Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Tue, 6 Jun 2023 12:28:46 -0700
Subject: [PATCH 10/26] Change cp to ditto for copy of SDL2.framework

---
 .github/workflows/buildReleaseInclDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 8d06380..976f0b3 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -309,7 +309,7 @@ jobs:
         run: |
           gh release download release-2.26.5 --repo libsdl-org/SDL --pattern SDL2-2.26.5.dmg
           hdiutil attach SDL2-2.26.5.dmg
-          cp -r /Volumes/SDL2/SDL2.framework /Library/Frameworks
+          ditto /Volumes/SDL2/SDL2.framework /Library/Frameworks/SDL2.framework
           hdiutil detach /Volumes/SDL2/
 
       # Build maiko   

From 02b15a0cb04f6f143372e30640d9456583389694 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Tue, 6 Jun 2023 12:46:39 -0700
Subject: [PATCH 11/26] Try sudo ditto for copy of SDL2.framework

---
 .github/workflows/buildReleaseInclDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 976f0b3..933e056 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -309,7 +309,7 @@ jobs:
         run: |
           gh release download release-2.26.5 --repo libsdl-org/SDL --pattern SDL2-2.26.5.dmg
           hdiutil attach SDL2-2.26.5.dmg
-          ditto /Volumes/SDL2/SDL2.framework /Library/Frameworks/SDL2.framework
+          sudo ditto /Volumes/SDL2/SDL2.framework /Library/Frameworks/SDL2.framework
           hdiutil detach /Volumes/SDL2/
 
       # Build maiko   

From b91fdfe40ba48894e664bbdcea88dc75bd8c03e6 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Tue, 6 Jun 2023 22:59:43 -0700
Subject: [PATCH 12/26] Changing MacOS build for lde, ldex, ldesdl to use cmake
 rather than makeright to make sure that lde can use both ldex and ldesdl

---
 .github/workflows/buildReleaseInclDocker.yml | 38 ++++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 933e056..b908824 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -313,25 +313,41 @@ jobs:
           hdiutil detach /Volumes/SDL2/
 
       # Build maiko   
-      - name: Build
+      - name: Build ldeinit
         working-directory: ./bin
         run: |
           export LDEARCH=x86_64-apple-darwin
-          ./makeright x
-          ./makeright sdl
           ./makeright init
           export LDEARCH=aarch64-apple-darwin
-          ./makeright x
-          ./makeright sdl 
           ./makeright init
           mkdir -p ../darwin.universal
-          for exe in ldeinit lde ldex ldesdl 
+          exe=ldeinit 
+          lipo -create \
+               -arch arm64 ../darwin.aarch64/${exe}  \
+               -arch x86_64 ../darwin.x86_64/${exe} \
+               -output ../darwin.universal/${exe}
+      
+      - name: Build lde, ldex, & ldesdl
+        run: |
+          mkdir build
+          cd build
+          cmake .. -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 \
+                   -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
+                   -DMAIKO_DISPLAY_SDL=ON \
+                   -DMAIKO_DISPLAY_X11=ON
+          make
+          for arch in x86_64 aarch64 universal
           do
-            lipo -create \
-                 -arch arm64 ../darwin.aarch64/${exe}  \
-                 -arch x86_64 ../darwin.x86_64/${exe} \
-                 -output ../darwin.universal/${exe}
-          done
+            for exe in lde ldex ldesdl
+            do
+              if [ "${arch}" != "universal" ]
+              then 
+                lipo ${exe} -output ../darwin.${arch}/${exe} -extract ${arch}
+              else
+                cp -p ${exe} ../darwin.${arch}/${exe}
+              fi
+            done
+          done  
 
       # Create release tar for github.
       - name: Make release tar(s)

From 3f2db4883b3af5ea0a837bec09ce4ab06975837a Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Tue, 6 Jun 2023 23:46:11 -0700
Subject: [PATCH 13/26] Debugging cmake build

---
 .github/workflows/buildReleaseInclDocker.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index b908824..82d829b 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -331,11 +331,13 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 \
-                   -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
-                   -DMAIKO_DISPLAY_SDL=ON \
-                   -DMAIKO_DISPLAY_X11=ON
-          make
+# -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12
+          cmake .. \
+            -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
+            -DMAIKO_DISPLAY_SDL=ON \
+            -DMAIKO_DISPLAY_X11=ON \ 
+            -DCMAKE_BUILD_TYPE=Release
+          cmake --build . --config Release
           for arch in x86_64 aarch64 universal
           do
             for exe in lde ldex ldesdl

From 9742a0fad9409680e4c9a3dd42ff11ebe55256e7 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Tue, 6 Jun 2023 23:49:40 -0700
Subject: [PATCH 14/26] Debugging cmake build #2

---
 .github/workflows/buildReleaseInclDocker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 82d829b..e6c8b1d 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -326,12 +326,12 @@ jobs:
                -arch arm64 ../darwin.aarch64/${exe}  \
                -arch x86_64 ../darwin.x86_64/${exe} \
                -output ../darwin.universal/${exe}
-      
+
       - name: Build lde, ldex, & ldesdl
         run: |
           mkdir build
           cd build
-# -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12
+          # -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12
           cmake .. \
             -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
             -DMAIKO_DISPLAY_SDL=ON \

From 0cffe64c902b25cdf9960c17997820eeaef4eaa7 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 00:18:47 -0700
Subject: [PATCH 15/26] Debugging cmake build #3

---
 .github/workflows/buildReleaseInclDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index e6c8b1d..83169f0 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -335,7 +335,7 @@ jobs:
           cmake .. \
             -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
             -DMAIKO_DISPLAY_SDL=ON \
-            -DMAIKO_DISPLAY_X11=ON \ 
+            -DMAIKO_DISPLAY_X11=ON \
             -DCMAKE_BUILD_TYPE=Release
           cmake --build . --config Release
           for arch in x86_64 aarch64 universal

From 985966925e0f50911a9e61c146d0807d2cd6c1db Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 13:40:28 -0700
Subject: [PATCH 16/26] Debugging cmake build #4

---
 .github/workflows/buildReleaseInclDocker.yml | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 83169f0..08cf688 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -298,10 +298,31 @@ jobs:
         uses: ./../actions/release-tag-action
 
       # Install X11 dependencies
+      - name: List
+        run: |
+          echo "---------------------------------------------------------------------"
+          ls -l /usr/local/lib/libX11*
+          echo "---------------------------------------------------------------------"
+          ls -l /opt/X11
+          echo "---------------------------------------------------------------------"
+          ls -l /private/var/select/X11
+          echo "---------------------------------------------------------------------"
+
+
       - name: Install X11 dependencies on MacOS
         run: |
           brew install --cask xquartz
 
+      - name: List2
+        run: |
+          echo "---------------------------------------------------------------------"
+          ls -l /usr/local/lib/libX11*
+          echo "---------------------------------------------------------------------"
+          ls -l /opt/X11
+          echo "---------------------------------------------------------------------"
+          ls -l /private/var/select/X11
+          echo "---------------------------------------------------------------------"
+
       # Install SDL dependencies
       - name: Install SDL2 dependencies on MacOS
         env:

From 79f3149c4ec55ca330ea4bcf1ccfeecb56736d20 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 13:55:33 -0700
Subject: [PATCH 17/26] Debugging cmake build #4

---
 .github/workflows/buildReleaseInclDocker.yml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 08cf688..6fc9148 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -302,26 +302,36 @@ jobs:
         run: |
           echo "---------------------------------------------------------------------"
           ls -l /usr/local/lib/libX11*
+        continue-on-error: true
+      - run: |
+          echo "---------------------------------------------------------------------"
+          ls -l /private/var/select/X11
+        continue-on-error: true
+      - run: |
           echo "---------------------------------------------------------------------"
           ls -l /opt/X11
           echo "---------------------------------------------------------------------"
-          ls -l /private/var/select/X11
-          echo "---------------------------------------------------------------------"
-
+        continue-on-error: true
 
       - name: Install X11 dependencies on MacOS
         run: |
           brew install --cask xquartz
 
       - name: List2
+        run: |
         run: |
           echo "---------------------------------------------------------------------"
           ls -l /usr/local/lib/libX11*
+        continue-on-error: true
+      - run: |
+          echo "---------------------------------------------------------------------"
+          ls -l /private/var/select/X11
+        continue-on-error: true
+      - run: |
           echo "---------------------------------------------------------------------"
           ls -l /opt/X11
           echo "---------------------------------------------------------------------"
-          ls -l /private/var/select/X11
-          echo "---------------------------------------------------------------------"
+        continue-on-error: true
 
       # Install SDL dependencies
       - name: Install SDL2 dependencies on MacOS

From 72850faf9680136ebe67055eef1ce0b30f768ecb Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 13:58:13 -0700
Subject: [PATCH 18/26] Debugging cmake build #6

---
 .github/workflows/buildReleaseInclDocker.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 6fc9148..fde1234 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -318,7 +318,6 @@ jobs:
           brew install --cask xquartz
 
       - name: List2
-        run: |
         run: |
           echo "---------------------------------------------------------------------"
           ls -l /usr/local/lib/libX11*

From 2a3aaa67049fe3b593e4ee5f4cef122bdd3a3694 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 16:30:47 -0700
Subject: [PATCH 19/26] Debugging cmake build #6

---
 .github/workflows/buildReleaseInclDocker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index fde1234..9d8d58a 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -315,6 +315,7 @@ jobs:
 
       - name: Install X11 dependencies on MacOS
         run: |
+          brew uninstall libx11
           brew install --cask xquartz
 
       - name: List2

From efaa97aa5f5822099eaf39b399fa07083924e56c Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 16:43:23 -0700
Subject: [PATCH 20/26] Debugging cmake build #6

---
 .github/workflows/buildReleaseInclDocker.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 9d8d58a..9519573 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -313,9 +313,15 @@ jobs:
           echo "---------------------------------------------------------------------"
         continue-on-error: true
 
+      - name: Unistall X components already on the runner
+        run: |
+          brew uninstall --ignore-dependencies libxft
+          brew uninstall --ignore-dependencies libxrender
+          brew uninstall --ignore-dependencies libxext
+          brew uninstall --ignore-dependencies libx11
+
       - name: Install X11 dependencies on MacOS
         run: |
-          brew uninstall libx11
           brew install --cask xquartz
 
       - name: List2

From 9e6611a47b683d4f79683d837f8ffa90e90f3e35 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 17:11:05 -0700
Subject: [PATCH 21/26] Debugging cmake build #6

---
 .github/workflows/buildReleaseInclDocker.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 9519573..eacb8da 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -321,8 +321,11 @@ jobs:
           brew uninstall --ignore-dependencies libx11
 
       - name: Install X11 dependencies on MacOS
+        env:
+          GH_TOKEN: ${{ github.token }}
         run: |
-          brew install --cask xquartz
+          gh release download XQuartz-2.8.5 --repo XQuartz/XQuartz --pattern XQuartz-2.8.5.pkg
+          installer -pkg ./XQuartz-2.8.5.pkg -target /
 
       - name: List2
         run: |

From ab2ddce6213bd4985cabf41ccefc81184288792e Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 17:14:36 -0700
Subject: [PATCH 22/26] Debugging cmake build #6

---
 .github/workflows/buildReleaseInclDocker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index eacb8da..a4149d7 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -325,7 +325,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           gh release download XQuartz-2.8.5 --repo XQuartz/XQuartz --pattern XQuartz-2.8.5.pkg
-          installer -pkg ./XQuartz-2.8.5.pkg -target /
+          sudo installer -pkg ./XQuartz-2.8.5.pkg -target /
 
       - name: List2
         run: |

From b7bcbc1a8507c256defa0f7e818da121b49bcf82 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 17:28:47 -0700
Subject: [PATCH 23/26] Debugging cmake build #6

---
 .github/workflows/buildReleaseInclDocker.yml | 36 ++++++--------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index a4149d7..972ffb9 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -297,22 +297,15 @@ jobs:
         id: tag
         uses: ./../actions/release-tag-action
 
-      # Install X11 dependencies
       - name: List
         run: |
           echo "---------------------------------------------------------------------"
-          ls -l /usr/local/lib/libX11*
-        continue-on-error: true
-      - run: |
-          echo "---------------------------------------------------------------------"
-          ls -l /private/var/select/X11
-        continue-on-error: true
-      - run: |
-          echo "---------------------------------------------------------------------"
-          ls -l /opt/X11
+          ls -l /usr/local/include
+          ls -l /usr/local/include/X11
           echo "---------------------------------------------------------------------"
         continue-on-error: true
 
+      # Install X11 dependencies
       - name: Unistall X components already on the runner
         run: |
           brew uninstall --ignore-dependencies libxft
@@ -320,6 +313,14 @@ jobs:
           brew uninstall --ignore-dependencies libxext
           brew uninstall --ignore-dependencies libx11
 
+      - name: List2
+        run: |
+          echo "---------------------------------------------------------------------"
+          ls -l /usr/local/include
+          ls -l /usr/local/include/X11
+          echo "---------------------------------------------------------------------"
+        continue-on-error: true
+
       - name: Install X11 dependencies on MacOS
         env:
           GH_TOKEN: ${{ github.token }}
@@ -327,21 +328,6 @@ jobs:
           gh release download XQuartz-2.8.5 --repo XQuartz/XQuartz --pattern XQuartz-2.8.5.pkg
           sudo installer -pkg ./XQuartz-2.8.5.pkg -target /
 
-      - name: List2
-        run: |
-          echo "---------------------------------------------------------------------"
-          ls -l /usr/local/lib/libX11*
-        continue-on-error: true
-      - run: |
-          echo "---------------------------------------------------------------------"
-          ls -l /private/var/select/X11
-        continue-on-error: true
-      - run: |
-          echo "---------------------------------------------------------------------"
-          ls -l /opt/X11
-          echo "---------------------------------------------------------------------"
-        continue-on-error: true
-
       # Install SDL dependencies
       - name: Install SDL2 dependencies on MacOS
         env:

From a6c38a04f46d663050384dff91bbd53c98d16b71 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 17:45:10 -0700
Subject: [PATCH 24/26] Debugging cmake build #6

---
 .github/workflows/buildReleaseInclDocker.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 972ffb9..8fce503 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -312,13 +312,23 @@ jobs:
           brew uninstall --ignore-dependencies libxrender
           brew uninstall --ignore-dependencies libxext
           brew uninstall --ignore-dependencies libx11
+          brew uninstall --ignore-dependencies xorgproto
+          brew uninstall --ignore-dependencies libxdmcp
+          brew uninstall --ignore-dependencies libxau
 
       - name: List2
         run: |
           echo "---------------------------------------------------------------------"
           ls -l /usr/local/include
+          echo "---------------------------------------------------------------------"
           ls -l /usr/local/include/X11
           echo "---------------------------------------------------------------------"
+          ls -l /usr/local/include/X11/dri
+          echo "---------------------------------------------------------------------"
+          ls -l /usr/local/include/X11/extensions
+          echo "--------------------------------------------------------------------"
+          ls -l /usr/local/include/X11/fonts
+          echo "---------------------------------------------------------------------"
         continue-on-error: true
 
       - name: Install X11 dependencies on MacOS

From 83cc2d2f363ae7d274ca201c17ba9248d9bf0569 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 18:02:31 -0700
Subject: [PATCH 25/26] Debugging cmake build #6

---
 .github/workflows/buildReleaseInclDocker.yml | 39 +++-----------------
 1 file changed, 5 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index 8fce503..b9eb767 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -297,15 +297,7 @@ jobs:
         id: tag
         uses: ./../actions/release-tag-action
 
-      - name: List
-        run: |
-          echo "---------------------------------------------------------------------"
-          ls -l /usr/local/include
-          ls -l /usr/local/include/X11
-          echo "---------------------------------------------------------------------"
-        continue-on-error: true
-
-      # Install X11 dependencies
+      # Uninstall exisitng X11 stuff preconfigured on runner then install correct X11 dependencies
       - name: Unistall X components already on the runner
         run: |
           brew uninstall --ignore-dependencies libxft
@@ -316,21 +308,6 @@ jobs:
           brew uninstall --ignore-dependencies libxdmcp
           brew uninstall --ignore-dependencies libxau
 
-      - name: List2
-        run: |
-          echo "---------------------------------------------------------------------"
-          ls -l /usr/local/include
-          echo "---------------------------------------------------------------------"
-          ls -l /usr/local/include/X11
-          echo "---------------------------------------------------------------------"
-          ls -l /usr/local/include/X11/dri
-          echo "---------------------------------------------------------------------"
-          ls -l /usr/local/include/X11/extensions
-          echo "--------------------------------------------------------------------"
-          ls -l /usr/local/include/X11/fonts
-          echo "---------------------------------------------------------------------"
-        continue-on-error: true
-
       - name: Install X11 dependencies on MacOS
         env:
           GH_TOKEN: ${{ github.token }}
@@ -374,17 +351,11 @@ jobs:
             -DMAIKO_DISPLAY_X11=ON \
             -DCMAKE_BUILD_TYPE=Release
           cmake --build . --config Release
-          for arch in x86_64 aarch64 universal
+          for exe in lde ldex ldesdl
           do
-            for exe in lde ldex ldesdl
-            do
-              if [ "${arch}" != "universal" ]
-              then 
-                lipo ${exe} -output ../darwin.${arch}/${exe} -extract ${arch}
-              else
-                cp -p ${exe} ../darwin.${arch}/${exe}
-              fi
-            done
+            lipo ${exe} -output ../darwin.x86_64/${exe} -extract x86_64
+            lipo ${exe} -output ../darwin.aarch64/${exe} -extract arm64
+            cp -p ${exe} ../darwin.universal/${exe}
           done  
 
       # Create release tar for github.

From 90899d01fd2534dacadfa0acaf0fc926114a2e63 Mon Sep 17 00:00:00 2001
From: Frank Halasz <fghalasz@interlisp.org>
Date: Wed, 7 Jun 2023 22:06:05 -0700
Subject: [PATCH 26/26] Remove debugging code

---
 .github/workflows/buildReleaseInclDocker.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/buildReleaseInclDocker.yml b/.github/workflows/buildReleaseInclDocker.yml
index b9eb767..7cebfac 100644
--- a/.github/workflows/buildReleaseInclDocker.yml
+++ b/.github/workflows/buildReleaseInclDocker.yml
@@ -139,9 +139,9 @@ jobs:
   linux:
   
     needs: [inputs, sentry]
-    if: ${{ false }}
-#      needs.sentry.outputs.release_not_built == 'true'
-#      || needs.inputs.outputs.force == 'true'
+    if: |
+      needs.sentry.outputs.release_not_built == 'true'
+      || needs.inputs.outputs.force == 'true'
     
     runs-on: ubuntu-latest