diff --git a/Makefile.common b/Makefile.common index b89108b4..f15eae04 100644 --- a/Makefile.common +++ b/Makefile.common @@ -7,7 +7,7 @@ INCFLAGS := \ -I$(CORE_DIR)/cpu/m68000 \ -I$(CORE_DIR)/mame2003 \ -I$(LIBRETRO_COMM_DIR)/include \ - -I$(CORE_DIR)/lib/libFLAC/include \ + -I$(CORE_DIR)/libretro-deps/libFLAC/include \ -I$(CORE_DIR)/lib/mame-chd \ -I$(CORE_DIR)/lib/zlib @@ -2651,24 +2651,24 @@ endif SOURCES_C += \ $(CORE_DIR)/lib/mame-chd/chd.c \ - $(CORE_DIR)/lib/mame-chd/libchdr_sha1.c + $(CORE_DIR)/lib/mame-chd/mame_sha1.c SOURCES_C += \ - $(CORE_DIR)/lib/libFLAC/bitmath.c \ - $(CORE_DIR)/lib/libFLAC/bitreader.c \ - $(CORE_DIR)/lib/libFLAC/bitwriter.c \ - $(CORE_DIR)/lib/libFLAC/cpu.c \ - $(CORE_DIR)/lib/libFLAC/crc.c \ - $(CORE_DIR)/lib/libFLAC/fixed.c \ - $(CORE_DIR)/lib/libFLAC/float.c \ - $(CORE_DIR)/lib/libFLAC/format.c \ - $(CORE_DIR)/lib/libFLAC/lpc.c \ - $(CORE_DIR)/lib/libFLAC/md5.c \ - $(CORE_DIR)/lib/libFLAC/memory.c \ - $(CORE_DIR)/lib/libFLAC/stream_decoder.c \ - $(CORE_DIR)/lib/libFLAC/stream_encoder.c \ - $(CORE_DIR)/lib/libFLAC/stream_encoder_framing.c \ - $(CORE_DIR)/lib/libFLAC/window.c + $(CORE_DIR)/libretro-deps/libFLAC/bitmath.c \ + $(CORE_DIR)/libretro-deps/libFLAC/bitreader.c \ + $(CORE_DIR)/libretro-deps/libFLAC/bitwriter.c \ + $(CORE_DIR)/libretro-deps/libFLAC/cpu.c \ + $(CORE_DIR)/libretro-deps/libFLAC/crc.c \ + $(CORE_DIR)/libretro-deps/libFLAC/fixed.c \ + $(CORE_DIR)/libretro-deps/libFLAC/float.c \ + $(CORE_DIR)/libretro-deps/libFLAC/format.c \ + $(CORE_DIR)/libretro-deps/libFLAC/lpc.c \ + $(CORE_DIR)/libretro-deps/libFLAC/md5.c \ + $(CORE_DIR)/libretro-deps/libFLAC/memory.c \ + $(CORE_DIR)/libretro-deps/libFLAC/stream_decoder.c \ + $(CORE_DIR)/libretro-deps/libFLAC/stream_encoder.c \ + $(CORE_DIR)/libretro-deps/libFLAC/stream_encoder_framing.c \ + $(CORE_DIR)/libretro-deps/libFLAC/window.c ifeq ($(STATIC_LINKING),1) else @@ -2683,7 +2683,6 @@ SOURCES_C += \ $(LIBRETRO_COMM_DIR)/streams/file_stream.c \ $(LIBRETRO_COMM_DIR)/string/stdstring.c \ $(LIBRETRO_COMM_DIR)/utils/md5.c \ - $(LIBRETRO_COMM_DIR)/utils/sha1.c \ $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.c \ $(CORE_DIR)/lib/zlib/adler32.c \ $(CORE_DIR)/lib/zlib/compress.c \ diff --git a/src/common.c b/src/common.c index 230daebe..83393a05 100644 --- a/src/common.c +++ b/src/common.c @@ -11,7 +11,7 @@ #include #include #include -#include "lib/libFLAC/include/FLAC/all.h" +#include "libretro-deps/libFLAC/include/FLAC/all.h" #include "log.h" //#define LOG_LOAD diff --git a/src/hash.c b/src/hash.c index 3f0b0bf6..dc1318af 100644 --- a/src/hash.c +++ b/src/hash.c @@ -131,7 +131,7 @@ #include #include "hash.h" #include -#include +#include "mame_sha1.h" #include "osd_cpu.h" #include "mame.h" #include "common.h" diff --git a/src/lib/mame-chd/chd.c b/src/lib/mame-chd/chd.c index 7c1da0fb..ae3b7501 100644 --- a/src/lib/mame-chd/chd.c +++ b/src/lib/mame-chd/chd.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include "mame_sha1.h" #include #include #include diff --git a/src/lib/mame-chd/libchdr_sha1.c b/src/lib/mame-chd/mame_sha1.c similarity index 96% rename from src/lib/mame-chd/libchdr_sha1.c rename to src/lib/mame-chd/mame_sha1.c index c3dcf019..22d8ccef 100644 --- a/src/lib/mame-chd/libchdr_sha1.c +++ b/src/lib/mame-chd/mame_sha1.c @@ -23,7 +23,7 @@ * MA 02111-1307, USA. */ -#include +#include #include #include diff --git a/src/libretro-common/include/utils/sha1.h b/src/lib/mame-chd/mame_sha1.h similarity index 92% rename from src/libretro-common/include/utils/sha1.h rename to src/lib/mame-chd/mame_sha1.h index b94aa63f..acf655ae 100644 --- a/src/libretro-common/include/utils/sha1.h +++ b/src/lib/mame-chd/mame_sha1.h @@ -1,61 +1,61 @@ -/* sha1.h - * - * The sha1 hash function. - */ - -/* nettle, low-level cryptographics library - * - * Copyright (C) 2001 Niels Möller - * - * The nettle library is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or (at your - * option) any later version. - * - * The nettle library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with the nettle library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - * MA 02111-1307, USA. - */ - -#ifndef NETTLE_SHA1_H_INCLUDED -#define NETTLE_SHA1_H_INCLUDED - -#include - -#define SHA1_DIGEST_SIZE 20 -#define SHA1_DATA_SIZE 64 - -/* Digest is kept internally as 4 32-bit words. */ -#define _SHA1_DIGEST_LENGTH 5 - -struct sha1_ctx -{ - uint32_t digest[_SHA1_DIGEST_LENGTH]; /* Message digest */ - uint32_t count_low, count_high; /* 64-bit block count */ - uint8_t block[SHA1_DATA_SIZE]; /* SHA1 data buffer */ - unsigned int index; /* index into buffer */ -}; - -void -sha1_init(struct sha1_ctx *ctx); - -void -sha1_update(struct sha1_ctx *ctx, - unsigned length, - const uint8_t *data); - -void -sha1_final(struct sha1_ctx *ctx); - -void -sha1_digest(const struct sha1_ctx *ctx, - unsigned length, - uint8_t *digest); - -#endif /* NETTLE_SHA1_H_INCLUDED */ +/* sha1.h + * + * The sha1 hash function. + */ + +/* nettle, low-level cryptographics library + * + * Copyright (C) 2001 Niels M�ller + * + * The nettle library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or (at your + * option) any later version. + * + * The nettle library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with the nettle library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + * MA 02111-1307, USA. + */ + +#ifndef NETTLE_SHA1_H_INCLUDED +#define NETTLE_SHA1_H_INCLUDED + +#include + +#define SHA1_DIGEST_SIZE 20 +#define SHA1_DATA_SIZE 64 + +/* Digest is kept internally as 4 32-bit words. */ +#define _SHA1_DIGEST_LENGTH 5 + +struct sha1_ctx +{ + uint32_t digest[_SHA1_DIGEST_LENGTH]; /* Message digest */ + uint32_t count_low, count_high; /* 64-bit block count */ + uint8_t block[SHA1_DATA_SIZE]; /* SHA1 data buffer */ + unsigned int index; /* index into buffer */ +}; + +void +sha1_init(struct sha1_ctx *ctx); + +void +sha1_update(struct sha1_ctx *ctx, + unsigned length, + const uint8_t *data); + +void +sha1_final(struct sha1_ctx *ctx); + +void +sha1_digest(const struct sha1_ctx *ctx, + unsigned length, + uint8_t *digest); + +#endif /* NETTLE_SHA1_H_INCLUDED */ \ No newline at end of file diff --git a/src/lib/libFLAC/bitmath.c b/src/libretro-deps/libFLAC/bitmath.c similarity index 100% rename from src/lib/libFLAC/bitmath.c rename to src/libretro-deps/libFLAC/bitmath.c diff --git a/src/lib/libFLAC/bitreader.c b/src/libretro-deps/libFLAC/bitreader.c similarity index 100% rename from src/lib/libFLAC/bitreader.c rename to src/libretro-deps/libFLAC/bitreader.c diff --git a/src/lib/libFLAC/bitwriter.c b/src/libretro-deps/libFLAC/bitwriter.c similarity index 100% rename from src/lib/libFLAC/bitwriter.c rename to src/libretro-deps/libFLAC/bitwriter.c diff --git a/src/lib/libFLAC/config.h b/src/libretro-deps/libFLAC/config.h similarity index 100% rename from src/lib/libFLAC/config.h rename to src/libretro-deps/libFLAC/config.h diff --git a/src/lib/libFLAC/cpu.c b/src/libretro-deps/libFLAC/cpu.c similarity index 100% rename from src/lib/libFLAC/cpu.c rename to src/libretro-deps/libFLAC/cpu.c diff --git a/src/lib/libFLAC/crc.c b/src/libretro-deps/libFLAC/crc.c similarity index 100% rename from src/lib/libFLAC/crc.c rename to src/libretro-deps/libFLAC/crc.c diff --git a/src/lib/libFLAC/fixed.c b/src/libretro-deps/libFLAC/fixed.c similarity index 100% rename from src/lib/libFLAC/fixed.c rename to src/libretro-deps/libFLAC/fixed.c diff --git a/src/lib/libFLAC/fixed_intrin_sse2.c b/src/libretro-deps/libFLAC/fixed_intrin_sse2.c similarity index 100% rename from src/lib/libFLAC/fixed_intrin_sse2.c rename to src/libretro-deps/libFLAC/fixed_intrin_sse2.c diff --git a/src/lib/libFLAC/fixed_intrin_ssse3.c b/src/libretro-deps/libFLAC/fixed_intrin_ssse3.c similarity index 100% rename from src/lib/libFLAC/fixed_intrin_ssse3.c rename to src/libretro-deps/libFLAC/fixed_intrin_ssse3.c diff --git a/src/lib/libFLAC/float.c b/src/libretro-deps/libFLAC/float.c similarity index 100% rename from src/lib/libFLAC/float.c rename to src/libretro-deps/libFLAC/float.c diff --git a/src/lib/libFLAC/format.c b/src/libretro-deps/libFLAC/format.c similarity index 100% rename from src/lib/libFLAC/format.c rename to src/libretro-deps/libFLAC/format.c diff --git a/src/lib/libFLAC/grabbag/cuesheet.h b/src/libretro-deps/libFLAC/grabbag/cuesheet.h similarity index 100% rename from src/lib/libFLAC/grabbag/cuesheet.h rename to src/libretro-deps/libFLAC/grabbag/cuesheet.h diff --git a/src/lib/libFLAC/grabbag/file.h b/src/libretro-deps/libFLAC/grabbag/file.h similarity index 100% rename from src/lib/libFLAC/grabbag/file.h rename to src/libretro-deps/libFLAC/grabbag/file.h diff --git a/src/lib/libFLAC/grabbag/picture.h b/src/libretro-deps/libFLAC/grabbag/picture.h similarity index 100% rename from src/lib/libFLAC/grabbag/picture.h rename to src/libretro-deps/libFLAC/grabbag/picture.h diff --git a/src/lib/libFLAC/grabbag/replaygain.h b/src/libretro-deps/libFLAC/grabbag/replaygain.h similarity index 100% rename from src/lib/libFLAC/grabbag/replaygain.h rename to src/libretro-deps/libFLAC/grabbag/replaygain.h diff --git a/src/lib/libFLAC/grabbag/seektable.h b/src/libretro-deps/libFLAC/grabbag/seektable.h similarity index 100% rename from src/lib/libFLAC/grabbag/seektable.h rename to src/libretro-deps/libFLAC/grabbag/seektable.h diff --git a/src/lib/libFLAC/ia32/bitreader_asm.nasm b/src/libretro-deps/libFLAC/ia32/bitreader_asm.nasm similarity index 100% rename from src/lib/libFLAC/ia32/bitreader_asm.nasm rename to src/libretro-deps/libFLAC/ia32/bitreader_asm.nasm diff --git a/src/lib/libFLAC/ia32/cpu_asm.nasm b/src/libretro-deps/libFLAC/ia32/cpu_asm.nasm similarity index 100% rename from src/lib/libFLAC/ia32/cpu_asm.nasm rename to src/libretro-deps/libFLAC/ia32/cpu_asm.nasm diff --git a/src/lib/libFLAC/ia32/fixed_asm.nasm b/src/libretro-deps/libFLAC/ia32/fixed_asm.nasm similarity index 100% rename from src/lib/libFLAC/ia32/fixed_asm.nasm rename to src/libretro-deps/libFLAC/ia32/fixed_asm.nasm diff --git a/src/lib/libFLAC/ia32/lpc_asm-unrolled.nasm b/src/libretro-deps/libFLAC/ia32/lpc_asm-unrolled.nasm similarity index 100% rename from src/lib/libFLAC/ia32/lpc_asm-unrolled.nasm rename to src/libretro-deps/libFLAC/ia32/lpc_asm-unrolled.nasm diff --git a/src/lib/libFLAC/ia32/lpc_asm.nasm b/src/libretro-deps/libFLAC/ia32/lpc_asm.nasm similarity index 100% rename from src/lib/libFLAC/ia32/lpc_asm.nasm rename to src/libretro-deps/libFLAC/ia32/lpc_asm.nasm diff --git a/src/lib/libFLAC/ia32/nasm.h b/src/libretro-deps/libFLAC/ia32/nasm.h similarity index 100% rename from src/lib/libFLAC/ia32/nasm.h rename to src/libretro-deps/libFLAC/ia32/nasm.h diff --git a/src/lib/libFLAC/ia32/stream_encoder_asm.nasm b/src/libretro-deps/libFLAC/ia32/stream_encoder_asm.nasm similarity index 100% rename from src/lib/libFLAC/ia32/stream_encoder_asm.nasm rename to src/libretro-deps/libFLAC/ia32/stream_encoder_asm.nasm diff --git a/src/lib/libFLAC/include/FLAC/all.h b/src/libretro-deps/libFLAC/include/FLAC/all.h similarity index 100% rename from src/lib/libFLAC/include/FLAC/all.h rename to src/libretro-deps/libFLAC/include/FLAC/all.h diff --git a/src/lib/libFLAC/include/FLAC/assert.h b/src/libretro-deps/libFLAC/include/FLAC/assert.h similarity index 100% rename from src/lib/libFLAC/include/FLAC/assert.h rename to src/libretro-deps/libFLAC/include/FLAC/assert.h diff --git a/src/lib/libFLAC/include/FLAC/callback.h b/src/libretro-deps/libFLAC/include/FLAC/callback.h similarity index 100% rename from src/lib/libFLAC/include/FLAC/callback.h rename to src/libretro-deps/libFLAC/include/FLAC/callback.h diff --git a/src/lib/libFLAC/include/FLAC/export.h b/src/libretro-deps/libFLAC/include/FLAC/export.h similarity index 100% rename from src/lib/libFLAC/include/FLAC/export.h rename to src/libretro-deps/libFLAC/include/FLAC/export.h diff --git a/src/lib/libFLAC/include/FLAC/format.h b/src/libretro-deps/libFLAC/include/FLAC/format.h similarity index 100% rename from src/lib/libFLAC/include/FLAC/format.h rename to src/libretro-deps/libFLAC/include/FLAC/format.h diff --git a/src/lib/libFLAC/include/FLAC/metadata.h b/src/libretro-deps/libFLAC/include/FLAC/metadata.h similarity index 100% rename from src/lib/libFLAC/include/FLAC/metadata.h rename to src/libretro-deps/libFLAC/include/FLAC/metadata.h diff --git a/src/lib/libFLAC/include/FLAC/ordinals.h b/src/libretro-deps/libFLAC/include/FLAC/ordinals.h similarity index 100% rename from src/lib/libFLAC/include/FLAC/ordinals.h rename to src/libretro-deps/libFLAC/include/FLAC/ordinals.h diff --git a/src/lib/libFLAC/include/FLAC/stream_decoder.h b/src/libretro-deps/libFLAC/include/FLAC/stream_decoder.h similarity index 100% rename from src/lib/libFLAC/include/FLAC/stream_decoder.h rename to src/libretro-deps/libFLAC/include/FLAC/stream_decoder.h diff --git a/src/lib/libFLAC/include/FLAC/stream_encoder.h b/src/libretro-deps/libFLAC/include/FLAC/stream_encoder.h similarity index 100% rename from src/lib/libFLAC/include/FLAC/stream_encoder.h rename to src/libretro-deps/libFLAC/include/FLAC/stream_encoder.h diff --git a/src/lib/libFLAC/include/private/all.h b/src/libretro-deps/libFLAC/include/private/all.h similarity index 100% rename from src/lib/libFLAC/include/private/all.h rename to src/libretro-deps/libFLAC/include/private/all.h diff --git a/src/lib/libFLAC/include/private/bitmath.h b/src/libretro-deps/libFLAC/include/private/bitmath.h similarity index 100% rename from src/lib/libFLAC/include/private/bitmath.h rename to src/libretro-deps/libFLAC/include/private/bitmath.h diff --git a/src/lib/libFLAC/include/private/bitreader.h b/src/libretro-deps/libFLAC/include/private/bitreader.h similarity index 100% rename from src/lib/libFLAC/include/private/bitreader.h rename to src/libretro-deps/libFLAC/include/private/bitreader.h diff --git a/src/lib/libFLAC/include/private/bitwriter.h b/src/libretro-deps/libFLAC/include/private/bitwriter.h similarity index 100% rename from src/lib/libFLAC/include/private/bitwriter.h rename to src/libretro-deps/libFLAC/include/private/bitwriter.h diff --git a/src/lib/libFLAC/include/private/cpu.h b/src/libretro-deps/libFLAC/include/private/cpu.h similarity index 100% rename from src/lib/libFLAC/include/private/cpu.h rename to src/libretro-deps/libFLAC/include/private/cpu.h diff --git a/src/lib/libFLAC/include/private/crc.h b/src/libretro-deps/libFLAC/include/private/crc.h similarity index 100% rename from src/lib/libFLAC/include/private/crc.h rename to src/libretro-deps/libFLAC/include/private/crc.h diff --git a/src/lib/libFLAC/include/private/fixed.h b/src/libretro-deps/libFLAC/include/private/fixed.h similarity index 100% rename from src/lib/libFLAC/include/private/fixed.h rename to src/libretro-deps/libFLAC/include/private/fixed.h diff --git a/src/lib/libFLAC/include/private/float.h b/src/libretro-deps/libFLAC/include/private/float.h similarity index 100% rename from src/lib/libFLAC/include/private/float.h rename to src/libretro-deps/libFLAC/include/private/float.h diff --git a/src/lib/libFLAC/include/private/format.h b/src/libretro-deps/libFLAC/include/private/format.h similarity index 100% rename from src/lib/libFLAC/include/private/format.h rename to src/libretro-deps/libFLAC/include/private/format.h diff --git a/src/lib/libFLAC/include/private/lpc.h b/src/libretro-deps/libFLAC/include/private/lpc.h similarity index 100% rename from src/lib/libFLAC/include/private/lpc.h rename to src/libretro-deps/libFLAC/include/private/lpc.h diff --git a/src/lib/libFLAC/include/private/macros.h b/src/libretro-deps/libFLAC/include/private/macros.h similarity index 100% rename from src/lib/libFLAC/include/private/macros.h rename to src/libretro-deps/libFLAC/include/private/macros.h diff --git a/src/lib/libFLAC/include/private/md5.h b/src/libretro-deps/libFLAC/include/private/md5.h similarity index 100% rename from src/lib/libFLAC/include/private/md5.h rename to src/libretro-deps/libFLAC/include/private/md5.h diff --git a/src/lib/libFLAC/include/private/memory.h b/src/libretro-deps/libFLAC/include/private/memory.h similarity index 100% rename from src/lib/libFLAC/include/private/memory.h rename to src/libretro-deps/libFLAC/include/private/memory.h diff --git a/src/lib/libFLAC/include/private/metadata.h b/src/libretro-deps/libFLAC/include/private/metadata.h similarity index 100% rename from src/lib/libFLAC/include/private/metadata.h rename to src/libretro-deps/libFLAC/include/private/metadata.h diff --git a/src/lib/libFLAC/include/private/ogg_decoder_aspect.h b/src/libretro-deps/libFLAC/include/private/ogg_decoder_aspect.h similarity index 100% rename from src/lib/libFLAC/include/private/ogg_decoder_aspect.h rename to src/libretro-deps/libFLAC/include/private/ogg_decoder_aspect.h diff --git a/src/lib/libFLAC/include/private/ogg_encoder_aspect.h b/src/libretro-deps/libFLAC/include/private/ogg_encoder_aspect.h similarity index 100% rename from src/lib/libFLAC/include/private/ogg_encoder_aspect.h rename to src/libretro-deps/libFLAC/include/private/ogg_encoder_aspect.h diff --git a/src/lib/libFLAC/include/private/ogg_helper.h b/src/libretro-deps/libFLAC/include/private/ogg_helper.h similarity index 100% rename from src/lib/libFLAC/include/private/ogg_helper.h rename to src/libretro-deps/libFLAC/include/private/ogg_helper.h diff --git a/src/lib/libFLAC/include/private/ogg_mapping.h b/src/libretro-deps/libFLAC/include/private/ogg_mapping.h similarity index 100% rename from src/lib/libFLAC/include/private/ogg_mapping.h rename to src/libretro-deps/libFLAC/include/private/ogg_mapping.h diff --git a/src/lib/libFLAC/include/private/stream_encoder.h b/src/libretro-deps/libFLAC/include/private/stream_encoder.h similarity index 100% rename from src/lib/libFLAC/include/private/stream_encoder.h rename to src/libretro-deps/libFLAC/include/private/stream_encoder.h diff --git a/src/lib/libFLAC/include/private/stream_encoder_framing.h b/src/libretro-deps/libFLAC/include/private/stream_encoder_framing.h similarity index 100% rename from src/lib/libFLAC/include/private/stream_encoder_framing.h rename to src/libretro-deps/libFLAC/include/private/stream_encoder_framing.h diff --git a/src/lib/libFLAC/include/private/window.h b/src/libretro-deps/libFLAC/include/private/window.h similarity index 100% rename from src/lib/libFLAC/include/private/window.h rename to src/libretro-deps/libFLAC/include/private/window.h diff --git a/src/lib/libFLAC/include/protected/all.h b/src/libretro-deps/libFLAC/include/protected/all.h similarity index 100% rename from src/lib/libFLAC/include/protected/all.h rename to src/libretro-deps/libFLAC/include/protected/all.h diff --git a/src/lib/libFLAC/include/protected/stream_decoder.h b/src/libretro-deps/libFLAC/include/protected/stream_decoder.h similarity index 100% rename from src/lib/libFLAC/include/protected/stream_decoder.h rename to src/libretro-deps/libFLAC/include/protected/stream_decoder.h diff --git a/src/lib/libFLAC/include/protected/stream_encoder.h b/src/libretro-deps/libFLAC/include/protected/stream_encoder.h similarity index 100% rename from src/lib/libFLAC/include/protected/stream_encoder.h rename to src/libretro-deps/libFLAC/include/protected/stream_encoder.h diff --git a/src/lib/libFLAC/include/share/Makefile.am b/src/libretro-deps/libFLAC/include/share/Makefile.am similarity index 100% rename from src/lib/libFLAC/include/share/Makefile.am rename to src/libretro-deps/libFLAC/include/share/Makefile.am diff --git a/src/lib/libFLAC/include/share/alloc.h b/src/libretro-deps/libFLAC/include/share/alloc.h similarity index 100% rename from src/lib/libFLAC/include/share/alloc.h rename to src/libretro-deps/libFLAC/include/share/alloc.h diff --git a/src/lib/libFLAC/include/share/compat.h b/src/libretro-deps/libFLAC/include/share/compat.h similarity index 100% rename from src/lib/libFLAC/include/share/compat.h rename to src/libretro-deps/libFLAC/include/share/compat.h diff --git a/src/lib/libFLAC/include/share/endswap.h b/src/libretro-deps/libFLAC/include/share/endswap.h similarity index 100% rename from src/lib/libFLAC/include/share/endswap.h rename to src/libretro-deps/libFLAC/include/share/endswap.h diff --git a/src/lib/libFLAC/include/share/getopt.h b/src/libretro-deps/libFLAC/include/share/getopt.h similarity index 100% rename from src/lib/libFLAC/include/share/getopt.h rename to src/libretro-deps/libFLAC/include/share/getopt.h diff --git a/src/lib/libFLAC/include/share/grabbag.h b/src/libretro-deps/libFLAC/include/share/grabbag.h similarity index 100% rename from src/lib/libFLAC/include/share/grabbag.h rename to src/libretro-deps/libFLAC/include/share/grabbag.h diff --git a/src/lib/libFLAC/include/share/grabbag/Makefile.am b/src/libretro-deps/libFLAC/include/share/grabbag/Makefile.am similarity index 100% rename from src/lib/libFLAC/include/share/grabbag/Makefile.am rename to src/libretro-deps/libFLAC/include/share/grabbag/Makefile.am diff --git a/src/lib/libFLAC/include/share/grabbag/cuesheet.h b/src/libretro-deps/libFLAC/include/share/grabbag/cuesheet.h similarity index 100% rename from src/lib/libFLAC/include/share/grabbag/cuesheet.h rename to src/libretro-deps/libFLAC/include/share/grabbag/cuesheet.h diff --git a/src/lib/libFLAC/include/share/grabbag/file.h b/src/libretro-deps/libFLAC/include/share/grabbag/file.h similarity index 100% rename from src/lib/libFLAC/include/share/grabbag/file.h rename to src/libretro-deps/libFLAC/include/share/grabbag/file.h diff --git a/src/lib/libFLAC/include/share/grabbag/picture.h b/src/libretro-deps/libFLAC/include/share/grabbag/picture.h similarity index 100% rename from src/lib/libFLAC/include/share/grabbag/picture.h rename to src/libretro-deps/libFLAC/include/share/grabbag/picture.h diff --git a/src/lib/libFLAC/include/share/grabbag/replaygain.h b/src/libretro-deps/libFLAC/include/share/grabbag/replaygain.h similarity index 100% rename from src/lib/libFLAC/include/share/grabbag/replaygain.h rename to src/libretro-deps/libFLAC/include/share/grabbag/replaygain.h diff --git a/src/lib/libFLAC/include/share/grabbag/seektable.h b/src/libretro-deps/libFLAC/include/share/grabbag/seektable.h similarity index 100% rename from src/lib/libFLAC/include/share/grabbag/seektable.h rename to src/libretro-deps/libFLAC/include/share/grabbag/seektable.h diff --git a/src/lib/libFLAC/include/share/macros.h b/src/libretro-deps/libFLAC/include/share/macros.h similarity index 100% rename from src/lib/libFLAC/include/share/macros.h rename to src/libretro-deps/libFLAC/include/share/macros.h diff --git a/src/lib/libFLAC/include/share/private.h b/src/libretro-deps/libFLAC/include/share/private.h similarity index 100% rename from src/lib/libFLAC/include/share/private.h rename to src/libretro-deps/libFLAC/include/share/private.h diff --git a/src/lib/libFLAC/include/share/replaygain_analysis.h b/src/libretro-deps/libFLAC/include/share/replaygain_analysis.h similarity index 100% rename from src/lib/libFLAC/include/share/replaygain_analysis.h rename to src/libretro-deps/libFLAC/include/share/replaygain_analysis.h diff --git a/src/lib/libFLAC/include/share/replaygain_synthesis.h b/src/libretro-deps/libFLAC/include/share/replaygain_synthesis.h similarity index 100% rename from src/lib/libFLAC/include/share/replaygain_synthesis.h rename to src/libretro-deps/libFLAC/include/share/replaygain_synthesis.h diff --git a/src/lib/libFLAC/include/share/safe_str.h b/src/libretro-deps/libFLAC/include/share/safe_str.h similarity index 100% rename from src/lib/libFLAC/include/share/safe_str.h rename to src/libretro-deps/libFLAC/include/share/safe_str.h diff --git a/src/lib/libFLAC/include/share/utf8.h b/src/libretro-deps/libFLAC/include/share/utf8.h similarity index 100% rename from src/lib/libFLAC/include/share/utf8.h rename to src/libretro-deps/libFLAC/include/share/utf8.h diff --git a/src/lib/libFLAC/include/share/win_utf8_io.h b/src/libretro-deps/libFLAC/include/share/win_utf8_io.h similarity index 100% rename from src/lib/libFLAC/include/share/win_utf8_io.h rename to src/libretro-deps/libFLAC/include/share/win_utf8_io.h diff --git a/src/lib/libFLAC/lpc.c b/src/libretro-deps/libFLAC/lpc.c similarity index 100% rename from src/lib/libFLAC/lpc.c rename to src/libretro-deps/libFLAC/lpc.c diff --git a/src/lib/libFLAC/lpc_intrin_sse.c b/src/libretro-deps/libFLAC/lpc_intrin_sse.c similarity index 100% rename from src/lib/libFLAC/lpc_intrin_sse.c rename to src/libretro-deps/libFLAC/lpc_intrin_sse.c diff --git a/src/lib/libFLAC/lpc_intrin_sse2.c b/src/libretro-deps/libFLAC/lpc_intrin_sse2.c similarity index 100% rename from src/lib/libFLAC/lpc_intrin_sse2.c rename to src/libretro-deps/libFLAC/lpc_intrin_sse2.c diff --git a/src/lib/libFLAC/lpc_intrin_sse41.c b/src/libretro-deps/libFLAC/lpc_intrin_sse41.c similarity index 100% rename from src/lib/libFLAC/lpc_intrin_sse41.c rename to src/libretro-deps/libFLAC/lpc_intrin_sse41.c diff --git a/src/lib/libFLAC/md5.c b/src/libretro-deps/libFLAC/md5.c similarity index 100% rename from src/lib/libFLAC/md5.c rename to src/libretro-deps/libFLAC/md5.c diff --git a/src/lib/libFLAC/memory.c b/src/libretro-deps/libFLAC/memory.c similarity index 100% rename from src/lib/libFLAC/memory.c rename to src/libretro-deps/libFLAC/memory.c diff --git a/src/lib/libFLAC/metadata_iterators.c b/src/libretro-deps/libFLAC/metadata_iterators.c similarity index 100% rename from src/lib/libFLAC/metadata_iterators.c rename to src/libretro-deps/libFLAC/metadata_iterators.c diff --git a/src/lib/libFLAC/metadata_object.c b/src/libretro-deps/libFLAC/metadata_object.c similarity index 100% rename from src/lib/libFLAC/metadata_object.c rename to src/libretro-deps/libFLAC/metadata_object.c diff --git a/src/lib/libFLAC/ogg_decoder_aspect.c b/src/libretro-deps/libFLAC/ogg_decoder_aspect.c similarity index 100% rename from src/lib/libFLAC/ogg_decoder_aspect.c rename to src/libretro-deps/libFLAC/ogg_decoder_aspect.c diff --git a/src/lib/libFLAC/ogg_encoder_aspect.c b/src/libretro-deps/libFLAC/ogg_encoder_aspect.c similarity index 100% rename from src/lib/libFLAC/ogg_encoder_aspect.c rename to src/libretro-deps/libFLAC/ogg_encoder_aspect.c diff --git a/src/lib/libFLAC/ogg_helper.c b/src/libretro-deps/libFLAC/ogg_helper.c similarity index 100% rename from src/lib/libFLAC/ogg_helper.c rename to src/libretro-deps/libFLAC/ogg_helper.c diff --git a/src/lib/libFLAC/ogg_mapping.c b/src/libretro-deps/libFLAC/ogg_mapping.c similarity index 100% rename from src/lib/libFLAC/ogg_mapping.c rename to src/libretro-deps/libFLAC/ogg_mapping.c diff --git a/src/lib/libFLAC/ppc/as/lpc_asm.s b/src/libretro-deps/libFLAC/ppc/as/lpc_asm.s similarity index 100% rename from src/lib/libFLAC/ppc/as/lpc_asm.s rename to src/libretro-deps/libFLAC/ppc/as/lpc_asm.s diff --git a/src/lib/libFLAC/ppc/gas/lpc_asm.s b/src/libretro-deps/libFLAC/ppc/gas/lpc_asm.s similarity index 100% rename from src/lib/libFLAC/ppc/gas/lpc_asm.s rename to src/libretro-deps/libFLAC/ppc/gas/lpc_asm.s diff --git a/src/lib/libFLAC/stream_decoder.c b/src/libretro-deps/libFLAC/stream_decoder.c similarity index 100% rename from src/lib/libFLAC/stream_decoder.c rename to src/libretro-deps/libFLAC/stream_decoder.c diff --git a/src/lib/libFLAC/stream_encoder.c b/src/libretro-deps/libFLAC/stream_encoder.c similarity index 100% rename from src/lib/libFLAC/stream_encoder.c rename to src/libretro-deps/libFLAC/stream_encoder.c diff --git a/src/lib/libFLAC/stream_encoder_framing.c b/src/libretro-deps/libFLAC/stream_encoder_framing.c similarity index 100% rename from src/lib/libFLAC/stream_encoder_framing.c rename to src/libretro-deps/libFLAC/stream_encoder_framing.c diff --git a/src/lib/libFLAC/stream_encoder_intrin_sse2.c b/src/libretro-deps/libFLAC/stream_encoder_intrin_sse2.c similarity index 100% rename from src/lib/libFLAC/stream_encoder_intrin_sse2.c rename to src/libretro-deps/libFLAC/stream_encoder_intrin_sse2.c diff --git a/src/lib/libFLAC/stream_encoder_intrin_ssse3.c b/src/libretro-deps/libFLAC/stream_encoder_intrin_ssse3.c similarity index 100% rename from src/lib/libFLAC/stream_encoder_intrin_ssse3.c rename to src/libretro-deps/libFLAC/stream_encoder_intrin_ssse3.c diff --git a/src/lib/libFLAC/window.c b/src/libretro-deps/libFLAC/window.c similarity index 100% rename from src/lib/libFLAC/window.c rename to src/libretro-deps/libFLAC/window.c