Cleanup Makefile.libretro.

diff --git a/Makefile.libretro b/Makefile.libretro
index c5c271a..cc8091f 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,20 +1,20 @@
 # Makefile for PicoDrive (libretro)
 
 ifeq ($(platform),)
-platform = unix
-ifeq ($(shell uname -a),)
-   platform = win
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   platform = osx
-   arch = intel
-ifeq ($(shell uname -p),powerpc)
-   arch = ppc
-endif
-else ifneq ($(findstring win,$(shell uname -a)),)
-   platform = win
-endif
+       platform = unix
+       ifeq ($(shell uname -a),)
+               platform = win
+       else ifneq ($(findstring MINGW,$(shell uname -a)),)
+               platform = win
+       else ifneq ($(findstring Darwin,$(shell uname -a)),)
+               platform = osx
+               arch = intel
+               ifeq ($(shell uname -p),powerpc)
+                       arch = ppc
+               endif
+       else ifneq ($(findstring win,$(shell uname -a)),)
+               platform = win
+       endif
 endif
 
 CC ?= gcc
@@ -34,73 +34,76 @@ asm_cdpico = 0
 asm_cdmemory = 0
 asm_mix = 0
 
+# Unix
 ifeq ($(platform), unix)
-   TARGET := $(TARGET_NAME)_libretro.so
-   SHARED := -shared
-   DONT_COMPILE_IN_ZLIB = 1
+       TARGET := $(TARGET_NAME)_libretro.so
+       SHARED := -shared
+       DONT_COMPILE_IN_ZLIB = 1
        CFLAGS += -DFAMEC_NO_GOTOS
+
+# Portable Linux
 else ifeq ($(platform), linux-portable)
-   TARGET := $(TARGET_NAME)_libretro.so
-   SHARED := -shared -nostdlib
+       TARGET := $(TARGET_NAME)_libretro.so
+       SHARED := -shared -nostdlib
        LIBM :=
-   DONT_COMPILE_IN_ZLIB = 1
+       DONT_COMPILE_IN_ZLIB = 1
        CFLAGS += -DFAMEC_NO_GOTOS
-else ifeq ($(platform), osx)
-   TARGET := $(TARGET_NAME)_libretro.dylib
-   SHARED := -dynamiclib
-   APPLE := 1
 
-   arch = intel
-ifeq ($(shell uname -p),powerpc)
-   arch = ppc
-endif
+# OS X
+else ifeq ($(platform), osx)
+       TARGET := $(TARGET_NAME)_libretro.dylib
+       SHARED := -dynamiclib
+       APPLE := 1
+       arch = intel
+       ifeq ($(shell uname -p),powerpc)
+               arch = ppc
+       endif
+       ifeq ($(arch),ppc)
+               CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
+       endif
+       OSXVER = `sw_vers -productVersion | cut -d. -f 2`
+       OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
+       ifeq ($(OSX_LT_MAVERICKS),"YES")
+               SHARED += -mmacosx-version-min=10.5
+       endif
 
-ifeq ($(arch),ppc)
-   CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
-endif
-   OSXVER = `sw_vers -productVersion | cut -d. -f 2`
-   OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
-ifeq ($(OSX_LT_MAVERICKS),"YES")
-   SHARED += -mmacosx-version-min=10.5
-endif
+# iOS
 else ifeq ($(platform), ios)
-   TARGET := $(TARGET_NAME)_libretro_ios.dylib
-   SHARED := -dynamiclib
-   APPLE := 1
-
-ifeq ($(IOSSDK),)
-   IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
-endif
-
-   CC = clang -arch armv7 -isysroot $(IOSSDK)
-   CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
-   CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
-   CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm 
-   ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
-   CFLAGS += -DIOS
-   OSXVER = `sw_vers -productVersion | cut -d. -f 2`
-   OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
-ifeq ($(OSX_LT_MAVERICKS),"YES")
-   CC += -miphoneos-version-min=5.0
-   CXX += -miphoneos-version-min=5.0
-   CC_AS += -miphoneos-version-min=5.0
-   CFLAGS += -miphoneos-version-min=5.0
-endif
-
-   ARCH := arm
+       TARGET := $(TARGET_NAME)_libretro_ios.dylib
+       SHARED := -dynamiclib
+       APPLE := 1
+       ifeq ($(IOSSDK),)
+               IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
+       endif
+       CC = clang -arch armv7 -isysroot $(IOSSDK)
+       CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
+       CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
+       CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm 
+       ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
+       CFLAGS += -DIOS
+       OSXVER = `sw_vers -productVersion | cut -d. -f 2`
+       OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
+       ifeq ($(OSX_LT_MAVERICKS),"YES")
+               CC += -miphoneos-version-min=5.0
+               CXX += -miphoneos-version-min=5.0
+               CC_AS += -miphoneos-version-min=5.0
+               CFLAGS += -miphoneos-version-min=5.0
+       endif
+       ARCH := arm
 
