Skip to content

Commit e4723f5

Browse files
authored
quirc: fix on darwin (#389753)
2 parents 33bf9ad + 2ff2b54 commit e4723f5

File tree

1 file changed

+30
-2
lines changed

1 file changed

+30
-2
lines changed
Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,33 @@
1+
From 7435b2e12c2004cb0c497ff313288902f2a6f39a Mon Sep 17 00:00:00 2001
2+
From: toonn <[email protected]>
3+
Date: Fri, 19 Jul 2024 21:53:58 +0200
4+
Subject: [PATCH] Don't build demos
5+
6+
---
7+
Makefile | 7 ++-----
8+
1 file changed, 2 insertions(+), 5 deletions(-)
9+
110
diff --git a/Makefile b/Makefile
2-
index 8327b4e..c269291 100644
11+
index 8327b4e..7901cc5 100644
312
--- a/Makefile
413
+++ b/Makefile
5-
@@ -99,9 +99,6 @@ install: libquirc.a libquirc.$(LIB_SUFFIX) quirc-demo quirc-scanner
14+
@@ -45,7 +45,7 @@ DEMO_UTIL_OBJ = \
15+
16+
OPENCV_CFLAGS := $(shell pkg-config --cflags opencv4 2>&1)
17+
OPENCV_LIBS = $(shell pkg-config --libs opencv4)
18+
-QUIRC_CXXFLAGS = $(QUIRC_CFLAGS) $(OPENCV_CFLAGS) --std=c++17
19+
+QUIRC_CXXFLAGS = $(QUIRC_CFLAGS) --std=c++17
20+
21+
.PHONY: all v4l sdl opencv install uninstall clean
22+
23+
@@ -93,15 +93,12 @@ libquirc.$(VERSIONED_LIB_SUFFIX): $(LIB_OBJ)
24+
.cxx.o:
25+
$(CXX) $(QUIRC_CXXFLAGS) -o $@ -c $<
26+
27+
-install: libquirc.a libquirc.$(LIB_SUFFIX) quirc-demo quirc-scanner
28+
+install: libquirc.a libquirc.$(LIB_SUFFIX)
29+
install -o root -g root -m 0644 lib/quirc.h $(DESTDIR)$(PREFIX)/include
30+
install -o root -g root -m 0644 libquirc.a $(DESTDIR)$(PREFIX)/lib
631
install -o root -g root -m 0755 libquirc.$(VERSIONED_LIB_SUFFIX) \
732
$(DESTDIR)$(PREFIX)/lib
833
cp -d libquirc.$(LIB_SUFFIX) $(DESTDIR)$(PREFIX)/lib
@@ -12,3 +37,6 @@ index 8327b4e..c269291 100644
1237

1338
uninstall:
1439
rm -f $(DESTDIR)$(PREFIX)/include/quirc.h
40+
--
41+
2.42.2
42+

0 commit comments

Comments
 (0)