diff --git a/Makefile.griffin b/Makefile.griffin
index 47bfd3a2f0..7f97689810 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -141,25 +141,28 @@ else ifeq ($(platform), vita)
   CC = arm-vita-eabi-gcc$(EXE_EXT)
   CXX = arm-vita-eabi-g++$(EXE_EXT)
   LD = arm-vita-eabi-ld$(EXE_EXT)
-  INCLUDE +=
   EXT_TARGET := $(TARGET_NAME).velf
   EXT_INTER_TARGET := $(TARGET_NAME).elf
   MACHDEP := -DVITA
-  PLATCFLAGS := -Wl,-q -Wall -O3
-  LIBS += -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub \
+  PLATCFLAGS := -O3
+  LIBS += -lretro_vita \
+        -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub \
 	-lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub \
 	-lSceRtc_stub -lz -lm -lc
 
   PLATOBJS += audio/audio_utils_neon.o audio/drivers_resampler/sinc_neon.o \
               audio/drivers_resampler/cc_resampler_neon.o
 
+  LIBDIRS += -L.
+  LDFLAGS +=  -Wl,-q
+
   HAVE_LIBRETRO_MANAGEMENT := 1
   HAVE_RPNG                := 1
   HAVE_ZLIB                := 1
   HAVE_VITA2D              := 1
 endif
 
-CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
+CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE)
 
 OBJ = griffin/griffin.o  $(PLATOBJS)
 
diff --git a/cores/libretro-test/Makefile b/cores/libretro-test/Makefile
index 7d7142f5b8..9e947d5b3d 100644
--- a/cores/libretro-test/Makefile
+++ b/cores/libretro-test/Makefile
@@ -56,6 +56,11 @@ else ifeq ($(platform), emscripten)
    TARGET := $(TARGET_NAME)_libretro_emscripten.bc
    fpic := -fPIC
    SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
+else ifeq ($(platform), vita)
+   TARGET := $(TARGET_NAME).a
+   CC = arm-vita-eabi-gcc
+   AR = arm-vita-eabi-ar
+   CFLAGS += -Wl,-q -Wall -O3
 else
    CC = gcc
    TARGET := $(TARGET_NAME)_libretro.dll
@@ -81,8 +86,15 @@ endif
 
 all: $(TARGET)
 
+ifeq ($(platform), vita)
+
+$(TARGET): $(OBJECTS)
+	$(AR) -rc $@ $^
+else
+
 $(TARGET): $(OBJECTS)
 	$(CC) $(fpic) $(SHARED) $(INCLUDES) -o $@ $(OBJECTS) $(LDFLAGS)
+endif
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<