-   use_cyclone = 0
-   use_fame = 1
-   use_drz80 = 0
-   use_cz80 = 1
-   use_sh2drc = 1
-   use_svpdrc = 1
+       use_cyclone = 0
+       use_fame = 1
+       use_drz80 = 0
+       use_cz80 = 1
+       use_sh2drc = 1
+       use_svpdrc = 1
 
+# PS3
 else ifeq ($(platform), ps3)
-   TARGET := $(TARGET_NAME)_libretro_ps3.a
-   CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
-   AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
-   CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
+       TARGET := $(TARGET_NAME)_libretro_ps3.a
+       CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
+       AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
+       CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
        STATIC_LINKING = 1
        NO_MMAP = 1
        DONT_COMPILE_IN_ZLIB = 1
@@ -112,15 +115,17 @@ else ifeq ($(platform), ps3)
        asm_cdpico = 0
        asm_cdmemory = 0
        asm_mix = 0
-   use_cyclone = 0
-   use_fame = 1
-   use_drz80 = 0
-   use_cz80 = 1
+       use_cyclone = 0
+       use_fame = 1
+       use_drz80 = 0
+       use_cz80 = 1
+
+# sncps3
 else ifeq ($(platform), sncps3)
-   TARGET := $(TARGET_NAME)_libretro_ps3.a
-   CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-   AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
-   CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
+       TARGET := $(TARGET_NAME)_libretro_ps3.a
+       CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
+       AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
+       CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
        STATIC_LINKING = 1
        NO_MMAP = 1
        DONT_COMPILE_IN_ZLIB = 1
@@ -132,15 +137,17 @@ else ifeq ($(platform), sncps3)
        asm_cdpico = 0
        asm_cdmemory = 0
        asm_mix = 0
-   use_cyclone = 0
-   use_fame = 1
-   use_drz80 = 0
-   use_cz80 = 1
+       use_cyclone = 0
+       use_fame = 1
+       use_drz80 = 0
+       use_cz80 = 1
+
+# Lightweight PS3 Homebrew SDK
 else ifeq ($(platform), psl1ght)
-   TARGET := $(TARGET_NAME)_libretro_psl1ght.a
-   CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
-   AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
-   CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
+       TARGET := $(TARGET_NAME)_libretro_psl1ght.a
+       CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
+       AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
+       CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ -DFAMEC_NO_GOTOS
        STATIC_LINKING = 1
        NO_MMAP = 1
        DONT_COMPILE_IN_ZLIB = 1
@@ -152,15 +159,17 @@ else ifeq ($(platform), psl1ght)
        asm_cdpico = 0
        asm_cdmemory = 0
        asm_mix = 0
-   use_cyclone = 0
-   use_fame = 1
-   use_drz80 = 0
-   use_cz80 = 1
+       use_cyclone = 0
+       use_fame = 1
+       use_drz80 = 0
+       use_cz80 = 1
+
+# PSP
 else ifeq ($(platform), psp1)
-   TARGET := $(TARGET_NAME)_libretro_psp1.a
-   CC = psp-gcc$(EXE_EXT)
-   AR = psp-ar$(EXE_EXT)
-   CFLAGS += -G0
+       TARGET := $(TARGET_NAME)_libretro_psp1.a
+       CC = psp-gcc$(EXE_EXT)
+       AR = psp-ar$(EXE_EXT)
+       CFLAGS += -G0
        STATIC_LINKING = 1
        NO_MMAP = 1
        DONT_COMPILE_IN_ZLIB = 1
@@ -172,88 +181,108 @@ else ifeq ($(platform), psp1)
        asm_cdpico = 0
        asm_cdmemory = 0
        asm_mix = 0
-   use_cyclone = 0
-   use_fame = 1
-   use_drz80 = 0
-   use_cz80 = 1
+       use_cyclone = 0
+       use_fame = 1
+       use_drz80 = 0
+       use_cz80 = 1
+
+# Xbox 360
 else ifeq ($(platform), xenon)
-   TARGET := $(TARGET_NAME)_libretro_xenon360.a
-   CC = xenon-gcc$(EXE_EXT)
-   AR = xenon-ar$(EXE_EXT)
-   CFLAGS += -D__LIBXENON__ -m32 -D__ppc__
+       TARGET := $(TARGET_NAME)_libretro_xenon360.a
+       CC = xenon-gcc$(EXE_EXT)
+       AR = xenon-ar$(EXE_EXT)
+       CFLAGS += -D__LIBXENON__ -m32 -D__ppc__
+
+# Nintendo Game Cube
 else ifeq ($(platform), ngc)
-   TARGET := $(TARGET_NAME)_libretro_ngc.a
-   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
-   AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
-   CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
+       TARGET := $(TARGET_NAME)_libretro_ngc.a
+       CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+       AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
+       CFLAGS += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
+
+# Nintendo Wii
 else ifeq ($(platform), wii)
-   TARGET := libretro_$(TARGET_NAME)_wii.a
-   CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
-   AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
-   CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
+       TARGET := libretro_$(TARGET_NAME)_wii.a
+       CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
+       AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT)
+       CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
+
+# QNX
 else ifeq ($(platform), qnx)
