gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hidapi: sync macOS code with mainstream.

Browse Source 
this merges mainstream commit 4009466d59c41f (mainstream PR/611)
This commit is contained in:
Ozkan Sezer
2023-08-27 22:33:32 +03:00
parent 363f4fa9c1
commit 923d612ca1
5 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hidapi/configure.ac
View File

@@ -74,7 +74,7 @@ case $host in
backend="mac" backend="mac"
os="darwin" os="darwin"
threads="pthreads" threads="pthreads"
LIBS="${LIBS} -framework IOKit -framework CoreFoundation -framework AppKit" LIBS="${LIBS} -framework IOKit -framework CoreFoundation"
;; ;;
*-freebsd*) *-freebsd*)
AC_MSG_RESULT([ (FreeBSD back-end)]) AC_MSG_RESULT([ (FreeBSD back-end)])

2
src/hidapi/dist/hidapi.podspec vendored
View File

@@ -26,6 +26,6 @@ Pod::Spec.new do |spec|
spec.public_header_files = "hidapi/hidapi.h", "mac/hidapi_darwin.h" spec.public_header_files = "hidapi/hidapi.h", "mac/hidapi_darwin.h"
spec.frameworks = "IOKit", "CoreFoundation", "AppKit" spec.frameworks = "IOKit", "CoreFoundation"
end end

2
src/hidapi/mac/CMakeLists.txt
View File

@@ -12,7 +12,7 @@ find_package(Threads REQUIRED)
target_link_libraries(hidapi_darwin target_link_libraries(hidapi_darwin
PUBLIC hidapi_include PUBLIC hidapi_include
PRIVATE Threads::Threads PRIVATE Threads::Threads
PRIVATE "-framework IOKit" "-framework CoreFoundation" "-framework AppKit" PRIVATE "-framework IOKit" "-framework CoreFoundation"
) )
set_target_properties(hidapi_darwin set_target_properties(hidapi_darwin

2
src/hidapi/mac/Makefile-manual
View File

@@ -12,7 +12,7 @@ CC=gcc
COBJS=hid.o ../hidtest/test.o COBJS=hid.o ../hidtest/test.o
OBJS=$(COBJS) OBJS=$(COBJS)
CFLAGS+=-I../hidapi -I. -Wall -g -c CFLAGS+=-I../hidapi -I. -Wall -g -c
LIBS=-framework IOKit -framework CoreFoundation -framework AppKit LIBS=-framework IOKit -framework CoreFoundation
hidtest: $(OBJS) hidtest: $(OBJS)

5
src/hidapi/mac/hid.c
View File

@@ -38,9 +38,6 @@
#include "hidapi_darwin.h" #include "hidapi_darwin.h"
/* As defined in AppKit.h, but we don't need the entire AppKit for a single constant. */
extern const double NSAppKitVersionNumber;
/* Barrier implementation because Mac OSX doesn't have pthread_barrier. /* Barrier implementation because Mac OSX doesn't have pthread_barrier.
It also doesn't have clock_gettime(). So much for POSIX and SUSv2. It also doesn't have clock_gettime(). So much for POSIX and SUSv2.
This implementation came from Brent Priddy and was posted on This implementation came from Brent Priddy and was posted on
@@ -477,7 +474,7 @@ int HID_API_EXPORT hid_init(void)
register_global_error(NULL); register_global_error(NULL);
if (!hid_mgr) { if (!hid_mgr) {
is_macos_10_10_or_greater = (NSAppKitVersionNumber >= 1343); /* NSAppKitVersionNumber10_10 */ is_macos_10_10_or_greater = (kCFCoreFoundationVersionNumber >= 1151.16); /* kCFCoreFoundationVersionNumber10_10 */
hid_darwin_set_open_exclusive(1); /* Backward compatibility */ hid_darwin_set_open_exclusive(1); /* Backward compatibility */
return init_hid_manager(); return init_hid_manager();
} }