Commit cbe593bb authored by Libretro-Admin's avatar Libretro-Admin
Browse files

Update

parent 81eca065
Pipeline #7113 passed with stages
in 13 minutes and 26 seconds
......@@ -159,32 +159,13 @@ else ifeq ($(platform), libnx)
STATIC_LINKING = 1
# PS3
else ifneq (,$(filter $(platform), ps3 sncps3 psl1ght))
else ifneq (,$(filter $(platform), psl1ght))
TARGET := $(TARGET_NAME)_libretro_ps3.a
STATIC_LINKING = 1
ENDIANNESS_DEFINES := -DMSB_FIRST -DBYTE_ORDER=BIG_ENDIAN -D__CELLOS_LV2__
# sncps3
ifneq (,$(findstring sncps3,$(platform)))
CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
CXX = $(CC)
AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
FLAGS += -DARCH_POWERPC_ALTIVEC
CXXFLAGS += -Xc+=exceptions
OLD_GCC := 1
NO_GCC := 1
# PS3
else ifneq (,$(findstring ps3,$(platform)))
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
FLAGS += -DARCH_POWERPC_ALTIVEC
OLD_GCC := 1
INCFLAGS_PLATFORM := -I./deps/ps3
ENDIANNESS_DEFINES := -DMSB_FIRST -DBYTE_ORDER=BIG_ENDIAN -D__PSL1GHT__
# Lightweight PS3 Homebrew SDK
else ifneq (,$(findstring psl1ght,$(platform)))
ifneq (,$(findstring psl1ght,$(platform)))
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
CXX = $(PS3DEV)/ppu/bin/ppu-g++$(EXE_EXT)
......
......@@ -65,7 +65,7 @@ namespace boost {
template< typename T1, typename T2 >
bool operator()( const T1& Arg1, const T2& Arg2 ) const
{
#if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) || defined(__CELLOS_LV2__)
#if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) || defined(__PSL1GHT__)
return std::toupper(Arg1)==std::toupper(Arg2);
#else
return std::toupper<T1>(Arg1,m_Loc)==std::toupper<T2>(Arg2,m_Loc);
......@@ -118,7 +118,7 @@ namespace boost {
template< typename T1, typename T2 >
bool operator()( const T1& Arg1, const T2& Arg2 ) const
{
#if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) || defined(__CELLOS_LV2__)
#if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) || defined(__PSL1GHT__)
return std::toupper(Arg1)<std::toupper(Arg2);
#else
return std::toupper<T1>(Arg1,m_Loc)<std::toupper<T2>(Arg2,m_Loc);
......@@ -171,7 +171,7 @@ namespace boost {
template< typename T1, typename T2 >
bool operator()( const T1& Arg1, const T2& Arg2 ) const
{
#if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) || defined(__CELLOS_LV2__)
#if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) || defined(__PSL1GHT__)
return std::toupper(Arg1)<=std::toupper(Arg2);
#else
return std::toupper<T1>(Arg1,m_Loc)<=std::toupper<T2>(Arg2,m_Loc);
......
......@@ -19,7 +19,7 @@ X More cars seem to be high pitched than on MAME. (Fixed - engine channel setup)
#include <cstring> // For memset on GCC
#include "engine/audio/osound.hpp"
#ifdef __CELLOS_LV2__
#ifdef __PSL1GHT__
#define memcpy std::memcpy
#endif
......
......@@ -45,7 +45,7 @@
#include "engine/ostats.hpp"
#include "engine/otraffic.hpp"
#ifdef __CELLOS_LV2__
#ifdef __PSL1GHT__
#define srand std::srand
#endif
......@@ -462,4 +462,4 @@ void OAttractAI::set_steering_bonus()
oinputs.steering_adjust = steering;
}
}
\ No newline at end of file
}
......@@ -11,7 +11,7 @@
#include "engine/outils.hpp"
#include "engine/ostats.hpp"
#ifdef __CELLOS_LV2__
#ifdef __PSL1GHT__
#define rand std::rand
#endif
......
......@@ -22,7 +22,7 @@
#include "engine/ohiscore.hpp"
#include "engine/audio/osoundint.hpp"
#ifdef __CELLOS_LV2__
#ifdef __PSL1GHT__
#define remove std::remove
#endif
......
......@@ -16,7 +16,7 @@
#include "hwaudio/ym2151.hpp"
#ifdef __CELLOS_LV2__
#ifdef __PSL1GHT__
#define memset std::memset
#define pow std::pow
#define floor std::floor
......@@ -2116,4 +2116,4 @@ void YM2151::stream_update()
#endif
advance();
}
}
\ No newline at end of file
}
......@@ -18,7 +18,7 @@
#include "engine/audio/osoundint.hpp"
#include <libretro.h>
#ifdef __CELLOS_LV2__
#ifdef __PSL1GHT__
#define free std::free
#endif
......
......@@ -79,15 +79,11 @@
#include <pspkernel.h>
#endif
#if defined(__CELLOS_LV2__)
#include <cell/cell_fs.h>
#endif
#if defined(VITA)
#define FIO_S_ISDIR SCE_S_ISDIR
#endif
#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
#if defined(__QNX__) || defined(PSP)
#include <unistd.h> /* stat() is defined here */
#endif
......@@ -123,10 +119,6 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
}
free(tmp);
#elif defined(__CELLOS_LV2__)
CellFsStat buf;
if (cellFsStat(path, &buf) < 0)
return false;
#elif defined(_WIN32)
struct _stat buf;
char *path_local;
......@@ -174,15 +166,13 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
case IS_DIRECTORY:
#if defined(VITA) || defined(PSP)
return FIO_S_ISDIR(buf.st_mode);
#elif defined(__CELLOS_LV2__)
return ((buf.st_mode & S_IFMT) == S_IFDIR);
#elif defined(_WIN32)
return (file_info & FILE_ATTRIBUTE_DIRECTORY);
#else
return S_ISDIR(buf.st_mode);
#endif
case IS_CHARACTER_SPECIAL:
#if defined(VITA) || defined(PSP) || defined(__CELLOS_LV2__) || defined(_WIN32)
#if defined(VITA) || defined(PSP) || defined(_WIN32)
return false;
#else
return S_ISCHR(buf.st_mode);
......
......@@ -39,10 +39,6 @@
#include <Xtl.h>
#endif
#if defined(__CELLOS_LV2__)
#include <sys/fs_external.h>
#endif
#include <limits.h>
#ifdef _MSC_VER
......@@ -75,9 +71,7 @@ static INLINE bool bits_any_set(uint32_t* ptr, uint32_t count)
}
#ifndef PATH_MAX_LENGTH
#if defined(__CELLOS_LV2__)
#define PATH_MAX_LENGTH CELL_FS_MAX_FS_PATH_LENGTH
#elif defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(GEKKO)|| defined(WIIU)
#if defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(GEKKO)|| defined(WIIU)
#define PATH_MAX_LENGTH 512
#else
#define PATH_MAX_LENGTH 4096
......
......@@ -69,7 +69,7 @@ extern "C" {
# endif
# endif
# else
# if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__)
# if defined(__GNUC__) && __GNUC__ >= 4
# define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default")))
# else
# define RETRO_API RETRO_CALLCONV
......
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