From c4052f4d79cf0103cb10f9948ae1a810b62ff05d Mon Sep 17 00:00:00 2001
From: aliaspider
Date: Tue, 29 Sep 2015 18:08:15 +0100
Subject: (vita) build fix.

---
 frontend/libretro.c | 12 ++++++++++--
 frontend/main.c     | 10 +++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'frontend')

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 69fad2a..7243db1 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1280,7 +1280,7 @@ static bool try_use_bios(const char *path)
 	return true;
 }
 
-#if 1
+#ifndef VITA
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -1336,7 +1336,7 @@ void retro_init(void)
 		exit(1);
 	}
 
-#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L)
+#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && !defined(VITA)
 	posix_memalign(&vout_buf, 16, VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2);
 #else
 	vout_buf = malloc(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2);
@@ -1405,3 +1405,11 @@ void retro_deinit(void)
 	free(vout_buf);
 	vout_buf = NULL;
 }
+
+#ifdef VITA
+#include <psp2/kernel/threadmgr.h>
+int usleep (unsigned long us)
+{
+   sceKernelDelayThread(us);
+}
+#endif
diff --git a/frontend/main.c b/frontend/main.c
index c816ba1..2deff70 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <time.h>
-#if !defined(_WIN32) && !defined(_3DS)
+#if !defined(_WIN32) && !defined(NO_DYLIB)
 #include <dlfcn.h>
 #endif
 
@@ -985,7 +985,7 @@ void *SysLoadLibrary(const char *lib) {
 				return (void *)(long)(PLUGIN_DL_BASE + builtin_plugin_ids[i]);
 	}
 
-#if !defined(_WIN32) && !defined(_3DS)
+#if !defined(_WIN32) && !defined(NO_DYLIB)
 	ret = dlopen(lib, RTLD_NOW);
 	if (ret == NULL)
 		SysMessage("dlopen: %s", dlerror());
@@ -1002,7 +1002,7 @@ void *SysLoadSym(void *lib, const char *sym) {
 	if (PLUGIN_DL_BASE <= plugid && plugid < PLUGIN_DL_BASE + ARRAY_SIZE(builtin_plugins))
 		return plugin_link(plugid - PLUGIN_DL_BASE, sym);
 
-#if !defined(_WIN32) && !defined(_3DS)
+#if !defined(_WIN32) && !defined(NO_DYLIB)
 	return dlsym(lib, sym);
 #else
 	return NULL;
@@ -1010,7 +1010,7 @@ void *SysLoadSym(void *lib, const char *sym) {
 }
 
 const char *SysLibError() {
-#if defined(_3DS)
+#if defined(NO_DYLIB)
    return NULL;
 #elif !defined(_WIN32)
 	return dlerror();
@@ -1025,7 +1025,7 @@ void SysCloseLibrary(void *lib) {
 	if (PLUGIN_DL_BASE <= plugid && plugid < PLUGIN_DL_BASE + ARRAY_SIZE(builtin_plugins))
 		return;
 
-#if !defined(_WIN32) && !defined(_3DS)
+#if !defined(_WIN32) && !defined(NO_DYLIB)
 	dlclose(lib);
 #endif
 }
-- 
cgit v1.2.3