mirror of
https://github.com/libretro/mupen64plus-core.git
synced 2026-11-07 12:27:51 -10:00
Expand detection to known working OpenCV versions (#1187)
This commit is contained in:
1 parent
e35423065e
commit
cf00a1d1b4
1 file changed
+13
-4
+13
-4
@@ -339,11 +339,20 @@ LDLIBS += $(LIBPNG_LDLIBS)
|
||||
ifeq ($(OPENCV), 1)
|
||||
# OpenCV lib
|
||||
ifeq ($(origin OPENCV_CFLAGS) $(origin OPENCV_LDLIBS), undefined undefined)
|
||||
ifeq ($(shell $(PKG_CONFIG) --modversion opencv4 2>/dev/null),)
|
||||
$(error No OpenCV 4 development libraries found!)
|
||||
ifeq ($(shell $(PKG_CONFIG) --modversion opencv5 2>/dev/null),)
|
||||
ifeq ($(shell $(PKG_CONFIG) --modversion opencv4 2>/dev/null),)
|
||||
ifeq ($(shell $(PKG_CONFIG) --modversion opencv 2>/dev/null),)
|
||||
$(error No OpenCV development libraries found!)
|
||||
endif
|
||||
OPENCV_VER = opencv
|
||||
else
|
||||
OPENCV_VER = opencv4
|
||||
endif
|
||||
else
|
||||
OPENCV_VER = opencv5
|
||||
endif
|
||||
OPENCV_CFLAGS += $(shell $(PKG_CONFIG) --cflags opencv4)
|
||||
OPENCV_LDLIBS += $(shell $(PKG_CONFIG) --libs opencv4)
|
||||
OPENCV_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(OPENCV_VER))
|
||||
OPENCV_LDLIBS += $(shell $(PKG_CONFIG) --libs $(OPENCV_VER))
|
||||
endif
|
||||
CFLAGS += $(OPENCV_CFLAGS)
|
||||
LDLIBS += $(OPENCV_LDLIBS)
|
||||
|
||||
Reference in new issue
Block a user