]> cvs.zerfleddert.de Git - micropolis/commitdiff
src/sim/makefile: Micropolis build fixes for recent macOS
authorRyan Schmidt <ryandesign@macports.org>
Wed, 18 May 2022 10:53:08 +0000 (05:53 -0500)
committerMichael Gernoth <michael@gernoth.net>
Sat, 4 Jun 2022 09:18:34 +0000 (11:18 +0200)
Evaluate SDLINCLUDE and SDLLIB just once, not for every compile.

Remove use of undefined XPMHOME variable.

src/sim/makefile

index bdf58472a6e1aa166281b2d9a0602b46ddf1d9f2..3f29de75539fbab2e3b1522b9fc84ed8b7a7ee73 100644 (file)
@@ -5,8 +5,8 @@ TCLXHOME = ../tclx
 TCLLIBRARY = /usr/local/lib/tcl
 TKLIBRARY = /usr/local/lib/tk
 
 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
 
 
 CC = gcc
 
@@ -31,7 +31,6 @@ INSTALL = install -s
 
 INCLUDES = \
        -Iheaders \
 
 INCLUDES = \
        -Iheaders \
-       -I$(XPMHOME) \
        -I$(XINCLUDE) \
        -I$(TCLHOME) \
        -I$(TCLXHOME)/src \
        -I$(XINCLUDE) \
        -I$(TCLHOME) \
        -I$(TCLXHOME)/src \
Impressum, Datenschutz