-   TARGET := $(TARGET_NAME)_libretro_qnx.so
-   CC = qcc -Vgcc_ntoarmv7le
-   CC_AS = $(CC)
-   CFLAGS += -DBASE_ADDR_FIXED=0 -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
-   ASFLAGS +=  -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
+       TARGET := $(TARGET_NAME)_libretro_qnx.so
+       CC = qcc -Vgcc_ntoarmv7le
+       CC_AS = $(CC)
+       CFLAGS += -DBASE_ADDR_FIXED=0 -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
+       ASFLAGS +=  -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
+       ARCH = arm
+       ARM_ASM = 1
 
-   ARCH = arm
-   ARM_ASM = 1
+# ARM
 else ifneq (,$(findstring armv,$(platform)))
-   TARGET := $(TARGET_NAME)_libretro.so
-   SHARED := -shared -Wl,--no-undefined
-ifneq (,$(findstring cortexa8,$(platform)))
-   CFLAGS += -marm -mcpu=cortex-a8
-   ASFLAGS += -mcpu=cortex-a8
-else ifneq (,$(findstring cortexa9,$(platform)))
-   CFLAGS += -marm -mcpu=cortex-a9
-   ASFLAGS += -mcpu=cortex-a9
-endif
-   CFLAGS += -marm
-ifneq (,$(findstring neon,$(platform)))
-   CFLAGS += -mfpu=neon
-   ASFLAGS += -mfpu=neon
-endif
-ifneq (,$(findstring softfloat,$(platform)))
-   CFLAGS += -mfloat-abi=softfp
-   ASFLAGS += -mfloat-abi=softfp
-else ifneq (,$(findstring hardfloat,$(platform)))
-   CFLAGS += -mfloat-abi=hard
-   ASFLAGS += -mfloat-abi=hard
-endif
-ifneq (,$(findstring armasm,$(platform)))
-   ARM_ASM = 1
-endif
-   ARCH = arm
+       TARGET := $(TARGET_NAME)_libretro.so
+       SHARED := -shared -Wl,--no-undefined
+       ifneq (,$(findstring cortexa5,$(platform)))
+               CFLAGS += -marm -mcpu=cortex-a5
+               ASFLAGS += -mcpu=cortex-a5
+       else ifneq (,$(findstring cortexa8,$(platform)))
+               CFLAGS += -marm -mcpu=cortex-a8
+               ASFLAGS += -mcpu=cortex-a8
+       else ifneq (,$(findstring cortexa9,$(platform)))
+               CFLAGS += -marm -mcpu=cortex-a9
+               ASFLAGS += -mcpu=cortex-a9
+       else ifneq (,$(findstring cortexa15a7,$(platform)))
+               CFLAGS += -marm -mcpu=cortex-a15.cortex-a7
+               ASFLAGS += -mcpu=cortex-a15.cortex-a7
+       else
+               CFLAGS += -marm
+       endif
+       ifneq (,$(findstring neon,$(platform)))
+               CFLAGS += -mfpu=neon
+               ASFLAGS += -mfpu=neon
+       endif
+       ifneq (,$(findstring softfloat,$(platform)))
+               CFLAGS += -mfloat-abi=softfp
+               ASFLAGS += -mfloat-abi=softfp
+       else ifneq (,$(findstring hardfloat,$(platform)))
+               CFLAGS += -mfloat-abi=hard
+               ASFLAGS += -mfloat-abi=hard
+       endif
+       ifneq (,$(findstring armasm,$(platform)))
+               ARM_ASM = 1
+       endif
+       ARCH = arm
+
+# Windows
 else
-   TARGET := $(TARGET_NAME)_libretro.dll
-   CC = gcc
-   LD_FLAGS := -fPIC
-   SHARED := -shared -static-libgcc -static-libstdc++
-   CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
+       TARGET := $(TARGET_NAME)_libretro.dll
+       CC = gcc
+       LD_FLAGS := -fPIC
+       SHARED := -shared -static-libgcc -static-libstdc++
+       CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
+
 endif
 
 CFLAGS += -DNO_ZLIB
 
 ifeq ($(NO_MMAP),1)
-CFLAGS += -DNO_MMAP
+       CFLAGS += -DNO_MMAP
 endif
 
 ifeq ($(ARM_ASM),1)
-asm_memory = 1
-asm_render = 1
-asm_ym2612 = 1
-asm_misc = 1
-asm_cdpico = 1
-asm_cdmemory = 1
-asm_mix = 1
+       asm_memory = 1
+       asm_render = 1
+       asm_ym2612 = 1
+       asm_misc = 1
+       asm_cdpico = 1
+       asm_cdmemory = 1
+       asm_mix = 1
 endif
 
 CFLAGS += -fPIC
 ifeq ($(findstring Haiku,$(shell uname -a)),)
-   LDLIBS += $(LIBM)
+       LDLIBS += $(LIBM)
 endif
+
 SHARED ?= -shared
 LDFLAGS += $(SHARED)