Skip to content

Commit

Permalink
Merge pull request #1461 from OutpostUniverse/updateMacOsBuildImage
Browse files Browse the repository at this point in the history
Update MacOS image to `15.4.0` (Xcode 15.4, macOS 14.3.1)
  • Loading branch information
DanRStevens authored Jul 17, 2024
2 parents dc6af0c + ad2a52c commit 1875a4d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ commands:
jobs:
build-macos:
macos:
xcode: "13.4.1"
xcode: "15.4.0"
environment:
HOMEBREW_NO_AUTO_UPDATE: 1
WARN_EXTRA: "-isystem /opt/homebrew/include"
Expand Down
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ libOPHD_OBJS := $(patsubst $(libOPHD_SRCDIR)%.cpp,$(libOPHD_OBJDIR)%.o,$(libOPHD
.PHONY: libOphd
libOphd: $(libOPHD_OUTPUT)

$(libOPHD_OUTPUT): $(libOPHD_OBJS) $(NAS2DLIB)
$(libOPHD_OUTPUT): $(libOPHD_OBJS)
$(libOPHD_OBJS): $(libOPHD_OBJDIR)%.o : $(libOPHD_SRCDIR)%.cpp $(libOPHD_OBJDIR)%.d

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

$(libControls_OUTPUT): $(libControls_OBJS) $(NAS2DLIB)
$(libControls_OUTPUT): $(libControls_OBJS)
$(libControls_OBJS): $(libControls_OBJDIR)%.o : $(libControls_SRCDIR)%.cpp $(libControls_OBJDIR)%.d

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

0 comments on commit 1875a4d

Please sign in to comment.