Skip to content

Commit

Permalink
(PS3) Buildfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
inactive123 authored and bearoso committed Aug 29, 2018
1 parent d59ae41 commit 8940c68
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 2 additions & 0 deletions apu/bapu/dsp/blargg_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
#endif

// Uncomment to enable platform-specific (and possibly non-portable) optimizations
#if !defined(__CELLOS_LV2__)

This comment has been minimized.

Copy link
@OV2

OV2 Aug 29, 2018

Collaborator

@twinaphex was this for the "ISO C++ forbids braced-groups within expressions" error? I'm fine with it, but I think statement expressions are available since gcc 3 something - maybe it just needs a switch to allow it?

#define BLARGG_NONPORTABLE 1
#endif

// Uncomment if automatic byte-order determination doesn't work
//#define BLARGG_BIG_ENDIAN 1
Expand Down
7 changes: 6 additions & 1 deletion libretro/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
DEBUG = 0
HAVE_EXCEPTIONS = 0
LAGFIX=1
HAVE_STRINGS_H = 1

SPACE :=
SPACE := $(SPACE) $(SPACE)
Expand Down Expand Up @@ -167,6 +168,7 @@ else ifneq (,$(filter $(platform), ps3 sncps3 psl1ght))
TARGET := $(TARGET_NAME)_libretro_$(platform).a
CXXFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
STATIC_LINKING = 1
HAVE_STRINGS_H = 0

# sncps3
ifneq (,$(findstring sncps3,$(platform)))
Expand Down Expand Up @@ -517,9 +519,12 @@ endif
CXXFLAGS += $(CODE_DEFINES) $(WARNINGS_DEFINES) $(fpic)
CXXFLAGS += -DRIGHTSHIFT_IS_SAR -D__LIBRETRO__ -DALLOW_CPU_OVERCLOCK
CFLAGS = $(CXXFLAGS)

CFLAGS += -DHAVE_STDINT_H
CXXFLAGS += -DHAVE_STDINT_H
ifeq (,$(findstring msvc,$(platform)))
ifeq ($(HAVE_STRINGS_H), 1)
CXXFLAGS += -DHAVE_STRINGS_H
endif
CXXFLAGS += -fno-rtti -pedantic
ifneq ($(HAVE_EXCEPTIONS), 1)
CXXFLAGS += -fno-exceptions
Expand Down
5 changes: 3 additions & 2 deletions sha256.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
*********************************************************************/

/*************************** HEADER FILES ***************************/
#include <stdint.h>
#include <stdlib.h>
#include <memory.h>
#include <string.h>

/****************************** MACROS ******************************/
#define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b))))
Expand All @@ -35,7 +36,7 @@ typedef unsigned int WORD; /* 32-bit word, change to "long" for 16-
typedef struct {
BYTE data[64];
WORD datalen;
unsigned long long bitlen;
uint64_t bitlen;
WORD state[8];
} SHA256_CTX;

Expand Down

0 comments on commit 8940c68

Please sign in to comment.