Skip to content

Commit 644b290

Browse files
committed
3rdParty: improve the hidapi check in mupen64plus-input-raphnetraw
Better matches the style in mupen64plus-core. Upstream-PR: raphnet/mupen64plus-input-raphnetraw#17
1 parent e68483f commit 644b290

File tree

1 file changed

+4
-10
lines changed
  • Source/3rdParty/mupen64plus-input-raphnetraw/projects/unix

1 file changed

+4
-10
lines changed

Source/3rdParty/mupen64plus-input-raphnetraw/projects/unix/Makefile

+4-10
Original file line numberDiff line numberDiff line change
@@ -157,17 +157,11 @@ endif
157157

158158
# test for presence of HIDLIB
159159
ifeq ($(origin HID_CFLAGS) $(origin HID_LDLIBS), undefined undefined)
160-
HIDAPI_CONFIG = $(PKG_CONFIG) $(HIDAPI_NAME)
161-
ifeq ($(shell which $(HIDAPI_CONFIG) 2>/dev/null),)
162-
HIDAPI_CONFIG = $(PKG_CONFIG) $(HIDAPI_NAME)
163-
ifeq ($(shell which $(HIDAPI_CONFIG) 2>/dev/null),)
164-
$(error No HIDAPI development libraries found!)
165-
else
166-
$(warning Using HIDAPI libraries)
167-
endif
160+
ifeq ($(shell $(PKG_CONFIG) --modversion $(HIDAPI_NAME) 2>/dev/null),)
161+
$(error No HIDAPI development libraries found!)
168162
endif
169-
HID_CFLAGS += $(shell $(HIDAPI_CONFIG) --cflags)
170-
HID_LDLIBS += $(shell $(HIDAPI_CONFIG) --libs)
163+
HID_CFLAGS = $(shell $(PKG_CONFIG) --cflags $(HIDAPI_NAME))
164+
HID_LDLIBS = $(shell $(PKG_CONFIG) --libs $(HIDAPI_NAME))
171165
endif
172166
CFLAGS += $(HID_CFLAGS)
173167
LDLIBS += $(HID_LDLIBS)

0 commit comments

Comments
 (0)