(PS3) Buildfixes

This commit is contained in:
twinaphex 2018-08-28 23:36:29 +02:00 committed by Brandon Wright
parent d59ae41b6d
commit 8940c6818f
3 changed files with 11 additions and 3 deletions

View File

@ -10,7 +10,9 @@
#endif #endif
// Uncomment to enable platform-specific (and possibly non-portable) optimizations // Uncomment to enable platform-specific (and possibly non-portable) optimizations
#if !defined(__CELLOS_LV2__)
#define BLARGG_NONPORTABLE 1 #define BLARGG_NONPORTABLE 1
#endif
// Uncomment if automatic byte-order determination doesn't work // Uncomment if automatic byte-order determination doesn't work
//#define BLARGG_BIG_ENDIAN 1 //#define BLARGG_BIG_ENDIAN 1

View File

@ -1,6 +1,7 @@
DEBUG = 0 DEBUG = 0
HAVE_EXCEPTIONS = 0 HAVE_EXCEPTIONS = 0
LAGFIX=1 LAGFIX=1
HAVE_STRINGS_H = 1
SPACE := SPACE :=
SPACE := $(SPACE) $(SPACE) SPACE := $(SPACE) $(SPACE)
@ -167,6 +168,7 @@ else ifneq (,$(filter $(platform), ps3 sncps3 psl1ght))
TARGET := $(TARGET_NAME)_libretro_$(platform).a TARGET := $(TARGET_NAME)_libretro_$(platform).a
CXXFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__ CXXFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
STATIC_LINKING = 1 STATIC_LINKING = 1
HAVE_STRINGS_H = 0
# sncps3 # sncps3
ifneq (,$(findstring sncps3,$(platform))) ifneq (,$(findstring sncps3,$(platform)))
@ -517,9 +519,12 @@ endif
CXXFLAGS += $(CODE_DEFINES) $(WARNINGS_DEFINES) $(fpic) CXXFLAGS += $(CODE_DEFINES) $(WARNINGS_DEFINES) $(fpic)
CXXFLAGS += -DRIGHTSHIFT_IS_SAR -D__LIBRETRO__ -DALLOW_CPU_OVERCLOCK CXXFLAGS += -DRIGHTSHIFT_IS_SAR -D__LIBRETRO__ -DALLOW_CPU_OVERCLOCK
CFLAGS = $(CXXFLAGS) CFLAGS = $(CXXFLAGS)
CFLAGS += -DHAVE_STDINT_H
CXXFLAGS += -DHAVE_STDINT_H
ifeq (,$(findstring msvc,$(platform))) ifeq (,$(findstring msvc,$(platform)))
ifeq ($(HAVE_STRINGS_H), 1)
CXXFLAGS += -DHAVE_STRINGS_H CXXFLAGS += -DHAVE_STRINGS_H
endif
CXXFLAGS += -fno-rtti -pedantic CXXFLAGS += -fno-rtti -pedantic
ifneq ($(HAVE_EXCEPTIONS), 1) ifneq ($(HAVE_EXCEPTIONS), 1)
CXXFLAGS += -fno-exceptions CXXFLAGS += -fno-exceptions

View File

@ -13,8 +13,9 @@
*********************************************************************/ *********************************************************************/
/*************************** HEADER FILES ***************************/ /*************************** HEADER FILES ***************************/
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <memory.h> #include <string.h>
/****************************** MACROS ******************************/ /****************************** MACROS ******************************/
#define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b)))) #define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b))))
@ -35,7 +36,7 @@ typedef unsigned int WORD; /* 32-bit word, change to "long" for 16-
typedef struct { typedef struct {
BYTE data[64]; BYTE data[64];
WORD datalen; WORD datalen;
unsigned long long bitlen; uint64_t bitlen;
WORD state[8]; WORD state[8];
} SHA256_CTX; } SHA256_CTX;