Commit 3da383af authored by Libretro-Admin's avatar Libretro-Admin
Browse files

Update

parent e23205d2
Pipeline #6186 failed with stages
in 6 minutes and 21 seconds
...@@ -134,26 +134,6 @@ else ifeq ($(platform), vita) ...@@ -134,26 +134,6 @@ else ifeq ($(platform), vita)
CXXFLAGS += -DVITA -DIOAPI_NO_64 -fno-common CXXFLAGS += -DVITA -DIOAPI_NO_64 -fno-common
STATIC_LINKING = 1 STATIC_LINKING = 1
# PS3
else ifeq ($(platform), ps3)
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
CXX = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
CFLAGS += -DIOAPI_NO_64
CXXFLAGS += -DIOAPI_NO_64
STATIC_LINKING = 1
# sncps3
else ifeq ($(platform), sncps3)
TARGET := $(TARGET_NAME)_libretro_ps3.a
CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
CXX = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
CFLAGS += -DIOAPI_NO_64
CXXFLAGS += -DIOAPI_NO_64
STATIC_LINKING = 1
# Lightweight PS3 Homebrew SDK # Lightweight PS3 Homebrew SDK
else ifeq ($(platform), psl1ght) else ifeq ($(platform), psl1ght)
TARGET := $(TARGET_NAME)_libretro_$(platform).a TARGET := $(TARGET_NAME)_libretro_$(platform).a
......
...@@ -71,15 +71,11 @@ ...@@ -71,15 +71,11 @@
#include <kernel/image.h> #include <kernel/image.h>
#endif #endif
#if defined(__CELLOS_LV2__)
#include <cell/cell_fs.h>
#endif
#if defined(VITA) #if defined(VITA)
#define FIO_S_ISDIR SCE_S_ISDIR #define FIO_S_ISDIR SCE_S_ISDIR
#endif #endif
#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP) #if defined(__QNX__) || defined(PSP)
#include <unistd.h> /* stat() is defined here */ #include <unistd.h> /* stat() is defined here */
#endif #endif
...@@ -106,10 +102,6 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size) ...@@ -106,10 +102,6 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
} }
free(tmp); free(tmp);
#elif defined(__CELLOS_LV2__)
CellFsStat buf;
if (cellFsStat(path, &buf) < 0)
return false;
#elif defined(_WIN32) #elif defined(_WIN32)
struct _stat buf; struct _stat buf;
DWORD file_info = GetFileAttributes(path); DWORD file_info = GetFileAttributes(path);
...@@ -132,15 +124,13 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size) ...@@ -132,15 +124,13 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
case IS_DIRECTORY: case IS_DIRECTORY:
#if defined(VITA) || defined(PSP) #if defined(VITA) || defined(PSP)
return FIO_S_ISDIR(buf.st_mode); return FIO_S_ISDIR(buf.st_mode);
#elif defined(__CELLOS_LV2__)
return ((buf.st_mode & S_IFMT) == S_IFDIR);
#elif defined(_WIN32) #elif defined(_WIN32)
return (file_info & FILE_ATTRIBUTE_DIRECTORY); return (file_info & FILE_ATTRIBUTE_DIRECTORY);
#else #else
return S_ISDIR(buf.st_mode); return S_ISDIR(buf.st_mode);
#endif #endif
case IS_CHARACTER_SPECIAL: case IS_CHARACTER_SPECIAL:
#if defined(VITA) || defined(PSP) || defined(__CELLOS_LV2__) || defined(_WIN32) #if defined(VITA) || defined(PSP) || defined(_WIN32)
return false; return false;
#else #else
return S_ISCHR(buf.st_mode); return S_ISCHR(buf.st_mode);
......
...@@ -69,7 +69,7 @@ extern "C" { ...@@ -69,7 +69,7 @@ extern "C" {
# endif # endif
# endif # endif
# else # else
# if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__) # if defined(__GNUC__) && __GNUC__ >= 4
# define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default"))) # define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default")))
# else # else
# define RETRO_API RETRO_CALLCONV # define RETRO_API RETRO_CALLCONV
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#endif #endif
#if defined(__APPLE__) || defined(IOAPI_NO_64) #if defined(__APPLE__) || defined(IOAPI_NO_64)
#if defined(__CELLOS_LV2__) || defined(_MSC_VER) && _MSC_VER <= 1310 #if defined(_MSC_VER) && _MSC_VER <= 1310
#define FOPEN_FUNC(filename, mode) fopen(filename, mode) #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
#define FTELLO_FUNC(stream) ftell(stream) #define FTELLO_FUNC(stream) ftell(stream)
#define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin) #define FSEEKO_FUNC(stream, offset, origin) fseek(stream, offset, origin)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment