Skip to content

Commit

Permalink
Update libchdr
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdgleaver
jdgleaver committed Mar 17, 2021
1 parent c718e01 commit 78860cd
Show file tree
Hide file tree
Showing 396 changed files with 42,566 additions and 89,677 deletions.
73 changes: 20 additions & 53 deletions Makefile.linux
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,65 +153,32 @@ endif
ifeq "$(HAVE_CHD)" "1"

OBJDIRS += \
obj/external_lib/crypto \
obj/external_lib/flac-1.3.2/src/libFLAC \
obj/external_lib/lzma-16.04/C \
obj/external_lib/libchdr
obj/external_lib/lzma-19.00/src \
obj/external_lib/libchdr/src

OBJS += \
obj/external_lib/crypto/md5.o \
obj/external_lib/crypto/sha1.o \
obj/external_lib/flac-1.3.2/src/libFLAC/bitmath.o \
obj/external_lib/flac-1.3.2/src/libFLAC/bitreader.o \
obj/external_lib/flac-1.3.2/src/libFLAC/cpu.o \
obj/external_lib/flac-1.3.2/src/libFLAC/crc.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.o \
obj/external_lib/flac-1.3.2/src/libFLAC/float.o \
obj/external_lib/flac-1.3.2/src/libFLAC/format.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse.o \
obj/external_lib/flac-1.3.2/src/libFLAC/md5.o \
obj/external_lib/flac-1.3.2/src/libFLAC/memory.o \
obj/external_lib/flac-1.3.2/src/libFLAC/metadata_iterators.o \
obj/external_lib/flac-1.3.2/src/libFLAC/metadata_object.o \
obj/external_lib/flac-1.3.2/src/libFLAC/stream_decoder.o \
obj/external_lib/flac-1.3.2/src/libFLAC/window.o \
obj/external_lib/lzma-16.04/C/Alloc.o \
obj/external_lib/lzma-16.04/C/Bra86.o \
obj/external_lib/lzma-16.04/C/Bra.o \
obj/external_lib/lzma-16.04/C/BraIA64.o \
obj/external_lib/lzma-16.04/C/CpuArch.o \
obj/external_lib/lzma-16.04/C/Delta.o \
obj/external_lib/lzma-16.04/C/LzFind.o \
obj/external_lib/lzma-16.04/C/Lzma86Dec.o \
obj/external_lib/lzma-16.04/C/Lzma86Enc.o \
obj/external_lib/lzma-16.04/C/LzmaDec.o \
obj/external_lib/lzma-16.04/C/LzmaEnc.o \
obj/external_lib/lzma-16.04/C/LzmaLib.o \
obj/external_lib/lzma-16.04/C/Sort.o \
obj/external_lib/libchdr/bitstream.o \
obj/external_lib/libchdr/cdrom.o \
obj/external_lib/libchdr/chd.o \
obj/external_lib/libchdr/flac.o \
obj/external_lib/libchdr/huffman.o \
obj/external_lib/lzma-19.00/src/Alloc.o \
obj/external_lib/lzma-19.00/src/Bra86.o \
obj/external_lib/lzma-19.00/src/BraIA64.o \
obj/external_lib/lzma-19.00/src/CpuArch.o \
obj/external_lib/lzma-19.00/src/Delta.o \
obj/external_lib/lzma-19.00/src/LzFind.o \
obj/external_lib/lzma-19.00/src/Lzma86Dec.o \
obj/external_lib/lzma-19.00/src/LzmaDec.o \
obj/external_lib/lzma-19.00/src/LzmaEnc.o \
obj/external_lib/lzma-19.00/src/Sort.o \
obj/external_lib/libchdr/src/libchdr_bitstream.o \
obj/external_lib/libchdr/src/libchdr_cdrom.o \
obj/external_lib/libchdr/src/libchdr_chd.o \
obj/external_lib/libchdr/src/libchdr_flac.o \
obj/external_lib/libchdr/src/libchdr_huffman.o

CFLAGS += \
-Isrc/external_lib/crypto \
-Isrc/external_lib/flac-1.3.2/include \
-Isrc/external_lib/flac-1.3.2/src/libFLAC/include \
-Isrc/external_lib/lzma-16.04/C \
-Isrc/external_lib/libchdr
-Isrc/external_lib/lzma-19.00/include \
-Isrc/external_lib/libchdr/include

CFLAGS += \
-DHAVE_CHD \
-D'PACKAGE_VERSION="1.3.2"' -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL \
-DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DHAVE_SYS_PARAM_H \
-D_7ZIP_ST
-DHAVE_CHD -D_7ZIP_ST

