From e40bdfe0b71b15b8988f5e0bc22c952a3faa0653 Mon Sep 17 00:00:00 2001 From: tresf Date: Wed, 11 Aug 2021 14:36:04 -0400 Subject: [PATCH] Add hints for SDKROOT, MACOSX_DEPLOYMENT_TARGET Closes #120 --- build-hidapi.sh | 26 ++++++++++++++++++---- src/main/resources/darwin/libhidapi.dylib | Bin 58888 -> 0 bytes 2 files changed, 22 insertions(+), 4 deletions(-) delete mode 100755 src/main/resources/darwin/libhidapi.dylib diff --git a/build-hidapi.sh b/build-hidapi.sh index 418615f..443154a 100755 --- a/build-hidapi.sh +++ b/build-hidapi.sh @@ -27,7 +27,7 @@ # windows - build all Windows variants # linux - build all Linux variants # osx - build all OS X variants -# darwin - OS X 64-bit +# darwin-x86-64 - OS X 64-bit # darwin-aarch64 - OS X 64-bit ARM # linux-aarch64 - Linux ARMv8 64-bit # linux-amd64 - Linux AMD 64-bit @@ -136,8 +136,8 @@ git pull function git-clean { echo -e "Resetting Cpp/hidapi" - git clean -ffdx > /dev/null 2>&1 || exit # remove all untracked files - git reset --hard > /dev/null 2>&1 || exit # reset all tracked files + git clean -ffdx > /dev/null 2>&1 || exit # remove all untracked files + git reset --hard > /dev/null 2>&1 || exit # reset all tracked files } @@ -327,6 +327,11 @@ echo -e "${green}--------------------------------------------------------------- if [[ "$1" == "all" ]] || [[ "$1" == "osx" ]] || [[ "$1" == "darwin" ]] || [[ "$1" == "darwin-x86-64" ]] then echo -e "${green}Building OS X Darwin${plain}" && git-clean + if [ -z "$SDKROOT" ] || [ -z "$MACOSX_DEPLOYMENT_TARGET" ]; + then + echo -e "${yellow}WARNING: For production builds, please set \$SDKROOT and \$MACOSX_DEPLOYMENT_TARGET before building${plain}" + echo -e "${yellow} See also https://github.com/gary-rowe/hid4java/issues/120${plain}" + fi ./bootstrap ./configure make CFLAGS="-arch x86_64" @@ -347,9 +352,14 @@ fi echo -e "${green}------------------------------------------------------------------------${plain}" # Darwin ARM64 -if [[ "$1" == "all" ]] || [[ "$1" == "osx" ]] || [[ "$1" == "darwin-aarch64" ]] +if [[ "$1" == "all" ]] || [[ "$1" == "osx" ]] || [[ "$1" == "darwin" ]] || [[ "$1" == "darwin-aarch64" ]] then echo -e "${green}Building OS X Darwin ARM64${plain}" && git-clean + if [ -z "$SDKROOT" ] || [ -z "$MACOSX_DEPLOYMENT_TARGET" ]; + then + echo -e "${yellow}WARNING: For production builds, please set \$SDKROOT and \$MACOSX_DEPLOYMENT_TARGET before building${plain}" + echo -e "${yellow} See also https://github.com/gary-rowe/hid4java/issues/120${plain}" + fi ./bootstrap ./configure make CFLAGS="-arch arm64" @@ -427,9 +437,17 @@ echo -e "${green}OS X${plain}" echo -e "${green}darwin${plain}" file -b ../../Java/Personal/hid4java/src/main/resources/darwin-x86-64/libhidapi.dylib +if command -v otool &> /dev/null + then + otool -l ../../Java/Personal/hid4java/src/main/resources/darwin-x86-64/libhidapi.dylib |grep -E 'LC_VERSION_MIN_MACOSX|LC_BUILD_VERSION' -A4 +fi echo -e "${green}darwin-aarch64${plain}" file -b ../../Java/Personal/hid4java/src/main/resources/darwin-aarch64/libhidapi.dylib +if command -v otool &> /dev/null + then + otool -l ../../Java/Personal/hid4java/src/main/resources/darwin-aarch64/libhidapi.dylib |grep -E 'LC_VERSION_MIN_MACOSX|LC_BUILD_VERSION' -A4 +fi echo -e "${green}------------------------------------------------------------------------${plain}" diff --git a/src/main/resources/darwin/libhidapi.dylib b/src/main/resources/darwin/libhidapi.dylib deleted file mode 100755 index 91389aef6d2c74356276d3d862a97e458adf7e65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58888 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 G@ca+mU1dQ4