From e8d9b0b09a136a300bbb6f0184c34ecb5aae2a4f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 9 Sep 2015 06:31:38 +0200
Subject: [PATCH] (Android) Buildfix

---
 Makefile.common                        | 2 +-
 src/drivers/libretro/griffin.c         | 2 +-
 src/drivers/libretro/libretro.c        | 2 +-
 src/fceu-endian.h                      | 2 +-
 src/fceu-memory.h                      | 2 +-
 src/{drivers/libretro => }/memstream.c | 0
 src/{drivers/libretro => }/memstream.h | 0
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{drivers/libretro => }/memstream.c (100%)
 rename src/{drivers/libretro => }/memstream.h (100%)

diff --git a/Makefile.common b/Makefile.common
index 787d33d..7524626 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -8,7 +8,7 @@ SOURCES_C += $(CORE_DIR)/drivers/libretro/griffin.c
 else
 SOURCES_C += \
 				 $(CORE_DIR)/drivers/libretro/libretro.c \
-				 $(CORE_DIR)/drivers/libretro/memstream.c \
+				 $(CORE_DIR)/memstream.c \
 				 $(CORE_DIR)/cart.c \
 				 $(CORE_DIR)/cheat.c \
 				 $(CORE_DIR)/crc32.c \
diff --git a/src/drivers/libretro/griffin.c b/src/drivers/libretro/griffin.c
index 2d13b04..7fe4d63 100644
--- a/src/drivers/libretro/griffin.c
+++ b/src/drivers/libretro/griffin.c
@@ -1,7 +1,7 @@
 #ifdef WANT_GRIFFIN
 
 #include "drivers/libretro/libretro.c"
-#include "drivers/libretro/memstream.c"
+#include "../../memstream.c"
 
 #include "cart.c"
 #include "cheat.c"
diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index ab761f9..5465328 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -23,7 +23,7 @@
 #include "../../fds.h"
 
 #include <string.h>
-#include "memstream.h"
+#include "../../memstream.h"
 
 #if defined(_3DS)
 void* linearMemAlign(size_t size, size_t alignment);
diff --git a/src/fceu-endian.h b/src/fceu-endian.h
index 7ed551a..333e679 100644
--- a/src/fceu-endian.h
+++ b/src/fceu-endian.h
@@ -2,7 +2,7 @@
 #define _FCEU_ENDIAN_H
 
 #include "fceu-memory.h"
-#include <memstream.h>
+#include "memstream.h"
 
 int write32le_mem(uint32 b, memstream_t *mem);
 int read32le_mem(uint32 *Bufo, memstream_t *mem);
diff --git a/src/fceu-memory.h b/src/fceu-memory.h
index b0808e3..47d9a8d 100644
--- a/src/fceu-memory.h
+++ b/src/fceu-memory.h
@@ -30,7 +30,7 @@
 #define FCEU_dwmemset(d, c, n) { int _x; for (_x = n - 4; _x >= 0; _x -= 4) *(uint32*)& (d)[_x] = c; }
 
 #if defined(STATE_LIBRETRO) || defined(ENDIAN_LIBRETRO) || defined(GENERAL_LIBRETRO)
-#include "drivers/libretro/memstream.h"
+#include "memstream.h"
 
 #define HAVE_MEMSTREAM
 #define MEM_TYPE memstream_t
diff --git a/src/drivers/libretro/memstream.c b/src/memstream.c
similarity index 100%
rename from src/drivers/libretro/memstream.c
rename to src/memstream.c
diff --git a/src/drivers/libretro/memstream.h b/src/memstream.h
similarity index 100%
rename from src/drivers/libretro/memstream.h
rename to src/memstream.h