blob: 9e6bd90834044dc7fb69c48676fddf9a184d3be8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From 9dc735727f5ae73ffb2d9b29fe079d0b0b4a7245 Mon Sep 17 00:00:00 2001
From: Mateusz Gozdek <mgozdekof@gmail.com>
Date: Tue, 5 May 2020 12:06:57 +0200
Subject: [PATCH] Use shared version of libjpeg-turbo
As Arch Linux does not provide static library file.
Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
---
linux/Makefile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/linux/Makefile b/linux/Makefile
index 6995c18..a45957d 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -8,8 +8,7 @@
CC = -no-pie
GTK = `pkg-config --libs --cflags gtk+-2.0` `pkg-config --libs x11`
-LIBS = `pkg-config --libs --cflags libswscale libavutil`
-JPEG = -I/opt/libjpeg-turbo/include /opt/libjpeg-turbo/lib`getconf LONG_BIT`/libturbojpeg.a
+LIBS = `pkg-config --libs --cflags libswscale libavutil libturbojpeg`
SRC = src/connection.c src/decoder.c
NO_WARN = -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
@@ -23,10 +22,10 @@ endif
all: droidcam-cli droidcam
droidcam-cli: src/droidcam-cli.c $(SRC)
- gcc -Wall $(CC) $(NO_WARN) $^ $(JPEG) $(LIBS) -lm -o droidcam-cli
+ gcc -Wall $(CC) $(NO_WARN) $^ $(LIBS) -lm -o droidcam-cli
droidcam: src/droidcam.c $(SRC)
- gcc -Wall $(CC) $(NO_WARN) $^ $(GTK) $(JPEG) $(LIBS) -lm -o droidcam
+ gcc -Wall $(CC) $(NO_WARN) $^ $(GTK) $(LIBS) -lm -o droidcam
clean:
rm droidcam || true
--
2.26.2
|