--- Makefile.orig 2022-04-14 16:47:41.000000000 +1000 +++ Makefile 2022-10-02 19:03:56.000000000 +1100 @@ -13,7 +13,7 @@ # These are good for regular use. #CFLAGS += -O2 -fomit-frame-pointer -falign-functions=2 -falign-loops=2 -falign-jumps=2 # These are handy for debugging. -CFLAGS += -g +#CFLAGS += -g # Define where you want Frotz installed PREFIX ?= /usr/local @@ -205,21 +205,6 @@ # macOS ifeq ($(UNAME_S),Darwin) MACOS = yes -# On macOS, we'll try to use Homebrew's ncurses -HOMEBREW_PREFIX ?= $(shell brew --prefix) -LDFLAGS += -L$(HOMEBREW_PREFIX)/lib - -CURSES_MACOS ?= ncurses -CURSES = $(CURSES_MACOS) - -CURSES_CONFIG ?= $(shell stat -f'%N' $(HOMEBREW_PREFIX)/opt/ncurses/bin/ncurses6-config) -# Reset CURSES_LDFLAGS, CURSES_CFLAGS. -CURSES_LDFLAGS = $(shell $(CURSES_CONFIG) --libs) -CURSES_CFLAGS = $(shell $(CURSES_CONFIG) --cflags) -ifeq ($(CURSES_CONFIG),) -$(error no ncurses6-config found. Install Homebrew and brew install ncurses, or set CURSES_CONFIG yourself) -endif -SDL_CFLAGS += -D_XOPEN_SOURCE endif --- src/curses/Makefile.orig 2022-04-14 16:47:41.000000000 +1000 +++ src/curses/Makefile 2022-10-02 19:07:31.000000000 +1100 @@ -19,10 +19,6 @@ ifeq ($(SOUND_TYPE), ao) ifneq ($(UNAME_S),Haiku) CFLAGS += -pthread -ifeq ($(UNAME_S),Darwin) -HOMEBREW_PREFIX ?= $(shell brew --prefix) -CFLAGS += -I$(HOMEBREW_PREFIX)/include -endif endif else ifeq ($(SOUND_TYPE), none) --- src/sdl/Makefile.orig 2022-04-14 16:47:41.000000000 +1000 +++ src/sdl/Makefile 2022-10-02 20:03:09.000000000 +1100 @@ -4,7 +4,7 @@ SDL_PKGS ?= libpng libjpeg sdl2 SDL2_mixer freetype2 zlib # Dependency generation requires GCC or clang. -CC = gcc +CC ?= gcc #CC = clang PKG_CONFIG ?= pkg-config