quirc: fix on darwin
This commit is contained in:
@@ -1,8 +1,33 @@
|
||||
From 7435b2e12c2004cb0c497ff313288902f2a6f39a Mon Sep 17 00:00:00 2001
|
||||
From: toonn <toonn@toonn.io>
|
||||
Date: Fri, 19 Jul 2024 21:53:58 +0200
|
||||
Subject: [PATCH] Don't build demos
|
||||
|
||||
---
|
||||
Makefile | 7 ++-----
|
||||
1 file changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8327b4e..c269291 100644
|
||||
index 8327b4e..7901cc5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -99,9 +99,6 @@ install: libquirc.a libquirc.$(LIB_SUFFIX) quirc-demo quirc-scanner
|
||||
@@ -45,7 +45,7 @@ DEMO_UTIL_OBJ = \
|
||||
|
||||
OPENCV_CFLAGS := $(shell pkg-config --cflags opencv4 2>&1)
|
||||
OPENCV_LIBS = $(shell pkg-config --libs opencv4)
|
||||
-QUIRC_CXXFLAGS = $(QUIRC_CFLAGS) $(OPENCV_CFLAGS) --std=c++17
|
||||
+QUIRC_CXXFLAGS = $(QUIRC_CFLAGS) --std=c++17
|
||||
|
||||
.PHONY: all v4l sdl opencv install uninstall clean
|
||||
|
||||
@@ -93,15 +93,12 @@ libquirc.$(VERSIONED_LIB_SUFFIX): $(LIB_OBJ)
|
||||
.cxx.o:
|
||||
$(CXX) $(QUIRC_CXXFLAGS) -o $@ -c $<
|
||||
|
||||
-install: libquirc.a libquirc.$(LIB_SUFFIX) quirc-demo quirc-scanner
|
||||
+install: libquirc.a libquirc.$(LIB_SUFFIX)
|
||||
install -o root -g root -m 0644 lib/quirc.h $(DESTDIR)$(PREFIX)/include
|
||||
install -o root -g root -m 0644 libquirc.a $(DESTDIR)$(PREFIX)/lib
|
||||
install -o root -g root -m 0755 libquirc.$(VERSIONED_LIB_SUFFIX) \
|
||||
$(DESTDIR)$(PREFIX)/lib
|
||||
cp -d libquirc.$(LIB_SUFFIX) $(DESTDIR)$(PREFIX)/lib
|
||||
@@ -12,3 +37,6 @@ index 8327b4e..c269291 100644
|
||||
|
||||
uninstall:
|
||||
rm -f $(DESTDIR)$(PREFIX)/include/quirc.h
|
||||
--
|
||||
2.42.2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user