From f0fd2d8fc12f550fbd5c2d9d118a22680be8e880 Mon Sep 17 00:00:00 2001
From: EkeEke <ekeeke31@gmail.com>
Date: Sat, 29 Nov 2014 19:15:09 +0100
Subject: [PATCH] [libretro] restored Makefile.common

---
 Makefile.libretro        | 32 +++++++-------------------------
 libretro/Makefile.common | 19 +++++++++++++++++++
 libretro/jni/Android.mk  | 32 +++++---------------------------
 3 files changed, 31 insertions(+), 52 deletions(-)
 create mode 100644 libretro/Makefile.common

diff --git a/Makefile.libretro b/Makefile.libretro
index a3800cd..f4587a1 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -175,37 +175,19 @@ endif
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g
 else ifeq ($(platform),qnx)
-	CFLAGS += -Os -DNDEBUG
+   CFLAGS += -Os -DNDEBUG
 else ifeq ($(platform), emscripten)
-	CFLAGS += -O2 -DNDEBUG
+   CFLAGS += -O2 -DNDEBUG
 else
-	CFLAGS += -O3 -DNDEBUG
+   CFLAGS += -O3 -DNDEBUG
 endif
 
-CORE_DIR	:= ./core
-GENPLUS_SRC_DIR := $(CORE_DIR) \
-					$(CORE_DIR)/sound \
-					$(CORE_DIR)/input_hw \
-					$(CORE_DIR)/cart_hw \
-					$(CORE_DIR)/cart_hw/svp \
-					$(CORE_DIR)/cd_hw \
-					$(CORE_DIR)/m68k \
-					$(CORE_DIR)/z80 \
-					$(CORE_DIR)/ntsc
-TREMOR_SRC_DIR  := $(CORE_DIR)/tremor
-LIBRETRO_DIR	:= ./libretro
+CORE_DIR := .
 
-INCFLAGS := $(foreach dir,$(GENPLUS_SRC_DIR),-I$(dir)) \
-				-I$(TREMOR_SRC_DIR) \
-				-I$(LIBRETRO_DIR) 
+TREMOR_SRC_DIR  := $(CORE_DIR)/core/tremor
+LIBRETRO_DIR	:= $(CORE_DIR)/libretro
 
-SOURCES_C := $(foreach dir,$(GENPLUS_SRC_DIR),$(wildcard $(dir)/*.c)) \
-				$(foreach dir,$(TREMOR_SRC_DIR),$(wildcard $(dir)/*.c)) \
-				$(LIBRETRO_DIR)/libretro.c
-
-ifeq ($(WANT_CRC32), 1)
-	SOURCES_C += $(LIBRETRO_DIR)/scrc32.c
-endif
+include $(LIBRETRO_DIR)/Makefile.common
 
 OBJECTS := $(SOURCES_C:.c=.o)
 
diff --git a/libretro/Makefile.common b/libretro/Makefile.common
new file mode 100644
index 0000000..5d77f44
--- /dev/null
+++ b/libretro/Makefile.common
@@ -0,0 +1,19 @@
+GENPLUS_SRC_DIR := $(CORE_DIR)/core \
+                   $(CORE_DIR)/core/z80 \
+                   $(CORE_DIR)/core/m68k \
+                   $(CORE_DIR)/core/ntsc \
+                   $(CORE_DIR)/core/sound \
+                   $(CORE_DIR)/core/input_hw \
+                   $(CORE_DIR)/core/cd_hw \
+                   $(CORE_DIR)/core/cart_hw \
+                   $(CORE_DIR)/core/cart_hw/svp
+
+SOURCES_C = $(foreach dir,$(GENPLUS_SRC_DIR),$(wildcard $(dir)/*.c)) \
+            $(foreach dir,$(TREMOR_SRC_DIR),$(wildcard $(dir)/*.c)) \
+            $(LIBRETRO_DIR)/libretro.c
+
+ifeq ($(WANT_CRC32), 1)
+	SOURCES_C += $(LIBRETRO_DIR)/scrc32.c
+endif
+
+INCFLAGS += $(foreach dir,$(GENPLUS_SRC_DIR),-I$(dir)) -I$(LIBRETRO_DIR)
diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk
index 8b003b4..dd2d226 100644
--- a/libretro/jni/Android.mk
+++ b/libretro/jni/Android.mk
@@ -4,17 +4,9 @@ include $(CLEAR_VARS)
 
 WANT_CRC32 := 1
 
-CORE_DIR	:= ../../core
-GENPLUS_SRC_DIR := $(CORE_DIR) \
-					$(CORE_DIR)/sound \
-					$(CORE_DIR)/input_hw \
-					$(CORE_DIR)/cart_hw \
-					$(CORE_DIR)/cart_hw/svp \
-					$(CORE_DIR)/cd_hw \
-					$(CORE_DIR)/m68k \
-					$(CORE_DIR)/z80 \
-					$(CORE_DIR)/ntsc
-TREMOR_SRC_DIR  := $(CORE_DIR)/tremor
+CORE_DIR := ../..
+
+TREMOR_SRC_DIR	:= $(CORE_DIR)/core/tremor
 LIBRETRO_DIR	:= ..
 
 LOCAL_MODULE    := retro
@@ -24,25 +16,11 @@ LOCAL_CFLAGS += -DANDROID_ARM
 LOCAL_ARM_MODE := arm
 endif
 
-SOURCES_C := $(foreach dir,$(GENPLUS_SRC_DIR),$(wildcard $(dir)/*.c)) \
-				$(foreach dir,$(TREMOR_SRC_DIR),$(wildcard $(dir)/*.c)) \
-				$(LIBRETRO_DIR)/libretro.c
-
-ifeq ($(WANT_CRC32), 1)
-	SOURCES_C += $(LIBRETRO_DIR)/scrc32.c
-endif
+include $(LIBRETRO_DIR)/Makefile.common
 
 LOCAL_SRC_FILES := $(SOURCES_C)
 
-LOCAL_C_INCLUDES = $(CORE_DIR) \
-			$(LOCAL_PATH)/$(CORE_DIR)/sound \
-			$(LOCAL_PATH)/$(CORE_DIR)/input_hw \
-			$(LOCAL_PATH)/$(CORE_DIR)/cd_hw \
-			$(LOCAL_PATH)/$(CORE_DIR)/cart_hw \
-			$(LOCAL_PATH)/$(CORE_DIR)/cart_hw/svp \
-			$(LOCAL_PATH)/$(CORE_DIR)/m68k \
-			$(LOCAL_PATH)/$(CORE_DIR)/z80 \
-			$(LOCAL_PATH)/$(CORE_DIR)/ntsc \
+LOCAL_C_INCLUDES = $(foreach dir,$(GENPLUS_SRC_DIR),$(LOCAL_PATH)/$(dir)) \
 			$(LOCAL_PATH)/$(TREMOR_SRC_DIR) \
 			$(LOCAL_PATH)/$(LIBRETRO_DIR)