LDFLAGS += -lm

Expand Down
73 changes: 20 additions & 53 deletions Makefile.pg2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,65 +221,32 @@ endif
ifeq "$(HAVE_CHD)" "1"

OBJDIRS += \
obj/external_lib/crypto \
obj/external_lib/flac-1.3.2/src/libFLAC \
obj/external_lib/lzma-16.04/C \
obj/external_lib/libchdr
obj/external_lib/lzma-19.00/src \
obj/external_lib/libchdr/src

OBJS += \
obj/external_lib/crypto/md5.o \
obj/external_lib/crypto/sha1.o \
obj/external_lib/flac-1.3.2/src/libFLAC/bitmath.o \
obj/external_lib/flac-1.3.2/src/libFLAC/bitreader.o \
obj/external_lib/flac-1.3.2/src/libFLAC/cpu.o \
obj/external_lib/flac-1.3.2/src/libFLAC/crc.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.o \
obj/external_lib/flac-1.3.2/src/libFLAC/float.o \
obj/external_lib/flac-1.3.2/src/libFLAC/format.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse.o \
obj/external_lib/flac-1.3.2/src/libFLAC/md5.o \
obj/external_lib/flac-1.3.2/src/libFLAC/memory.o \
obj/external_lib/flac-1.3.2/src/libFLAC/metadata_iterators.o \
obj/external_lib/flac-1.3.2/src/libFLAC/metadata_object.o \
obj/external_lib/flac-1.3.2/src/libFLAC/stream_decoder.o \
obj/external_lib/flac-1.3.2/src/libFLAC/window.o \
obj/external_lib/lzma-16.04/C/Alloc.o \
obj/external_lib/lzma-16.04/C/Bra86.o \
obj/external_lib/lzma-16.04/C/Bra.o \
obj/external_lib/lzma-16.04/C/BraIA64.o \
obj/external_lib/lzma-16.04/C/CpuArch.o \
obj/external_lib/lzma-16.04/C/Delta.o \
obj/external_lib/lzma-16.04/C/LzFind.o \
obj/external_lib/lzma-16.04/C/Lzma86Dec.o \
obj/external_lib/lzma-16.04/C/Lzma86Enc.o \
obj/external_lib/lzma-16.04/C/LzmaDec.o \
obj/external_lib/lzma-16.04/C/LzmaEnc.o \
obj/external_lib/lzma-16.04/C/LzmaLib.o \
obj/external_lib/lzma-16.04/C/Sort.o \
obj/external_lib/libchdr/bitstream.o \
obj/external_lib/libchdr/cdrom.o \
obj/external_lib/libchdr/chd.o \
obj/external_lib/libchdr/flac.o \
obj/external_lib/libchdr/huffman.o \
obj/external_lib/lzma-19.00/src/Alloc.o \
obj/external_lib/lzma-19.00/src/Bra86.o \
obj/external_lib/lzma-19.00/src/BraIA64.o \
obj/external_lib/lzma-19.00/src/CpuArch.o \
obj/external_lib/lzma-19.00/src/Delta.o \
obj/external_lib/lzma-19.00/src/LzFind.o \
obj/external_lib/lzma-19.00/src/Lzma86Dec.o \
obj/external_lib/lzma-19.00/src/LzmaDec.o \
obj/external_lib/lzma-19.00/src/LzmaEnc.o \
obj/external_lib/lzma-19.00/src/Sort.o \
obj/external_lib/libchdr/src/libchdr_bitstream.o \
obj/external_lib/libchdr/src/libchdr_cdrom.o \
obj/external_lib/libchdr/src/libchdr_chd.o \
obj/external_lib/libchdr/src/libchdr_flac.o \
obj/external_lib/libchdr/src/libchdr_huffman.o

CFLAGS += \
-Isrc/external_lib/crypto \
-Isrc/external_lib/flac-1.3.2/include \
-Isrc/external_lib/flac-1.3.2/src/libFLAC/include \
-Isrc/external_lib/lzma-16.04/C \
-Isrc/external_lib/libchdr
-Isrc/external_lib/lzma-19.00/include \
-Isrc/external_lib/libchdr/include

CFLAGS += \
-DHAVE_CHD \
-D'PACKAGE_VERSION="1.3.2"' -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL \
-DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DHAVE_SYS_PARAM_H \
-D_7ZIP_ST
-DHAVE_CHD -D_7ZIP_ST

LDFLAGS += -lm

Expand Down
73 changes: 20 additions & 53 deletions Makefile.pg2v2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,65 +221,32 @@ endif
ifeq "$(HAVE_CHD)" "1"

