From 5338fc0b31019fbb0654ace558b3121b53ca35e2 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Fri, 20 Apr 2018 19:17:02 +0200
Subject: Rename .s files to .S

---
 Makefile        |  7 -------
 Makefile.common | 15 +++++++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index a8a9d91..b35f3cd 100644
--- a/Makefile
+++ b/Makefile
@@ -172,7 +172,6 @@ endif
 include Makefile.common
 
 OBJS := $(SOURCES:.c=.o)
-OBJS := $(OBJS:.cpp=.o)
 OBJS := $(OBJS:.S=.o)
 OBJS := $(OBJS:.s=.o)
 
@@ -198,12 +197,6 @@ endif
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-%.o: %.cpp
-	$(CXX) $(CFLAGS) -c -o $@ $<
-
-%.o: %.s
-	$(CXX) $(CFLAGS) -Wa,-I./src/ -c -o $@ $<
-
 %.o: %.S
 	$(CXX) $(CFLAGS) -Wa,-I./src/ -c -o $@ $<
 
diff --git a/Makefile.common b/Makefile.common
index 0b23655..6f810c5 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,5 +1,6 @@
 LIBRETRO_COMM_DIR = $(LIBRETRO_DIR)/libretro-common
 
+SOURCES_ASM :=
 SOURCES := 	$(CORE_DIR)/apu.c \
 				$(CORE_DIR)/apuaux.c \
 				$(CORE_DIR)/c4.c \
@@ -56,17 +57,19 @@ 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
+SOURCES_ASM += $(CORE_DIR)/spc700a.S \
+					$(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_ASM += $(CORE_DIR)/os9x_65c816_global.S \
+					$(CORE_DIR)/os9x_65c816_spcasm.S \
+					$(CORE_DIR)/os9x_65c816_spcc.S
+
+#SOURCES_ASM += $(CORE_DIR)/os9x_65c816.S
+
 SOURCES += $(CORE_DIR)/os9x_asm_cpu.c
 
 DEFINES += -DASMCPU
-- 
cgit v1.2.3