From 0a2c1e6f5025c20e7c476e305ddda1c1a6bd9eec Mon Sep 17 00:00:00 2001
From: aliaspider
Date: Tue, 24 Nov 2015 13:47:28 +0100
Subject: add ASM_CPU and ASM_SPC700 build options.

---
 Makefile.common | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'Makefile.common')

diff --git a/Makefile.common b/Makefile.common
index 102a0a1..92bc255 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -35,8 +35,6 @@ SOURCES += $(LIBRETRO_DIR)/libretro.c
 SOURCES += $(LIBRETRO_DIR)/memstream.c
 
 ifeq ($(ARM_ASM), 1)
-SOURCES += $(CORE_DIR)/spc700a.s
-SOURCES += $(CORE_DIR)/spc_decode.S
 SOURCES += $(CORE_DIR)/ppu.c
 SOURCES += $(CORE_DIR)/rops.c
 SOURCES += $(CORE_DIR)/mode7new.c
@@ -58,15 +56,34 @@ SOURCES += $(CORE_DIR)/tile16fadd1_2.c
 SOURCES += $(CORE_DIR)/tile16sub.c
 SOURCES += $(CORE_DIR)/tile16sub1_2.c
 SOURCES += $(CORE_DIR)/tile16fsub1_2.c
+
+ifeq ($(ASM_SPC700), 1)
+SOURCES += $(CORE_DIR)/spc700a.s
+SOURCES += $(CORE_DIR)/spc_decode.S
+
+DEFINES += -DASM_SPC700
+endif
+
+ifeq ($(ASM_CPU), 1)
 SOURCES += $(CORE_DIR)/os9x_65c816_global.s
 SOURCES += $(CORE_DIR)/os9x_65c816_spcasm.s
 SOURCES += $(CORE_DIR)/os9x_65c816_spcc.s
 #SOURCES += $(CORE_DIR)/os9x_65c816.s
 SOURCES += $(CORE_DIR)/os9x_asm_cpu.c
 
+DEFINES += -DASMCPU
+endif
+
 DEFINES += -mstructure-size-boundary=32
 DEFINES += -DARM_ASM
 DEFINES += -DRIGHTSHIFT_IS_SAR
+# Do we need all this? Causes issues on non-GCC compilers, etc.
+DEFINES += -ffast-math
+DEFINES += -finline -finline-functions -fexpensive-optimizations
+DEFINES += -falign-functions=32 -falign-loops -falign-labels
+DEFINES += -falign-jumps -fstrict-aliasing -fsigned-char -frename-registers -fweb
+DEFINES += -fomit-frame-pointer
+
 else
 SOURCES += $(CORE_DIR)/ppu_.c
 SOURCES += $(CORE_DIR)/gfx.c
@@ -77,21 +94,10 @@ endif
 
 
 #DEFINES += -D__GP2X__
-#DEFINES += -DASMCPU
 #DEFINES += -DVAR_CYCLES
 #DEFINES += -D_C_GW_
-#DEFINES += -DUSE_SA1
 #DEFINES +=  -DFAST_LSB_WORD_ACCESS
 
-ifeq ($(ARM_ASM), 1)
-# Do we need all this? Causes issues on non-GCC compilers, etc. 
-DEFINES += -ffast-math
-DEFINES += -finline -finline-functions -fexpensive-optimizations
-DEFINES += -falign-functions=16 -falign-loops -falign-labels
-DEFINES += -falign-jumps -fstrict-aliasing -fsigned-char -frename-registers -fweb
-DEFINES += -fomit-frame-pointer
-endif
-
 DEFINES += -ffast-math -funroll-loops -fomit-frame-pointer
 
 INCLUDES   = -I$(LIBRETRO_DIR) -I$(CORE_DIR) -I.
-- 
cgit v1.2.3