OBJDIRS += \
obj/external_lib/crypto \
obj/external_lib/flac-1.3.2/src/libFLAC \
obj/external_lib/lzma-16.04/C \
obj/external_lib/libchdr
obj/external_lib/lzma-19.00/src \
obj/external_lib/libchdr/src

OBJS += \
obj/external_lib/crypto/md5.o \
obj/external_lib/crypto/sha1.o \
obj/external_lib/flac-1.3.2/src/libFLAC/bitmath.o \
obj/external_lib/flac-1.3.2/src/libFLAC/bitreader.o \
obj/external_lib/flac-1.3.2/src/libFLAC/cpu.o \
obj/external_lib/flac-1.3.2/src/libFLAC/crc.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.o \
obj/external_lib/flac-1.3.2/src/libFLAC/float.o \
obj/external_lib/flac-1.3.2/src/libFLAC/format.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse.o \
obj/external_lib/flac-1.3.2/src/libFLAC/md5.o \
obj/external_lib/flac-1.3.2/src/libFLAC/memory.o \
obj/external_lib/flac-1.3.2/src/libFLAC/metadata_iterators.o \
obj/external_lib/flac-1.3.2/src/libFLAC/metadata_object.o \
obj/external_lib/flac-1.3.2/src/libFLAC/stream_decoder.o \
obj/external_lib/flac-1.3.2/src/libFLAC/window.o \
obj/external_lib/lzma-16.04/C/Alloc.o \
obj/external_lib/lzma-16.04/C/Bra86.o \
obj/external_lib/lzma-16.04/C/Bra.o \
obj/external_lib/lzma-16.04/C/BraIA64.o \
obj/external_lib/lzma-16.04/C/CpuArch.o \
obj/external_lib/lzma-16.04/C/Delta.o \
obj/external_lib/lzma-16.04/C/LzFind.o \
obj/external_lib/lzma-16.04/C/Lzma86Dec.o \
obj/external_lib/lzma-16.04/C/Lzma86Enc.o \
obj/external_lib/lzma-16.04/C/LzmaDec.o \
obj/external_lib/lzma-16.04/C/LzmaEnc.o \
obj/external_lib/lzma-16.04/C/LzmaLib.o \
obj/external_lib/lzma-16.04/C/Sort.o \
obj/external_lib/libchdr/bitstream.o \
obj/external_lib/libchdr/cdrom.o \
obj/external_lib/libchdr/chd.o \
obj/external_lib/libchdr/flac.o \
obj/external_lib/libchdr/huffman.o \
obj/external_lib/lzma-19.00/src/Alloc.o \
obj/external_lib/lzma-19.00/src/Bra86.o \
obj/external_lib/lzma-19.00/src/BraIA64.o \
obj/external_lib/lzma-19.00/src/CpuArch.o \
obj/external_lib/lzma-19.00/src/Delta.o \
obj/external_lib/lzma-19.00/src/LzFind.o \
obj/external_lib/lzma-19.00/src/Lzma86Dec.o \
obj/external_lib/lzma-19.00/src/LzmaDec.o \
obj/external_lib/lzma-19.00/src/LzmaEnc.o \
obj/external_lib/lzma-19.00/src/Sort.o \
obj/external_lib/libchdr/src/libchdr_bitstream.o \
obj/external_lib/libchdr/src/libchdr_cdrom.o \
obj/external_lib/libchdr/src/libchdr_chd.o \
obj/external_lib/libchdr/src/libchdr_flac.o \
obj/external_lib/libchdr/src/libchdr_huffman.o

CFLAGS += \
-Isrc/external_lib/crypto \
-Isrc/external_lib/flac-1.3.2/include \
-Isrc/external_lib/flac-1.3.2/src/libFLAC/include \
-Isrc/external_lib/lzma-16.04/C \
-Isrc/external_lib/libchdr
-Isrc/external_lib/lzma-19.00/include \
-Isrc/external_lib/libchdr/include

CFLAGS += \
-DHAVE_CHD \
-D'PACKAGE_VERSION="1.3.2"' -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL \
-DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DHAVE_SYS_PARAM_H \
-D_7ZIP_ST
-DHAVE_CHD -D_7ZIP_ST

LDFLAGS += -lm

Expand Down
73 changes: 20 additions & 53 deletions Makefile.rg350
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,65 +221,32 @@ endif
ifeq "$(HAVE_CHD)" "1"

OBJDIRS += \
obj/external_lib/crypto \
obj/external_lib/flac-1.3.2/src/libFLAC \
obj/external_lib/lzma-16.04/C \
obj/external_lib/libchdr
obj/external_lib/lzma-19.00/src \
obj/external_lib/libchdr/src

