The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-11-14 14:55:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #105 from libretro/master

Browse Source 
Re-syncing with libretro repo
This commit is contained in:
ekeeke 2016-09-09 08:41:36 +02:00 committed by GitHub
commit d6162d0a7e
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile.libretro
View File

@ -183,7 +183,7 @@ else ifeq ($(platform), rpi1)
SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined
PLATFORM_DEFINES := -DHAVE_ZLIB PLATFORM_DEFINES := -DHAVE_ZLIB
PLATFORM_DEFINES += -DARM11 PLATFORM_DEFINES += -DARM11
PLATFORM_DEFINES += -marm -march=armv6j -mfloat-abi=hard -mfpu=vfp -funsafe-math-optimizations PLATFORM_DEFINES += -marm -march=armv6j -mfloat-abi=hard -mfpu=vfp
ENDIANNESS_DEFINES := -DLSB_FIRST -DALIGN_LONG -DBYTE_ORDER=LITTLE_ENDIAN ENDIANNESS_DEFINES := -DLSB_FIRST -DALIGN_LONG -DBYTE_ORDER=LITTLE_ENDIAN
CFLAGS += -fomit-frame-pointer -ffast-math CFLAGS += -fomit-frame-pointer -ffast-math
CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
@ -195,7 +195,19 @@ else ifeq ($(platform), rpi2)
SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined
PLATFORM_DEFINES := -DHAVE_ZLIB PLATFORM_DEFINES := -DHAVE_ZLIB
PLATFORM_DEFINES += -DARM PLATFORM_DEFINES += -DARM
PLATFORM_DEFINES += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -funsafe-math-optimizations PLATFORM_DEFINES += -marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
ENDIANNESS_DEFINES := -DLSB_FIRST -DALIGN_LONG -DBYTE_ORDER=LITTLE_ENDIAN
CFLAGS += -fomit-frame-pointer -ffast-math
CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
# Raspberry Pi 3
else ifeq ($(platform), rpi3)
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined
PLATFORM_DEFINES := -DHAVE_ZLIB
PLATFORM_DEFINES += -DARM
PLATFORM_DEFINES += -marm -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard
ENDIANNESS_DEFINES := -DLSB_FIRST -DALIGN_LONG -DBYTE_ORDER=LITTLE_ENDIAN ENDIANNESS_DEFINES := -DLSB_FIRST -DALIGN_LONG -DBYTE_ORDER=LITTLE_ENDIAN
CFLAGS += -fomit-frame-pointer -ffast-math CFLAGS += -fomit-frame-pointer -ffast-math
CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
@ -254,8 +266,9 @@ else ifneq (,$(findstring armv,$(platform)))
# emscripten # emscripten
else ifeq ($(platform), emscripten) else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_emscripten.bc TARGET := $(TARGET_NAME)_libretro_$(platform).bc
ENDIANNESS_DEFINES := -DLSB_FIRST -DALIGN_LONG -DHAVE_ALLOCA_H -DUSE_DYNAMIC_ALLOC -DUSE_MEMORY_H -DBYTE_ORDER=BIG_ENDIAN -DHAVE_ZLIB ENDIANNESS_DEFINES := -DLSB_FIRST -DBYTE_ORDER=LITTLE_ENDIAN -DHAVE_ZLIB
STATIC_LINKING = 1
# GCW0 # GCW0
else ifeq ($(platform), gcw0) else ifeq ($(platform), gcw0)

2
libretro/osd.h
View File

@ -27,6 +27,8 @@ typedef unsigned char bool;
#define M_PI 3.1415926535897932385 #define M_PI 3.1415926535897932385
#endif #endif
#include "scrc32.h"
#define CHEATS_UPDATE() ROMCheatUpdate() #define CHEATS_UPDATE() ROMCheatUpdate()
typedef struct typedef struct