Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
run: make test
- uses: actions/upload-artifact@v4
with:
name: macos-arm64
name: macos-universal
path: |
src/dgdebug
src/dialogc
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
# Create the bundle and add the prebuild binaries in
mkdir -p "$BUNDLE/prebuilt"
mv artifacts/linux-x86_64 "$BUNDLE/prebuilt/"
mv artifacts/macos-arm64 "$BUNDLE/prebuilt/"
mv artifacts/macos-universal "$BUNDLE/prebuilt/"
mv artifacts/win32 "$BUNDLE/prebuilt/"
chmod +x "$BUNDLE"/prebuilt/*/*
# Include all the other relevant files from the release
Expand Down
6 changes: 3 additions & 3 deletions manual/modules/ROOT/pages/software.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Versions from 2025 onward can be found here:

The archive contains the full source code for the Dialog compiler and
interactive debugger, as well as pre-built executable files for Linux
(x86_64) and Windows. The compiler is called `dialogc`, and the debugger
is called `dgdebug`.
(x86_64), OS X (single binaries for both Intel and ARM), and Windows.
The compiler is called `dialogc`, and the debugger is called `dgdebug`.

Alternately, if you are on OS X, you can install the
[Homebrew package manager](https://brew.sh/),
Expand Down Expand Up @@ -272,7 +272,7 @@ of a code change.

Performs an undo operation, and then re-enters the most recent line of input.
This command offers more fine-grained control than `@replay`, and generally
works better for games with randomized behaviour. It lets you focus on the local
works better for games with randomized behavior. It lets you focus on the local
effects of a code change.

@g::
Expand Down
6 changes: 6 additions & 0 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ WINLIB = ../prebuilt/win32
MINGW32 = i686-w64-mingw32-gcc
WINDRES = i686-w64-mingw32-windres

UNAME_S := $(shell uname -s)
ifeq (${UNAME_S},Darwin)
CFLAGS += -arch arm64 -arch x86_64
LDFLAGS += -arch arm64 -arch x86_64
endif

INSTALLDIR = /usr/local/bin

all: dialogc dgdebug
Expand Down
Loading