Skip to content

Commit 1875a4d

Browse files
authored
Merge pull request #1461 from OutpostUniverse/updateMacOsBuildImage
Update MacOS image to `15.4.0` (Xcode 15.4, macOS 14.3.1)
2 parents dc6af0c + ad2a52c commit 1875a4d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ commands:
1616
jobs:
1717
build-macos:
1818
macos:
19-
xcode: "13.4.1"
19+
xcode: "15.4.0"
2020
environment:
2121
HOMEBREW_NO_AUTO_UPDATE: 1
2222
WARN_EXTRA: "-isystem /opt/homebrew/include"

makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ libOPHD_OBJS := $(patsubst $(libOPHD_SRCDIR)%.cpp,$(libOPHD_OBJDIR)%.o,$(libOPHD
7878
.PHONY: libOphd
7979
libOphd: $(libOPHD_OUTPUT)
8080

81-
$(libOPHD_OUTPUT): $(libOPHD_OBJS) $(NAS2DLIB)
81+
$(libOPHD_OUTPUT): $(libOPHD_OBJS)
8282
$(libOPHD_OBJS): $(libOPHD_OBJDIR)%.o : $(libOPHD_SRCDIR)%.cpp $(libOPHD_OBJDIR)%.d
8383

8484
include $(wildcard $(patsubst %.o,%.d,$(libOPHD_OBJS)))
@@ -96,7 +96,7 @@ libControls_OBJS := $(patsubst $(libControls_SRCDIR)%.cpp,$(libControls_OBJDIR)%
9696
.PHONY: libControls
9797
libControls: $(libControls_OUTPUT)
9898

99-
$(libControls_OUTPUT): $(libControls_OBJS) $(NAS2DLIB)
99+
$(libControls_OUTPUT): $(libControls_OBJS)
100100
$(libControls_OBJS): $(libControls_OBJDIR)%.o : $(libControls_SRCDIR)%.cpp $(libControls_OBJDIR)%.d
101101

102102
include $(wildcard $(patsubst %.o,%.d,$(libControls_OBJS)))

0 commit comments

Comments
 (0)