diff options
| author | twinaphex | 2018-04-20 19:17:02 +0200 |
|---|---|---|
| committer | twinaphex | 2018-04-20 19:17:02 +0200 |
| commit | 5338fc0b31019fbb0654ace558b3121b53ca35e2 (patch) | |
| tree | b9ceccdb452655320004d66c2db2b90d3628b4c9 | |
| parent | 47546eadea450c5058a4bea80930a711534a1326 (diff) | |
| download | snes9x2002-5338fc0b31019fbb0654ace558b3121b53ca35e2.tar.gz snes9x2002-5338fc0b31019fbb0654ace558b3121b53ca35e2.tar.bz2 snes9x2002-5338fc0b31019fbb0654ace558b3121b53ca35e2.zip | |
Rename .s files to .S
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | Makefile.common | 15 |
2 files changed, 9 insertions, 13 deletions
@@ -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 |