Skip to content

Commit

Permalink
be more explicit with desired assignment semantics
Browse files Browse the repository at this point in the history
  • Loading branch information
CamJN committed Jan 23, 2024
1 parent 2c255b8 commit d5d30f4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ install_dylib: $(DYLIB)
install $(DYLIB) $(PREFIX)/$(DYLIB)
install_name_tool -id $(PREFIX)/$(DYLIB) $(PREFIX)/$(DYLIB)
ifdef CERT_IDENTITY
ifneq ($(CERT_IDENTITY),)
codesign --options runtime --prefix=$(CODESIGN_PREFIX) -s "$(CERT_IDENTITY)" --keychain $(KEYCHAIN) $(PREFIX)/$(DYLIB)
endif
endif
ln -sf ./$(DYLIB_FILENAME:%.$(VERSION).dylib=%.$(COMPAT_VERSION:%.0=%).dylib) $(PREFIX)/$(DYLIB:%.$(VERSION).dylib=%.dylib)
ln -sf ./$(DYLIB_FILENAME) $(PREFIX)/$(DYLIB:%.$(VERSION).dylib=%.$(COMPAT_VERSION:%.0=%.dylib))
Expand Down
10 changes: 7 additions & 3 deletions Makefile-variables
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
MACOS_VER_NUM ?=$(shell vtool -show-build $(shell brew --prefix)/lib/libgetargv.dylib | awk '/minos/{print $$2}')
ifndef MACOS_VER_NUM
MACOS_VER_NUM := $(shell vtool -show-build $(shell brew --prefix)/lib/libgetargv.dylib | awk '/minos/{print $$2}')
endif
MACOS_VER_MAJOR := $(shell echo $(MACOS_VER_NUM) | cut -f1 -d.)
MACOS_VER_MINOR := $(shell echo $(MACOS_VER_NUM) | cut -f2 -d.)
MACOS_LT_10_11 := $(shell [ $(MACOS_VER_MAJOR) -eq 10 -a $(MACOS_VER_MINOR) -lt 11 ] && echo true)
Expand All @@ -12,8 +14,10 @@ VERSION=0.2
COMPAT_VERSION := $(shell echo $(VERSION) | cut -f1 -d.).0
ARCH := $(shell uname -m)
CODESIGN_PREFIX := cam.narzt.
KEYCHAIN := ~/Library/Keychains/login.keychain-db
CERT_IDENTITY ?= $(shell security find-identity -v -p codesigning | sed -Ee 's/.*"([^"]+)".*/\1/g' | grep -Fve ' valid identit' -e ' CA')
KEYCHAIN := ~/Library/Keychains/login.keychain-db
ifndef CERT_IDENTITY
CERT_IDENTITY := $(shell security find-identity -v -p codesigning | sed -Ee 's/.*"([^"]+)".*/\1/g' | grep -Fve ' valid identit' -e ' CA')
endif

SRC_DIR = src
INCLUDE_DIR = include
Expand Down

0 comments on commit d5d30f4

Please sign in to comment.