From 4e4fb2b4a6a4e86242a9b63c6fc235ef25303d06 Mon Sep 17 00:00:00 2001
From: Mathieu Bridon <bochecha@daitauha.fr>
Date: Tue, 30 Aug 2016 20:12:15 +0200
Subject: [PATCH] Move the makefiles in the root folder

This better follows the classic convention of doing the way every other
project does it.
---
 libgambatte/Makefile => Makefile              |  0
 .../Makefile.common => Makefile.common        |  0
 .../Makefile.libretro => Makefile.libretro    | 20 ++++++++++---------
 3 files changed, 11 insertions(+), 9 deletions(-)
 rename libgambatte/Makefile => Makefile (100%)
 rename libgambatte/Makefile.common => Makefile.common (100%)
 rename libgambatte/Makefile.libretro => Makefile.libretro (94%)

diff --git a/libgambatte/Makefile b/Makefile
similarity index 100%
rename from libgambatte/Makefile
rename to Makefile
diff --git a/libgambatte/Makefile.common b/Makefile.common
similarity index 100%
rename from libgambatte/Makefile.common
rename to Makefile.common
diff --git a/libgambatte/Makefile.libretro b/Makefile.libretro
similarity index 94%
rename from libgambatte/Makefile.libretro
rename to Makefile.libretro
index d774c99..8e56cfd 100644
--- a/libgambatte/Makefile.libretro
+++ b/Makefile.libretro
@@ -27,6 +27,8 @@ endif
 
 TARGET_NAME := gambatte
 
+version_script = libgambatte/libretro/link.T
+
 ifeq ($(ARCHFLAGS),)
 ifeq ($(archs),ppc)
    ARCHFLAGS = -arch ppc -arch ppc64
@@ -39,7 +41,7 @@ endif
 ifeq ($(platform), unix)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,-version-script=libretro/link.T
+	SHARED := -shared -Wl,-version-script=$(version_script)
 	HAVE_NETWORK=1
 
 # OS X
@@ -94,7 +96,7 @@ else ifeq ($(platform), theos_ios)
 else ifeq ($(platform), qnx)
 	TARGET := $(TARGET_NAME)_libretro_qnx.so
 	fpic := -fPIC
-	SHARED := -lcpp -lm -shared -Wl,-version-script=libretro/link.T
+	SHARED := -lcpp -lm -shared -Wl,-version-script=$(version_script)
 	CC = qcc -Vgcc_ntoarmv7le
 	CXX = QCC -Vgcc_ntoarmv7le_cpp
 	AR = QCC -Vgcc_ntoarmv7le
@@ -166,7 +168,7 @@ else ifeq ($(platform), ctr)
 else ifeq ($(platform), rpi1)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,-version-script=libretro/link.T
+	SHARED := -shared -Wl,-version-script=$(version_script)
 	PLATFORM_DEFINES := -DARM
 	CFLAGS += -marm -march=armv6j -mfpu=vfp -mfloat-abi=hard
 	CFLAGS += -fomit-frame-pointer -ffast-math
@@ -177,7 +179,7 @@ else ifeq ($(platform), rpi1)
 else ifeq ($(platform), rpi2)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,-version-script=libretro/link.T
+	SHARED := -shared -Wl,-version-script=$(version_script)
 	PLATFORM_DEFINES := -DARM
 	CFLAGS += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
 	CFLAGS += -fomit-frame-pointer -ffast-math
@@ -188,7 +190,7 @@ else ifeq ($(platform), rpi2)
 else ifeq ($(platform), rpi3)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,-version-script=libretro/link.T
+	SHARED := -shared -Wl,-version-script=$(version_script)
 	PLATFORM_DEFINES := -DARM
 	CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
 	CFLAGS += -fomit-frame-pointer -ffast-math
@@ -226,7 +228,7 @@ else ifeq ($(platform), wii)
 else ifneq (,$(findstring armv,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,-version-script=libretro/link.T
+	SHARED := -shared -Wl,-version-script=$(version_script)
 	ifneq (,$(findstring cortexa5,$(platform)))
 		PLATFORM_DEFINES += -marm -mcpu=cortex-a5
 	else ifneq (,$(findstring cortexa8,$(platform)))
@@ -257,7 +259,7 @@ else ifeq ($(platform), gcw0)
 	CXX = /opt/gcw0-toolchain/usr/bin/mipsel-linux-g++
 	AR = /opt/gcw0-toolchain/usr/bin/mipsel-linux-ar
 	fpic := -fPIC
-	SHARED := -shared -Wl,-version-script=libretro/link.T
+	SHARED := -shared -Wl,-version-script=$(version_script)
 	PLATFORM_DEFINES := -DCC_RESAMPLER
 	CFLAGS += -O3 -fomit-frame-pointer -march=mips32 -mtune=mips32r2 -mhard-float
 	CXXFLAGS += $(CFLAGS)
@@ -268,7 +270,7 @@ else
    HAVE_NETWORK=1
 	CC = gcc
 	CXX = g++
-	SHARED := -shared -static-libgcc -static-libstdc++ -Wl,-no-undefined -Wl,-version-script=libretro/link.T
+	SHARED := -shared -static-libgcc -static-libstdc++ -Wl,-no-undefined -Wl,-version-script=$(version_script)
    LDFLAGS := -lws2_32
 
 endif
@@ -283,7 +285,7 @@ endif
 
 CXXFLAGS += -std=c++98
 
-CORE_DIR := src
+CORE_DIR := libgambatte/src
 
 include Makefile.common