From eecd18db1fe288270b495774b0b1e19cfb7a9e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?=
 <frangarcj@gmail.com>
Date: Thu, 2 Jan 2020 21:41:29 +0100
Subject: [PATCH] (VITA) Add Cyclone and DrZ80

---
 Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f5af35b5..e59a8537 100644
--- a/Makefile
+++ b/Makefile
@@ -330,8 +330,8 @@ else ifeq ($(platform), vita)
    TARGET = $(TARGET_NAME)_libretro_$(platform).a
    CC = arm-vita-eabi-gcc$(EXE_EXT)
    AR = arm-vita-eabi-ar$(EXE_EXT)
-   PLATCFLAGS += -DVITA
-   CFLAGS += -mthumb -mfloat-abi=hard -fsingle-precision-constant
+   PLATCFLAGS += -DVITA -marm
+   CFLAGS += -mfloat-abi=hard -fsingle-precision-constant
    CFLAGS += -Wall -mword-relocations
    CFLAGS += -fomit-frame-pointer -ffast-math
    CFLAGS += -fno-unwind-tables -fno-asynchronous-unwind-tables
@@ -341,7 +341,9 @@ else ifeq ($(platform), vita)
    HAVE_RZLIB := 1
    ARM = 1
    STATIC_LINKING := 1
-		
+   USE_CYCLONE := 1
+   USE_DRZ80 := 1
+
 else ifneq (,$(findstring armv,$(platform)))
    TARGET = $(TARGET_NAME)_libretro.so
    CFLAGS += -fPIC
@@ -627,7 +629,7 @@ CFLAGS += $(INCFLAGS) $(INCFLAGS_PLATFORM)
 # combine the various definitions to one
 CDEFS = $(DEFS) $(COREDEFS) $(CPUDEFS) $(SOUNDDEFS) $(ASMDEFS) $(DBGDEFS)
 
-OBJECTS := $(SOURCES_C:.c=.o)
+OBJECTS := $(SOURCES_C:.c=.o) $(SOURCES_ASM:.s=.o)
 
 OBJOUT   = -o
 LINKOUT  = -o
@@ -678,6 +680,9 @@ CFLAGS += $(PLATCFLAGS) $(CDEFS)
 	@echo Compiling $<...
 	$(HIDE)$(CC) -c $(OBJOUT)$@ $< $(CFLAGS)
 
+%.o: %.s
+	$(CC) -c $(OBJOUT)$@ $< $(CFLAGS)
+
 $(OBJ)/%.a:
 	@echo Archiving $@...
 	@$(RM) $@