Skip to content

Added mac support #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilba merged 1 commit into from
Jun 19, 2018
Merged

Added mac support #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,32 @@ You may also be able to use the version of `hdiapi` from your distribution's pac
sudo apt install libusb-1.0-0-dev libhidapi-dev libhidapi-libusb0
```

### Building under macOS

Currently the hidapi library does not support interface numbers for devices in macOS. There is an
[open pull request](https://github.com/signal11/hidapi/pull/380) to add interface number support for HID devices only.

Follow the instructions below to compile hidapi with interface number support:

```
git clone https://github.com/signal11/hidapi.git
cd hidapi
git remote add dylanmckay https://github.com/dylanmckay/hidapi.git
git fetch dylanmckay
git checkout mac-hid-interface-support
./bootstap
./configure
make
sudo make install
```

After compileing hidapi, you may build zeal60 using the Makefile found in the `zeal60/` directory:

```
cd zeal60
make
```

#### Using Makefile
To compile the Linux version you can use the supplied Makefile found in the `zeal60/` directrory:

Expand Down
13 changes: 11 additions & 2 deletions zeal60/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
OSNAME:=$(shell uname -s)

CPPFLAGS=-I/usr/local/lib -Wno-write-strings
ifeq ($(OSNAME),Darwin)
CPPFLAGS += -lhidapi
else
CPPFLAGS += -I/usr/local/include/hidapi -lhidapi-libusb
endif

zeal60: zeal60.cpp keycode.cpp keycode.h config.h
g++ -I/usr/local/include/hidapi -L/usr/local/lib -Wno-write-strings zeal60.cpp keycode.cpp -lhidapi-libusb -o zeal60
g++ $(CPPFLAGS) zeal60.cpp keycode.cpp -o zeal60

clean:
$(RM) zeal60
$(RM) zeal60
2 changes: 1 addition & 1 deletion zeal60/zeal60.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ bool system_get_state( hid_device *device, msg_system_state *msg )
hid_device *
hid_open_least_uptime( unsigned short vendor_id, unsigned short product_id, unsigned short interface_number )
{
std::vector<std::string> devicePaths = hid_get_device_paths(vendor_id, product_id, interface_number );
std::vector<std::string> devicePaths = hid_get_device_paths( vendor_id, product_id, interface_number );

// early abort
if ( devicePaths.size() == 0 )
Expand Down