From 81583a602d526bf267d2426f84615e512567b29a Mon Sep 17 00:00:00 2001 From: Ryan Schmidt Date: Wed, 18 May 2022 05:53:08 -0500 Subject: [PATCH] src/sim/makefile: Micropolis build fixes for recent macOS Evaluate SDLINCLUDE and SDLLIB just once, not for every compile. Remove use of undefined XPMHOME variable. --- src/sim/makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/sim/makefile b/src/sim/makefile index bdf5847..3f29de7 100644 --- a/src/sim/makefile +++ b/src/sim/makefile @@ -5,8 +5,8 @@ TCLXHOME = ../tclx TCLLIBRARY = /usr/local/lib/tcl TKLIBRARY = /usr/local/lib/tk -SDLINCLUDE = $$(/bin/sh ./sdl_helper cflags) -SDLLIBS = $$(/bin/sh ./sdl_helper libs) +SDLINCLUDE := $(shell /bin/sh sdl_helper cflags) +SDLLIBS := $(shell /bin/sh sdl_helper libs) CC = gcc @@ -31,7 +31,6 @@ INSTALL = install -s INCLUDES = \ -Iheaders \ - -I$(XPMHOME) \ -I$(XINCLUDE) \ -I$(TCLHOME) \ -I$(TCLXHOME)/src \ -- 2.39.2