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

Merge pull request #161 from libretro-mirrors/master

Browse Source 
[Libretro] fixed CHD support
This commit is contained in:
ekeeke 2017-09-07 07:47:30 +02:00 committed by GitHub
commit 2db15617a4
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.libretro
View File

@ -2,6 +2,7 @@ DEBUG = 0
LOGSOUND = 0 LOGSOUND = 0
FRONTEND_SUPPORTS_RGB565 = 1 FRONTEND_SUPPORTS_RGB565 = 1
HAVE_CHD = 1 HAVE_CHD = 1
HAVE_SYS_PARAM = 1
CORE_DIR := . CORE_DIR := .
@ -139,6 +140,7 @@ else ifneq (,$(filter $(platform), ps3 sncps3 psl1ght))
PLATFORM_DEFINES := -D__CELLOS_LV2 -DALT_RENDER PLATFORM_DEFINES := -D__CELLOS_LV2 -DALT_RENDER
ENDIANNESS_DEFINES := -DBYTE_ORDER=BIG_ENDIAN -DBYTE_ORDER=BIG_ENDIAN -DCPU_IS_BIG_ENDIAN=1 -DWORDS_BIGENDIAN=1 ENDIANNESS_DEFINES := -DBYTE_ORDER=BIG_ENDIAN -DBYTE_ORDER=BIG_ENDIAN -DCPU_IS_BIG_ENDIAN=1 -DWORDS_BIGENDIAN=1
STATIC_LINKING = 1 STATIC_LINKING = 1
HAVE_SYS_PARAM = 0
# sncps3 # sncps3
ifneq (,$(findstring sncps3,$(platform))) ifneq (,$(findstring sncps3,$(platform)))
@ -242,6 +244,8 @@ else ifeq ($(platform), windows_msvc2010_x64)
CC = cl.exe CC = cl.exe
CXX = cl.exe CXX = cl.exe
HAVE_SYS_PARAM = 0
PATH := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin/amd64"):$(PATH) PATH := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin/amd64"):$(PATH)
PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE") PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
LIB := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/lib/amd64") LIB := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/lib/amd64")
@ -266,6 +270,8 @@ else ifeq ($(platform), windows_msvc2010_x86)
CC = cl.exe CC = cl.exe
CXX = cl.exe CXX = cl.exe
HAVE_SYS_PARAM = 0
PATH := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin"):$(PATH) PATH := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/bin"):$(PATH)
PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE") PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../IDE")
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/lib") LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/lib")
@ -290,6 +296,8 @@ else ifeq ($(platform), windows_msvc2005_x86)
CC = cl.exe CC = cl.exe
CXX = cl.exe CXX = cl.exe
HAVE_SYS_PARAM = 0
PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH) PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH)
PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE") PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE")
INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/include") INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/include")
@ -349,7 +357,7 @@ ifeq ($(HAVE_CHD), 1)
endif endif
ifeq (,$(filter $(platform), ps3 sncps3 psl1ght)) ifeq ($(HAVE_SYS_PARAM), 1)
DEFINES += -DHAVE_SYS_PARAM_H DEFINES += -DHAVE_SYS_PARAM_H
else else
DEFINES += -Dflac_max=MAX -Dflac_min=MIN -Dfseeko=fseek -Dftello=ftell DEFINES += -Dflac_max=MAX -Dflac_min=MIN -Dfseeko=fseek -Dftello=ftell

2
core/cd_hw/libchdr/src/chd.c
View File

@ -41,6 +41,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "types.h"
#include "osd.h"
#include "chd.h" #include "chd.h"
#include "cdrom.h" #include "cdrom.h"
#include "flac.h" #include "flac.h"