diff options
| author | yzrh <yzrh@noema.org> | 2022-12-29 16:32:49 +0000 |
|---|---|---|
| committer | yzrh <yzrh@noema.org> | 2022-12-29 17:30:36 +0000 |
| commit | 5a1afb00567aeacca9ead58f5383c3f502317a69 (patch) | |
| tree | 7b9c291c44d631565d05a38a2c6b9aa3a731f510 | |
| parent | 060bc00a0d68de72299d7084669b3b564248e205 (diff) | |
| download | melon-5a1afb00567aeacca9ead58f5383c3f502317a69.tar.gz melon-5a1afb00567aeacca9ead58f5383c3f502317a69.tar.zst | |
Link against libc for iconv, find openjpeg header with pkgconf.
Signed-off-by: yzrh <yzrh@noema.org>
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | src/Makefile | 7 | ||||
| -rw-r--r-- | src/jp2.c | 4 |
3 files changed, 12 insertions, 11 deletions
@@ -12,12 +12,12 @@ any failures with a sample that can reproduce the behaviour. Dependency ---------- -1. OpenSSL -2. libiconv -3. zlib -4. jbig2dec -5. libjpeg-turbo -6. openjpeg +1. libcrypto (OpenSSL) +2. zlib +3. jbig2dec +4. libjpeg-turbo +5. openjpeg +6. pkgconf Usage ===== diff --git a/src/Makefile b/src/Makefile index 065a8a5..5442ff0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,11 +16,16 @@ obj = ${src:.c=.o} PREFIX = /usr/local CFLAGS = -O2 -pipe -flto -Wall -Wextra -LDFLAGS = -Wl,-O2 -lcrypto -liconv -lz -ljbig2dec -ljpeg -lopenjp2 -Wl,--as-needed +LDFLAGS = -Wl,-O2 -lcrypto -lz -ljbig2dec -ljpeg -lopenjp2 -Wl,--as-needed CFLAGS += -I/usr/local/include LDFLAGS += -L/usr/local/lib +OPENJPEG_CFLAGS != pkgconf --cflags libopenjp2 + +CFLAGS += ${OPENJPEG_CFLAGS} +CFLAGS += -DLIBICONV_PLUG + all: ${obj} ${inc} ${CC} ${LDFLAGS} -o melon ${obj} @@ -6,11 +6,7 @@ #include <string.h> -#ifdef __linux__ #include <openjpeg.h> -#else -#include <openjpeg-2.5/openjpeg.h> -#endif typedef struct _stream_user_data { OPJ_SIZE_T pos; |