OBJS += \
obj/external_lib/crypto/md5.o \
obj/external_lib/crypto/sha1.o \
obj/external_lib/flac-1.3.2/src/libFLAC/bitmath.o \
obj/external_lib/flac-1.3.2/src/libFLAC/bitreader.o \
obj/external_lib/flac-1.3.2/src/libFLAC/cpu.o \
obj/external_lib/flac-1.3.2/src/libFLAC/crc.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.o \
obj/external_lib/flac-1.3.2/src/libFLAC/float.o \
obj/external_lib/flac-1.3.2/src/libFLAC/format.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.o \
obj/external_lib/flac-1.3.2/src/libFLAC/lpc_intrin_sse.o \
obj/external_lib/flac-1.3.2/src/libFLAC/md5.o \
obj/external_lib/flac-1.3.2/src/libFLAC/memory.o \
obj/external_lib/flac-1.3.2/src/libFLAC/metadata_iterators.o \
obj/external_lib/flac-1.3.2/src/libFLAC/metadata_object.o \
obj/external_lib/flac-1.3.2/src/libFLAC/stream_decoder.o \
obj/external_lib/flac-1.3.2/src/libFLAC/window.o \
obj/external_lib/lzma-16.04/C/Alloc.o \
obj/external_lib/lzma-16.04/C/Bra86.o \
obj/external_lib/lzma-16.04/C/Bra.o \
obj/external_lib/lzma-16.04/C/BraIA64.o \
obj/external_lib/lzma-16.04/C/CpuArch.o \
obj/external_lib/lzma-16.04/C/Delta.o \
obj/external_lib/lzma-16.04/C/LzFind.o \
obj/external_lib/lzma-16.04/C/Lzma86Dec.o \
obj/external_lib/lzma-16.04/C/Lzma86Enc.o \
obj/external_lib/lzma-16.04/C/LzmaDec.o \
obj/external_lib/lzma-16.04/C/LzmaEnc.o \
obj/external_lib/lzma-16.04/C/LzmaLib.o \
obj/external_lib/lzma-16.04/C/Sort.o \
obj/external_lib/libchdr/bitstream.o \
obj/external_lib/libchdr/cdrom.o \
obj/external_lib/libchdr/chd.o \
obj/external_lib/libchdr/flac.o \
obj/external_lib/libchdr/huffman.o \
obj/external_lib/lzma-19.00/src/Alloc.o \
obj/external_lib/lzma-19.00/src/Bra86.o \
obj/external_lib/lzma-19.00/src/BraIA64.o \
obj/external_lib/lzma-19.00/src/CpuArch.o \
obj/external_lib/lzma-19.00/src/Delta.o \
obj/external_lib/lzma-19.00/src/LzFind.o \
obj/external_lib/lzma-19.00/src/Lzma86Dec.o \
obj/external_lib/lzma-19.00/src/LzmaDec.o \
obj/external_lib/lzma-19.00/src/LzmaEnc.o \
obj/external_lib/lzma-19.00/src/Sort.o \
obj/external_lib/libchdr/src/libchdr_bitstream.o \
obj/external_lib/libchdr/src/libchdr_cdrom.o \
obj/external_lib/libchdr/src/libchdr_chd.o \
obj/external_lib/libchdr/src/libchdr_flac.o \
obj/external_lib/libchdr/src/libchdr_huffman.o

CFLAGS += \
-Isrc/external_lib/crypto \
-Isrc/external_lib/flac-1.3.2/include \
-Isrc/external_lib/flac-1.3.2/src/libFLAC/include \
-Isrc/external_lib/lzma-16.04/C \
-Isrc/external_lib/libchdr
-Isrc/external_lib/lzma-19.00/include \
-Isrc/external_lib/libchdr/include

CFLAGS += \
-DHAVE_CHD \
-D'PACKAGE_VERSION="1.3.2"' -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL \
-DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DHAVE_SYS_PARAM_H \
-D_7ZIP_ST
-DHAVE_CHD -D_7ZIP_ST

LDFLAGS += -lm

Expand Down
2 changes: 1 addition & 1 deletion src/cdriso.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include <errno.h>
#include <zlib.h>
#ifdef HAVE_CHD
#include "chd.h"
#include "libchdr/chd.h"
#endif

#define OFF_T_MSB ((off_t)1 << (sizeof(off_t) * 8 - 1))
Expand Down
17 changes: 0 additions & 17 deletions src/external_lib/crypto/README.md
View file

This file was deleted.

Loading

0 comments on commit 78860cd

Please sign in to comment.