Makefile cleanup.

Makefile.libretro

@@ -35,11 +35,14 @@ endif
 
 TARGET_NAME := fceumm
 
+# Unix
 ifeq ($(platform), unix)
 	TARGET := $(TARGET_NAME)_libretro.so
 	fpic := -fPIC
 	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
 	ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
+
+# OS X
 else ifeq ($(platform), osx)
 	TARGET := $(TARGET_NAME)_libretro.dylib
 	fpic := -fPIC
@@ -57,17 +60,17 @@ ifndef ($(NOUNIVERSAL))
 		CFLAGS += $(ARCHFLAGS)
 		LDFLAGS += $(ARCHFLAGS)
 	endif
+
+# iOS
 else ifeq ($(platform), ios)
 	TARGET := $(TARGET_NAME)_libretro_ios.dylib
 	fpic := -fPIC
 	SHARED := -dynamiclib
 	ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
 	CFLAGS += -DHAVE_ASPRINTF -DIOS
-
 	ifeq ($(IOSSDK),)
 		IOSSDK := $(shell xcrun -sdk iphoneos -show-sdk-path)
 	endif
-
 	CC = clang -arch armv7 -isysroot $(IOSSDK)
 	CFLAGS += -DIOS
 	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
@@ -76,27 +79,29 @@ ifeq ($(OSX_LT_MAVERICKS),"YES")
 		CC +=  -miphoneos-version-min=5.0
 		CFLAGS += -miphoneos-version-min=5.0
 	endif
-else ifeq ($(platform), theos_ios)
+
 # Theos iOS
+else ifeq ($(platform), theos_ios)
 	DEPLOYMENT_IOSVERSION = 5.0
 	TARGET = iphone:latest:$(DEPLOYMENT_IOSVERSION)
 	ARCHS = armv7 armv7s
 	TARGET_IPHONEOS_DEPLOYMENT_VERSION=$(DEPLOYMENT_IOSVERSION)
 	THEOS_BUILD_DIR := objs
 	include $(THEOS)/makefiles/common.mk
-
 	LIBRARY_NAME = $(TARGET_NAME)_libretro_ios
-
 	CFLAGS += -DHAVE_ASPRINTF
+
+# QNX
 else ifeq ($(platform), qnx)
 	TARGET := $(TARGET_NAME)_libretro_qnx.so
 	fpic := -fPIC
 	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
 	ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
-
 	CC = qcc -Vgcc_ntoarmv7le
 	AR = qcc -Vgcc_ntoarmv7le
 	PLATFORM_DEFINES := -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
+
+# PS3
 else ifeq ($(platform), ps3)
 	TARGET := $(TARGET_NAME)_libretro_ps3.a
 	CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
@@ -104,6 +109,8 @@ else ifeq ($(platform), ps3)
 	PLATFORM_DEFINES := -D__CELLOS_LV2
 	STATIC_LINKING = 1
 	EXTERNAL_ZLIB = 1
+
+# sncps3
 else ifeq ($(platform), sncps3)
 	TARGET := $(TARGET_NAME)_libretro_ps3.a
 	CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
@@ -111,6 +118,8 @@ else ifeq ($(platform), sncps3)
 	PLATFORM_DEFINES := -D__CELLOS_LV2
 	STATIC_LINKING = 1
 	EXTERNAL_ZLIB = 1
+
+# PSP
 else ifeq ($(platform), psp1)
 	TARGET := $(TARGET_NAME)_libretro_psp1.a
 	CC = psp-gcc$(EXE_EXT)
@@ -119,6 +128,8 @@ else ifeq ($(platform), psp1)
 	PLATFORM_DEFINES := -DPSP -G0 -DLSB_FIRST -DHAVE_ASPRINTF
 	STATIC_LINKING = 1
 	EXTERNAL_ZLIB = 1
+
+# Lightweight PS3 Homebrew SDK
 else ifeq ($(platform), psl1ght)
 	TARGET := $(TARGET_NAME)_libretro_psl1ght.a
 	CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
@@ -126,6 +137,8 @@ else ifeq ($(platform), psl1ght)
 	PLATFORM_DEFINES := -D__CELLOS_LV2 -DHAVE_ASPRINTF
 	STATIC_LINKING = 1
 	EXTERNAL_ZLIB = 1
+
+# Xbox 360
 else ifeq ($(platform), xenon)
 	TARGET := $(TARGET_NAME)_libretro_xenon360.a
 	CC = xenon-gcc$(EXE_EXT)
@@ -134,6 +147,8 @@ else ifeq ($(platform), xenon)
 	CFLAGS += -DHAVE_ASPRINTF
 	STATIC_LINKING = 1
 	EXTERNAL_ZLIB = 1
+
+# Nintendo Game Cube
 else ifeq ($(platform), ngc)
 	TARGET := $(TARGET_NAME)_libretro_ngc.a
 	CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
@@ -142,6 +157,8 @@ else ifeq ($(platform), ngc)
 	CFLAGS += -DHAVE_ASPRINTF
 	STATIC_LINKING = 1
 	EXTERNAL_ZLIB = 1
+
+# Nintendo Wii
 else ifeq ($(platform), wii)
 	TARGET := $(TARGET_NAME)_libretro_wii.a
 	CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
@@ -150,21 +167,23 @@ else ifeq ($(platform), wii)
 	CFLAGS += -DHAVE_ASPRINTF
 	STATIC_LINKING = 1
 	EXTERNAL_ZLIB = 1
+
+# ARM
 else ifneq (,$(findstring armv,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro.so
 	SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
 	ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
 	fpic := -fPIC
-   CC = gcc
+	ifneq (,$(findstring cortexa5,$(platform)))
-ifneq (,$(findstring cortexa8,$(platform)))
+		PLATFORM_DEFINES += -marm -mcpu=cortex-a5
+	else ifneq (,$(findstring cortexa8,$(platform)))
 		PLATFORM_DEFINES += -marm -mcpu=cortex-a8
 	else ifneq (,$(findstring cortexa9,$(platform)))
 		PLATFORM_DEFINES += -marm -mcpu=cortex-a9
-endif
+	else ifneq (,$(findstring cortexa15a7,$(platform)))
+		PLATFORM_DEFINES += -marm -mcpu=cortex-a15.cortex-a7
+	else
 		PLATFORM_DEFINES += -marm
-ifneq (,$(findstring neon,$(platform)))
-   PLATFORM_DEFINES += -mfpu=neon
-   HAVE_NEON = 1
 	endif
 	ifneq (,$(findstring softfloat,$(platform)))
 		PLATFORM_DEFINES += -mfloat-abi=softfp
@@ -172,11 +191,14 @@ else ifneq (,$(findstring hardfloat,$(platform)))
 		PLATFORM_DEFINES += -mfloat-abi=hard
 	endif
 	PLATFORM_DEFINES += -DARM
+
+# Windows
 else
 	TARGET := $(TARGET_NAME)_libretro.dll
 	CC = gcc
 	SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=src/drivers/libretro/link.T
 	ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
+
 endif
 
 ifeq ($(DEBUG), 1)