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
|
Description: Build with system libzstd
Author: Stephen Kitt <skitt@debian.org>
Forwarded: not-needed
--- a/src/dos/cdrom_image.cpp
+++ b/src/dos/cdrom_image.cpp
@@ -75,14 +75,6 @@
#include "src/libs/libchdr/lzma/LzmaDec.c"
#include "src/libs/libchdr/lzma/LzmaEnc.c"
#include "src/libs/libchdr/lzma/LzFind.c"
-#include "src/libs/libchdr/zstd/common/entropy_common.c"
-#include "src/libs/libchdr/zstd/common/error_private.c"
-#include "src/libs/libchdr/zstd/common/fse_decompress.c"
-#include "src/libs/libchdr/zstd/common/zstd_common.c"
-#include "src/libs/libchdr/zstd/decompress/huf_decompress.c"
-#include "src/libs/libchdr/zstd/decompress/zstd_decompress_block.c"
-#include "src/libs/libchdr/zstd/decompress/zstd_decompress.c"
-#include "src/libs/libchdr/zstd/decompress/zstd_ddict.c"
using namespace std;
--- a/configure.ac
+++ b/configure.ac
@@ -1338,6 +1338,7 @@
LIBS="$LIBS -lopusfile -lspeexdsp"
LIBS="$LIBS -lminizip"
LIBS="$LIBS -lphysfs"
+LIBS="$LIBS -lzstd"
AC_CONFIG_FILES([
Makefile
--- a/src/libs/libchdr/libchdr_chd.c
+++ b/src/libs/libchdr/libchdr_chd.c
@@ -48,7 +48,7 @@
#include "flac.h"
#include "huffman.h"
#define ZSTD_STATIC_LINKING_ONLY
-#include "zstd/zstd.h"
+#include <zstd.h>
#include "lzma/LzmaEnc.h"
#include "lzma/LzmaDec.h"
|