diff --git a/Makefile b/Makefile index 16e92c4..2cf6fae 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,9 @@ all: frontend pob sign: echo 'Signing with the first available identity'; \ rm -rf PathOfBuilding.app/Contents/MacOS/spec/TestBuilds/3.13; \ - codesign --force --deep --sign $$(security find-identity -v -p codesigning | grep Distribution | awk 'FNR == 1 {print $$2}') PathOfBuilding.app/Contents/MacOS/lcurl.so PathOfBuilding.app/Contents/libs/*; \ - codesign --force --deep --sign $$(security find-identity -v -p codesigning | grep Distribution | awk 'FNR == 1 {print $$2}') PathOfBuilding.app/Contents/MacOS/PathOfBuilding; \ - codesign --force --deep --sign $$(security find-identity -v -p codesigning | grep Distribution | awk 'FNR == 1 {print $$2}') PathOfBuilding.app; \ + codesign -v --force --deep --sign $$(security find-identity -v -p codesigning | grep Distribution | awk 'FNR == 1 {print $$2}') PathOfBuilding.app/Contents/MacOS/lcurl.so PathOfBuilding.app/Contents/libs/*; \ + codesign -v --force --deep --sign $$(security find-identity -v -p codesigning | grep Distribution | awk 'FNR == 1 {print $$2}') PathOfBuilding.app/Contents/MacOS/PathOfBuilding; \ + codesign -v --force --deep --sign $$(security find-identity -v -p codesigning | grep Distribution | awk 'FNR == 1 {print $$2}') PathOfBuilding.app; \ codesign -d -v PathOfBuilding.app # We remove the `launch.devMode or` to ensure the user's builds are stored not in diff --git a/editLuaCurlMakefile.sh b/editLuaCurlMakefile.sh index 9bcbed3..6fcbccf 100644 --- a/editLuaCurlMakefile.sh +++ b/editLuaCurlMakefile.sh @@ -26,4 +26,4 @@ if ! grep -q "LDFLAGS =" Makefile; then LDFLAGS = -Wl,-no_fixup_chains ' Makefile fi -popd \ No newline at end of file +popd diff --git a/meson.build b/meson.build index e388fe3..6787d53 100644 --- a/meson.build +++ b/meson.build @@ -14,8 +14,13 @@ curl_dep = dependency('libcurl') # Added flag based on https://stackoverflow.com/a/37729971/319066 # and arguments based on https://mesonbuild.com/Adding-arguments.html -add_project_arguments('-mmacos-version-min=10.12', language : 'c') -add_project_arguments('-mmacos-version-min=10.12', language : 'cpp') +compiler_arguments = ['-mmacosx-version-min=10.12', '-isysroot', '/Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk'] +add_project_arguments(compiler_arguments , language : 'c') +add_project_arguments(compiler_arguments, language : 'cpp') + +linker_arguments = ['-mmacosx-version-min=10.12', '-isysroot', '/Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk'] +add_project_link_arguments(linker_arguments, language : 'c') +add_project_link_arguments(linker_arguments, language : 'cpp') # Import the extension module that knows how # to invoke Qt tools.