Skip to content
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

Switch to libusb-1.0 #132

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to libusb-1.0 #132

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: 13 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ ifeq ($(OS),Windows_NT)
RM = del
endif
ifneq (, $findstring(MINGW, $(UNAME_S)))
PORTS_CFLAGS := $(shell pkg-config --cflags libusb)
PORTS_LDFLAGS := $(shell pkg-config --libs libusb)
PORTS_CFLAGS := $(shell pkg-config --cflags libusb-1.0)
PORTS_LDFLAGS := $(shell pkg-config --libs libusb-1.0)
RM = rm -rf
endif
else
Expand All @@ -72,14 +72,14 @@ else

ifeq ($(UNAME_S),Darwin) # Mac OS X/MacPorts stuff
ifeq ($(shell fink -V > /dev/null 2>&1 && echo ok),ok)
PORTS_CFLAGS := $(shell pkg-config --cflags hidapi libusb)
PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb) -ltermcap -pthread
PORTS_CFLAGS := $(shell pkg-config --cflags hidapi libusb-1.0)
PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb-1.0) -ltermcap -pthread
else ifeq ($(shell brew --version > /dev/null 2>&1 && echo ok),ok)
PORTS_CFLAGS := $(shell pkg-config --cflags hidapi libusb)
PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb) -framework IOKit -framework CoreFoundation
PORTS_CFLAGS := $(shell pkg-config --cflags hidapi libusb-1.0)
PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb-1.0) -framework IOKit -framework CoreFoundation
else ifeq ($(shell port version > /dev/null 2>&1 && echo ok),ok)
PORTS_CFLAGS := $(shell pkg-config --cflags hidapi libusb)
PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb) -framework IOKit -framework CoreFoundation
PORTS_CFLAGS := $(shell pkg-config --cflags hidapi libusb-1.0)
PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb-1.0) -framework IOKit -framework CoreFoundation
else
PORTS_CFLAGS := -I/opt/local/include
PORTS_LDFLAGS := -L/opt/local/lib -lhidapi -framework IOKit -framework CoreFoundation
Expand All @@ -88,11 +88,11 @@ else
RF25000_OBJ += transport/rf2500hidapi.o
LDFLAGS =
else ifneq ($(filter $(UNAME_S),OpenBSD NetBSD DragonFly),)
PORTS_CFLAGS := $(shell pkg-config --cflags libusb)
PORTS_LDFLAGS := $(shell pkg-config --libs libusb) -ltermcap -pthread
PORTS_CFLAGS := $(shell pkg-config --cflags libusb-1.0)
PORTS_LDFLAGS := $(shell pkg-config --libs libusb-1.0) -ltermcap -pthread
else
PORTS_CFLAGS :=
PORTS_LDFLAGS :=
PORTS_CFLAGS := $(shell pkg-config --cflags hidapi-hidraw libusb-1.0)
PORTS_LDFLAGS := $(shell pkg-config --libs hidapi-hidraw libusb-1.0)
endif
endif

Expand All @@ -101,7 +101,7 @@ GCC_CFLAGS = -O1 -Wall -Wno-char-subscripts -ggdb
CONFIG_CFLAGS = -DLIB_DIR=\"$(LIBDIR)\"

MSPDEBUG_LDFLAGS = $(LDFLAGS) $(PORTS_LDFLAGS)
MSPDEBUG_LIBS = -L. -lusb $(READLINE_LIBS) $(OS_LIBS)
MSPDEBUG_LIBS = $(READLINE_LIBS) $(OS_LIBS)
MSPDEBUG_CFLAGS = $(CFLAGS) $(READLINE_CFLAGS) $(PORTS_CFLAGS)\
$(GCC_CFLAGS) $(INCLUDES) $(CONFIG_CFLAGS) $(OS_CFLAGS)

Expand Down
Loading