From 46b79ccd786ba4f37cf590d893882935ac821968 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 21 Sep 2017 19:34:46 +0200 Subject: [PATCH] Compilation fixes - headers need to be moved to separate include dir --- libretro-common/formats/libchdr/bitstream.c | 2 +- libretro-common/formats/libchdr/cdrom.c | 2 +- libretro-common/formats/libchdr/chd.c | 12 ++++++------ libretro-common/formats/libchdr/flac.c | 4 ++-- libretro-common/formats/libchdr/huffman.c | 4 ++-- .../{formats => include}/libchdr/bitstream.h | 0 libretro-common/{formats => include}/libchdr/cdrom.h | 0 libretro-common/{formats => include}/libchdr/chd.h | 0 .../{formats => include}/libchdr/coretypes.h | 0 libretro-common/{formats => include}/libchdr/flac.h | 0 .../{formats => include}/libchdr/huffman.h | 0 .../{formats => include}/libchdr/minmax.h | 0 libretro-common/streams/chd_stream.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) rename libretro-common/{formats => include}/libchdr/bitstream.h (100%) rename libretro-common/{formats => include}/libchdr/cdrom.h (100%) rename libretro-common/{formats => include}/libchdr/chd.h (100%) rename libretro-common/{formats => include}/libchdr/coretypes.h (100%) rename libretro-common/{formats => include}/libchdr/flac.h (100%) rename libretro-common/{formats => include}/libchdr/huffman.h (100%) rename libretro-common/{formats => include}/libchdr/minmax.h (100%) diff --git a/libretro-common/formats/libchdr/bitstream.c b/libretro-common/formats/libchdr/bitstream.c index d0878fe42d..5db76743b4 100644 --- a/libretro-common/formats/libchdr/bitstream.c +++ b/libretro-common/formats/libchdr/bitstream.c @@ -9,8 +9,8 @@ ***************************************************************************/ -#include "bitstream.h" #include +#include /*************************************************************************** * INLINE FUNCTIONS diff --git a/libretro-common/formats/libchdr/cdrom.c b/libretro-common/formats/libchdr/cdrom.c index c060ab03a9..c967046c96 100644 --- a/libretro-common/formats/libchdr/cdrom.c +++ b/libretro-common/formats/libchdr/cdrom.c @@ -24,7 +24,7 @@ #include -#include "cdrom.h" +#include /*************************************************************************** DEBUGGING diff --git a/libretro-common/formats/libchdr/chd.c b/libretro-common/formats/libchdr/chd.c index d0b8dc20e6..491873eb31 100644 --- a/libretro-common/formats/libchdr/chd.c +++ b/libretro-common/formats/libchdr/chd.c @@ -41,15 +41,15 @@ #include #include #include -#include "chd.h" -#include "cdrom.h" -#include "flac.h" -#include "huffman.h" +#include +#include +#include +#include +#include #include "zlib.h" #include "LzmaEnc.h" #include "LzmaDec.h" -#include "retro_inline.h" -#include "minmax.h" +#include #define TRUE 1 #define FALSE 0 diff --git a/libretro-common/formats/libchdr/flac.c b/libretro-common/formats/libchdr/flac.c index 7499c9e806..16a53029c3 100644 --- a/libretro-common/formats/libchdr/flac.c +++ b/libretro-common/formats/libchdr/flac.c @@ -11,8 +11,8 @@ #include #include -#include "flac.h" -#include "minmax.h" +#include +#include /*************************************************************************** * FLAC DECODER diff --git a/libretro-common/formats/libchdr/huffman.c b/libretro-common/formats/libchdr/huffman.c index 39bab117d7..3478ad9210 100644 --- a/libretro-common/formats/libchdr/huffman.c +++ b/libretro-common/formats/libchdr/huffman.c @@ -101,8 +101,8 @@ #include #include -#include "huffman.h" -#include "minmax.h" +#include +#include /*************************************************************************** * MACROS diff --git a/libretro-common/formats/libchdr/bitstream.h b/libretro-common/include/libchdr/bitstream.h similarity index 100% rename from libretro-common/formats/libchdr/bitstream.h rename to libretro-common/include/libchdr/bitstream.h diff --git a/libretro-common/formats/libchdr/cdrom.h b/libretro-common/include/libchdr/cdrom.h similarity index 100% rename from libretro-common/formats/libchdr/cdrom.h rename to libretro-common/include/libchdr/cdrom.h diff --git a/libretro-common/formats/libchdr/chd.h b/libretro-common/include/libchdr/chd.h similarity index 100% rename from libretro-common/formats/libchdr/chd.h rename to libretro-common/include/libchdr/chd.h diff --git a/libretro-common/formats/libchdr/coretypes.h b/libretro-common/include/libchdr/coretypes.h similarity index 100% rename from libretro-common/formats/libchdr/coretypes.h rename to libretro-common/include/libchdr/coretypes.h diff --git a/libretro-common/formats/libchdr/flac.h b/libretro-common/include/libchdr/flac.h similarity index 100% rename from libretro-common/formats/libchdr/flac.h rename to libretro-common/include/libchdr/flac.h diff --git a/libretro-common/formats/libchdr/huffman.h b/libretro-common/include/libchdr/huffman.h similarity index 100% rename from libretro-common/formats/libchdr/huffman.h rename to libretro-common/include/libchdr/huffman.h diff --git a/libretro-common/formats/libchdr/minmax.h b/libretro-common/include/libchdr/minmax.h similarity index 100% rename from libretro-common/formats/libchdr/minmax.h rename to libretro-common/include/libchdr/minmax.h diff --git a/libretro-common/streams/chd_stream.c b/libretro-common/streams/chd_stream.c index adce6d71d4..a1599c9f96 100644 --- a/libretro-common/streams/chd_stream.c +++ b/libretro-common/streams/chd_stream.c @@ -27,7 +27,7 @@ #include #include -#include +#include #define SECTOR_SIZE 2352 #define SUBCODE_SIZE 96