From aae3b1016919c286d26b0a3e56a10ce65ec64cda Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 20 Nov 2012 03:34:45 +0100 Subject: [PATCH] Move baked-in dependencies to 'deps' directory --- audio/rsound.c | 2 +- console/griffin/griffin.c | 4 ++-- console/rarch_console_rzlib.h | 2 +- {console => deps}/librsound/librsound.c | 0 {console => deps}/librsound/rsound.h | 0 {console => deps}/rzlib/rzlib.c | 0 {console => deps}/rzlib/zconf.h | 0 {console => deps}/rzlib/zlib.h | 0 hash.h | 2 +- 9 files changed, 5 insertions(+), 5 deletions(-) rename {console => deps}/librsound/librsound.c (100%) rename {console => deps}/librsound/rsound.h (100%) rename {console => deps}/rzlib/rzlib.c (100%) rename {console => deps}/rzlib/zconf.h (100%) rename {console => deps}/rzlib/zlib.h (100%) diff --git a/audio/rsound.c b/audio/rsound.c index 2678c9a478..e53cd22200 100644 --- a/audio/rsound.c +++ b/audio/rsound.c @@ -17,7 +17,7 @@ #include "../driver.h" #include #ifdef RARCH_CONSOLE -#include "../console/librsound/rsound.h" +#include "../deps/librsound/rsound.h" #else #include #endif diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index 04d0c4e540..448b6853f4 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -232,7 +232,7 @@ AUDIO HERMITE RSOUND ============================================================ */ #ifdef HAVE_RSOUND -#include "../../console/librsound/librsound.c" +#include "../../deps/librsound/librsound.c" #include "../../audio/rsound.c" #endif @@ -379,5 +379,5 @@ MENU RZLIB ============================================================ */ #ifdef WANT_RZLIB -#include "../rzlib/rzlib.c" +#include "../../deps/rzlib/rzlib.c" #endif diff --git a/console/rarch_console_rzlib.h b/console/rarch_console_rzlib.h index ab26897357..56411abba1 100644 --- a/console/rarch_console_rzlib.h +++ b/console/rarch_console_rzlib.h @@ -17,7 +17,7 @@ #ifndef _RARCH_CONSOLE_RZLIB_H #define _RARCH_CONSOLE_RZLIB_H -#include "rzlib/zlib.h" +#include "../deps/rzlib/zlib.h" #define WRITEBUFFERSIZE (1024 * 512) diff --git a/console/librsound/librsound.c b/deps/librsound/librsound.c similarity index 100% rename from console/librsound/librsound.c rename to deps/librsound/librsound.c diff --git a/console/librsound/rsound.h b/deps/librsound/rsound.h similarity index 100% rename from console/librsound/rsound.h rename to deps/librsound/rsound.h diff --git a/console/rzlib/rzlib.c b/deps/rzlib/rzlib.c similarity index 100% rename from console/rzlib/rzlib.c rename to deps/rzlib/rzlib.c diff --git a/console/rzlib/zconf.h b/deps/rzlib/zconf.h similarity index 100% rename from console/rzlib/zconf.h rename to deps/rzlib/zconf.h diff --git a/console/rzlib/zlib.h b/deps/rzlib/zlib.h similarity index 100% rename from console/rzlib/zlib.h rename to deps/rzlib/zlib.h diff --git a/hash.h b/hash.h index 5a470f122a..53effb8960 100644 --- a/hash.h +++ b/hash.h @@ -23,7 +23,7 @@ void sha256_hash(char *out, const uint8_t *in, size_t size); #ifdef HAVE_ZLIB -#include "console/rzlib/zlib.h" +#include "deps/rzlib/zlib.h" static inline uint32_t crc32_calculate(const uint8_t *data, size_t length) { return crc32(0, data, length);