Merge branch 'feature/no-dummy-go-files'

hid_darwin.go

@@ -0,0 +1,8 @@
+//go:build !ios && cgo
+
+package hid
+
+import (
+	_ "github.com/bearsh/hid/hidapi"
+	_ "github.com/bearsh/hid/hidapi/mac"
+)

hid_enabled.go

@@ -9,44 +9,15 @@
 package hid
 
 /*
-#cgo CFLAGS: -I./hidapi/hidapi
+#cgo CFLAGS: -I./hidapi/.
 
-#cgo !hidraw,linux CFLAGS: -I. -I./libusb/libusb -DDEFAULT_VISIBILITY="" -DOS_LINUX -D_GNU_SOURCE -DPLATFORM_POSIX
 #cgo !hidraw,linux,!android LDFLAGS: -lrt
-#cgo !hidraw,linux,noiconv CFLAGS: -DNO_ICONV
-#cgo hidraw,linux CFLAGS: -DOS_LINUX -D_GNU_SOURCE -DHIDRAW
 #cgo hidraw,linux,!android pkg-config: libudev
-#cgo darwin CFLAGS: -DOS_DARWIN
 #cgo darwin LDFLAGS: -framework CoreFoundation -framework IOKit -framework AppKit
-#cgo windows CFLAGS: -DOS_WINDOWS
 #cgo windows LDFLAGS: -lsetupapi
 
-#ifdef OS_LINUX
-	#ifdef HIDRAW
-	#include "hidapi/linux/hid.c"
-	#else
-	#include <poll.h>
-	#include "os/events_posix.c"
-	#include "os/threads_posix.c"
-
-	#include "os/linux_usbfs.c"
-	#include "os/linux_netlink.c"
-
-	#include "core.c"
-	#include "descriptor.c"
-	#include "hotplug.c"
-	#include "io.c"
-	#include "strerror.c"
-	#include "sync.c"
-
-	#undef _GNU_SOURCE // it's already defined in the c-file
-	#include "hidapi/libusb/hid.c"
-	#endif
-#elif OS_DARWIN
-	#include "hidapi/mac/hid.c"
-#elif OS_WINDOWS
-	#include "hidapi/windows/hid.c"
-#endif
+#include <stdlib.h>
+#include "hidapi.h"
 */
 import "C"
 

hid_hidraw_linux.go

@@ -0,0 +1,8 @@
+//go:build hidraw && cgo
+
+package hid
+
+import (
+	_ "github.com/bearsh/hid/hidapi"
+	_ "github.com/bearsh/hid/hidapi/linux"
+)

hid_libusb_linux.go

@@ -0,0 +1,10 @@
+//go:build !hidraw && cgo
+
+package hid
+
+import (
+	_ "github.com/bearsh/hid/hidapi"
+	_ "github.com/bearsh/hid/hidapi/libusb"
+	_ "github.com/bearsh/hid/libusb/libusb"
+	_ "github.com/bearsh/hid/libusb/libusb/os"
+)

hid_windows.go

@@ -1,9 +1,15 @@
+//go:build cgo
+
 package hid
 
 import (
 	"errors"
-	"golang.org/x/sys/windows"
 	"unsafe"
+
+	"golang.org/x/sys/windows"
+
+	_ "github.com/bearsh/hid/hidapi"
+	_ "github.com/bearsh/hid/hidapi/windows"
 )
 
 /*

hidapi/hidapi.go

@@ -1,6 +1 @@
-//go:build dummy
-
-// This Go file is part of a workaround for `go mod vendor`.
-// Please see the file `c_deps.go` at the root for more information.
-
 package hidapi

hidapi/libusb/libusb.go

@@ -1,6 +1,8 @@
-//go:build dummy
-
-// This Go file is part of a workaround for `go mod vendor`.
-// Please see the file `c_deps.go` at the root for more information.
+//go:build !hidraw && linux && cgo
 
 package libusb
+
+/*
+#cgo CFLAGS: -I../. -I../../libusb/libusb
+*/
+import "C"

hidapi/linux/linux.go

@@ -1,6 +1,8 @@
-//go:build dummy
-
-// This Go file is part of a workaround for `go mod vendor`.
-// Please see the file `c_deps.go` at the root for more information.
+//go:build hidraw && linux
 
 package linux
+
+/*
+#cgo CFLAGS: -I../. -DHIDRAW
+*/
+import "C"

hidapi/mac/mac.go

@@ -1,6 +1,8 @@
-//go:build dummy
-
-// This Go file is part of a workaround for `go mod vendor`.
-// Please see the file `c_deps.go` at the root for more information.
+//go:build darwin && !ios
 
 package mac
+
+/*
+#cgo CFLAGS: -I../. -DOS_DARWIN
+*/
+import "C"

hidapi/windows/windows.go

@@ -1,6 +1,8 @@
-//go:build dummy
-
-// This Go file is part of a workaround for `go mod vendor`.
-// Please see the file `c_deps.go` at the root for more information.
+//go:build windows
 
 package windows
+
+/*
+#cgo CFLAGS: -I../. -DOS_WINDOWS -Dhidapi_winapi_EXPORTS
+*/
+import "C"

libusb/libusb.go

@@ -1,6 +1 @@
-//go:build dummy
-
-// This Go file is part of a workaround for `go mod vendor`.
-// Please see the file `c_deps.go` at the root for more information.
-
 package libusb

libusb/libusb/libusb.go

@@ -1,6 +1,15 @@
-//go:build dummy
-
-// This Go file is part of a workaround for `go mod vendor`.
-// Please see the file `c_deps.go` at the root for more information.
+//go:build !hidraw && linux && cgo
 
 package libusb
+
+/*
+#cgo CFLAGS: -I../.. -DDEFAULT_VISIBILITY="" -DOS_LINUX -D_GNU_SOURCE -DPLATFORM_POSIX
+#cgo !hidraw,linux,noiconv CFLAGS: -DNO_ICONV
+
+//#include "os/events_posix.c"
+//#include "os/threads_posix.c"
+
+//#include "os/linux_usbfs.c"
+//#include "os/linux_netlink.c"
+*/
+import "C"