From 48d53fc10bda676ea58e0999bbad5aa54574a656 Mon Sep 17 00:00:00 2001 From: HonestQiao Date: Mon, 8 Aug 2022 16:45:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0GX=5FISPTool.pro=E9=80=82?= =?UTF-8?q?=E9=85=8DWin=E3=80=81Linux=E3=80=81macOS(=E5=90=ABhidapi=20lib)?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=9C=A8Win=E5=92=8CmacOS=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GX_ISPTool.pro | 14 ++++++++++++-- hidapi/linux/README.txt | 3 +++ hidapi/mac/libhidapi.0.12.0.dylib | Bin 0 -> 56672 bytes hidapi/{ => win32}/x64/hidapi.lib | Bin hidapi/{ => win32}/x64/hidapi.pdb | Bin hidapi/{ => win32}/x86/hidapi.lib | Bin hidapi/{ => win32}/x86/hidapi.pdb | Bin 7 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 hidapi/linux/README.txt create mode 100755 hidapi/mac/libhidapi.0.12.0.dylib rename hidapi/{ => win32}/x64/hidapi.lib (100%) rename hidapi/{ => win32}/x64/hidapi.pdb (100%) rename hidapi/{ => win32}/x86/hidapi.lib (100%) rename hidapi/{ => win32}/x86/hidapi.pdb (100%) diff --git a/GX_ISPTool.pro b/GX_ISPTool.pro index 643314a..f81c076 100644 --- a/GX_ISPTool.pro +++ b/GX_ISPTool.pro @@ -34,10 +34,20 @@ TARGET_ARCH=$${QT_ARCH} contains(TARGET_ARCH, x86_64){ message("64-bit") - LIBS += -L$$_PRO_FILE_PWD_/hidapi/x64 -lhidapi + win32 { + LIBS += -L$$_PRO_FILE_PWD_/hidapi/win32/x64 -lhidapi + } + + unix:!macx { + LIBS += -L$$_PRO_FILE_PWD_/hidapi/linux -lhidapi + } + + macx: { + LIBS += $$_PRO_FILE_PWD_/hidapi/mac/libhidapi.0.12.0.dylib + } }else{ message("32-bit") - LIBS += -L$$_PRO_FILE_PWD_/hidapi/x86 -lhidapi + LIBS += -L$$_PRO_FILE_PWD_/hidapi/win32/x86 -lhidapi } diff --git a/hidapi/linux/README.txt b/hidapi/linux/README.txt new file mode 100644 index 0000000..2e25662 --- /dev/null +++ b/hidapi/linux/README.txt @@ -0,0 +1,3 @@ +https://github.com/libusb/hidapi.git + +Please compile the source and copy the so file to here. diff --git a/hidapi/mac/libhidapi.0.12.0.dylib b/hidapi/mac/libhidapi.0.12.0.dylib new file mode 100755 index 0000000000000000000000000000000000000000..bfb8b4c36eb1a70b7ec742fa8284850f6356514b GIT binary patch literal 56672 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 DM5WFL literal 0 HcmV?d00001 diff --git a/hidapi/x64/hidapi.lib b/hidapi/win32/x64/hidapi.lib similarity index 100% rename from hidapi/x64/hidapi.lib rename to hidapi/win32/x64/hidapi.lib diff --git a/hidapi/x64/hidapi.pdb b/hidapi/win32/x64/hidapi.pdb similarity index 100% rename from hidapi/x64/hidapi.pdb rename to hidapi/win32/x64/hidapi.pdb diff --git a/hidapi/x86/hidapi.lib b/hidapi/win32/x86/hidapi.lib similarity index 100% rename from hidapi/x86/hidapi.lib rename to hidapi/win32/x86/hidapi.lib diff --git a/hidapi/x86/hidapi.pdb b/hidapi/win32/x86/hidapi.pdb similarity index 100% rename from hidapi/x86/hidapi.pdb rename to hidapi/win32/x86/hidapi.pdb -- Gitee