Move libretro dir and use LINK_T define

Makefile.common

@@ -1,5 +1,5 @@
 SOURCE_DIR := $(CORE_DIR)
-LIBRETRO_DIR := $(SOURCE_DIR)/libretro
+LIBRETRO_DIR := $(CORE_DIR)/../libretro
 LIBRETRO_COMM_DIR := $(LIBRETRO_DIR)/libretro-common
 
 INCFLAGS := \

Makefile.libretro

@@ -14,6 +14,7 @@ filter_out2 = $(call filter_out1,$(call filter_out1,$1))
 unixpath = $(subst \,/,$1)
 unixcygpath = /$(subst :,,$(call unixpath,$1))
 RETROARCH_OBJECTS :=
+LINK_T = libretro/link.T
 
 ifeq ($(platform),)
 	platform = unix
@@ -69,13 +70,13 @@ ifneq ($(findstring SunOS,$(shell uname -a)),)
 	CC = gcc
 	SHARED := -shared -z defs
 else
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 endif
 
 else ifeq ($(platform), linux-portable)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC -nostdlib
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T
+	SHARED := -shared -Wl,--version-script=$(LINK_T)
 	LIBM :=
 # OS X
 else ifeq ($(platform), osx)
@@ -151,7 +152,7 @@ else ifeq ($(platform), theos_ios)
 else ifeq ($(platform), qnx)
 	TARGET := $(TARGET_NAME)_libretro_qnx.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	CC = qcc -Vgcc_ntoarmv7le
 	AR = qcc -Vgcc_ntoarmv7le
 	PLATFORM_DEFINES := -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
@@ -217,7 +218,7 @@ else ifeq ($(platform), ctr)
 else ifeq ($(platform), rpi1)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	CFLAGS += -DARM11
 	CFLAGS += -marm -march=armv6j -mfpu=vfp -mfloat-abi=hard -funsafe-math-optimizations
 	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
@@ -226,7 +227,7 @@ else ifeq ($(platform), rpi1)
 else ifeq ($(platform), rpi2)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	CFLAGS += -DARM
 	CFLAGS += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -funsafe-math-optimizations
 	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
@@ -235,7 +236,7 @@ else ifeq ($(platform), rpi2)
 else ifeq ($(platform), rpi3)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	CFLAGS += -DARM
 	CFLAGS += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard -funsafe-math-optimizations
 	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
@@ -244,15 +245,15 @@ else ifeq ($(platform), rpi3)
 else ifeq ($(platform), rpi3_64)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	CFLAGS += -mcpu=cortex-a53 -mtune=cortex-a53 -funsafe-math-optimizations
 	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
 
 # Raspberry Pi 4 (64-bit)
 else ifneq (,$(findstring rpi4,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	CFLAGS += -mcpu=cortex-a72 -mtune=cortex-a72 -funsafe-math-optimizations
 	CFLAGS += -fomit-frame-pointer -fstrict-aliasing -ffast-math
 
@@ -350,7 +351,7 @@ else ifeq ($(platform), libnx)
 else ifeq ($(platform), classic_armv7_a7)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	CFLAGS += -Ofast \
 	-flto=4 -fwhole-program -fuse-linker-plugin \
 	-fdata-sections -ffunction-sections -Wl,--gc-sections \
@@ -381,7 +382,7 @@ else ifeq ($(platform), classic_armv7_a7)
 else ifeq ($(platform), classic_armv8_a35)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	CFLAGS += -Ofast \
 	-flto=4 -fwhole-program -fuse-linker-plugin \
 	-fdata-sections -ffunction-sections -Wl,--gc-sections \
@@ -404,7 +405,7 @@ else ifeq ($(platform), classic_armv8_a35)
 # ARM
 else ifneq (,$(findstring armv,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro.so
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	fpic := -fPIC
 	ifneq (,$(findstring cortexa5,$(platform)))
 		PLATFORM_DEFINES += -marm -mcpu=cortex-a5
@@ -437,7 +438,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=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	PLATFORM_DEFINES += -ffast-math -march=mips32 -mtune=mips32r2 -mhard-float -fomit-frame-pointer
 	EXTERNAL_ZLIB = 1
 
@@ -448,7 +449,7 @@ else ifeq ($(platform), retrofw)
 	CXX = /opt/retrofw-toolchain/usr/bin/mipsel-linux-g++
 	AR = /opt/retrofw-toolchain/usr/bin/mipsel-linux-ar
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	PLATFORM_DEFINES += -ffast-math -march=mips32 -mtune=mips32 -mhard-float -fomit-frame-pointer
 	EXTERNAL_ZLIB = 1
 
@@ -459,7 +460,7 @@ else ifeq ($(platform), miyoo)
 	CXX = /opt/miyoo/usr/bin/arm-linux-g++
 	AR = /opt/miyoo/usr/bin/arm-linux-ar
 	fpic := -fPIC
-	SHARED := -shared -Wl,--version-script=src/libretro/link.T -Wl,-no-undefined
+	SHARED := -shared -Wl,--version-script=$(LINK_T) -Wl,-no-undefined
 	PLATFORM_DEFINES += -fomit-frame-pointer -ffast-math -mcpu=arm926ej-s
 	EXTERNAL_ZLIB = 1
 
@@ -697,7 +698,7 @@ CFLAGS += -D_CRT_SECURE_NO_DEPRECATE
 else
 	TARGET := $(TARGET_NAME)_libretro.dll
 	CC ?= gcc
-	SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=src/libretro/link.T
+	SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=$(LINK_T)
 endif
 
 ifeq ($(DEBUG), 1)

jni/Android.mk

@@ -1,6 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
 CORE_DIR := $(LOCAL_PATH)/../src
+LINK_T := $(LOCAL_PATH)/../libretro/link.T
 
 HAVE_NTSC := 1
 
@@ -17,5 +18,5 @@ include $(CLEAR_VARS)
 LOCAL_MODULE    := retro
 LOCAL_SRC_FILES := $(SOURCES_C)
 LOCAL_CFLAGS    := $(COREFLAGS)
-LOCAL_LDFLAGS   := -Wl,-version-script=$(CORE_DIR)/libretro/link.T
+LOCAL_LDFLAGS   := -Wl,-version-script=$(LINK_T)
 include $(BUILD_SHARED_LIBRARY)