diff --git a/GX_ISPTool.pro b/GX_ISPTool.pro index 643314a89f1b77284615363b648d860dddf6827f..f81c076cd2295da3c7bbbf17f447550a90de19bb 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 0000000000000000000000000000000000000000..2e256626efdb56cb7a7ea957306a17436a9fca9c --- /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 Binary files /dev/null and b/hidapi/mac/libhidapi.0.12.0.dylib differ 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