From ffa88142e8dd5c15db8dd0961fd3d4c29305fd03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= Date: Thu, 7 May 2026 21:30:59 +0900 Subject: [PATCH] =?UTF-8?q?macOS=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ Makefile | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b59bc9d..b5a2991 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.3.0 (????年??月??日) +* macOS対応 + ## 1.2.0 (2026年05月03日) * Debianでコンパイル出来る様に * マウス対応の追加 diff --git a/Makefile b/Makefile index 627da9d..933ee53 100644 --- a/Makefile +++ b/Makefile @@ -35,11 +35,17 @@ PREFIX = /usr PREFIX = /boot/home/config/non-packaged .endif -CFLAGS = -I/usr/include -I/usr/local/include -I/usr/pkg/include\ - -I/usr/pkg/include/ncurses -I/boot/system/develop/headers\ - -L/usr/lib -L/usr/local/lib -L/usr/pkg/lib -L/boot/system/develop/lib +CFLAGS = -I/usr/include -I/usr/local/include -L/usr/lib -L/usr/local/lib -.if ${UNAME_S} == "NetBSD" +.if ${OS} == "netbsd" +CFLAGS += -I/usr/pkg/include -I/usr/pkg/include/ncurses -L/usr/pkg/lib +.elif ${OS} == "macos" +CFLAGS += -I/opt/homebrew/opt/ncurses/include -L/opt/homebrew/opt/ncurses/lib +.elif ${OS} == "haiku" +CFLAGS += -I/boot/system/develop/headers -L/boot/system/develop/lib +.endif + +.if ${OS} == "netbsd" LDFLAGS = -lncurses .else LDFLAGS = -lncursesw @@ -52,6 +58,10 @@ all: ${CC} -O3 ${CFLAGS} -o ${NAME} ${FILES} -std=c++17 -static ${LDFLAGS} strip ${NAME} +mac: + ${CC} -O3 ${CFLAGS} -o ${NAME} ${FILES} -std=c++17 ${LDFLAGS} + strip ${NAME} + debian: ${CC} -O3 ${CFLAGS} -o ${NAME} ${FILES} -std=c++17 -static ${LDFLAGS} -ltinfo strip ${NAME}