Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Core] Beetle PSX #2368

Draft
wants to merge 23 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 48 additions & 4 deletions Cores/BeetlePSX/BuildFlags.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,58 @@
//

// All
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) __LIBRETRO__=1 HAVE_PBP=1 HAVE_CHD=1 _7ZIP_ST=1 WANT_THREADING=1 HAVE_THREADS=1 ENABLE_THREADED_COMPILER=1 HAVE_OPENGLES2=1 SIZEOF_DOUBLE=8 PACKAGE=mednafen MEDNAFEN_VERSION_NUMERIC=9386 PSS_STYLE=1 MPC_FIXED_POINT STDC_HEADERS __STDC_LIMIT_MACROS _LOW_ACCURACY_ _FILE_OFFSET_BITS=64 __STDC_CONSTANT_MACROS FRONTEND_SUPPORTS_RGB565=1 HAVE_CHD=1 LINK_STATIC_LIBCPLUSPLUS=1 THREADED_RECOMPILER=1 LIGHTREC_LOG_LEVEL=3 NEED_THREADING=1 HAVE_LIBRETRO=1 WANT_32BPP=1 NEED_CD=1 LIGHTREC_STATIC=1 NEED_TREMOR=1 NEED_BPP=32 NEED_DEINTERLACER=1 HAVE_HW=1 SET_HAVE_HW=1 WANT_PSX_EMU=1 HAVE_UNISTD_H=1 MEDNAFEN_VERSION=0.9.38.6 HAS_DEFAULT_ELM=0 ENABLE_DISASSEMBLER=0 HAVE_GRIFFIN=0 HAVE_OPENGLES=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) ENABLE_DISASSEMBLER=0
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) ENABLE_THREADED_COMPILER=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) FRONTEND_SUPPORTS_RGB565=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAS_DEFAULT_ELM=0
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_CHD=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_GRIFFIN=0
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_HW=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_LIBRETRO=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_VULKAN=1
//GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_OPENGL=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_OPENGLES3=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_OPENGLES2=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_OPENGLES=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_PBP=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_THREADS=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_UNISTD_H=1
//GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) PSX_DBGPRINT_ENABLE=1
//GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) HAVE_LIGHTREC=0
//GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) LIGHTREC_LOG_LEVEL=3
//GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) LIGHTREC_STATIC=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) LINK_STATIC_LIBCPLUSPLUS=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) MEDNAFEN_VERSION=0.9.38.6
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) MEDNAFEN_VERSION_NUMERIC=9386
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) MPC_FIXED_POINT
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) NEED_BPP=32
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) NEED_CD=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) NEED_DEINTERLACER=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) NEED_THREADING=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) NEED_TREMOR=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) PACKAGE=mednafen
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) PSS_STYLE=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) SET_HAVE_HW=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) SIZEOF_DOUBLE=8
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) STDC_HEADERS
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) THREADED_RECOMPILER=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) WANT_32BPP=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) WANT_PSX_EMU=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) WANT_THREADING=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) _7ZIP_ST=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) _FILE_OFFSET_BITS=64
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) _LOW_ACCURACY_
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) __LIBRETRO__=1
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) __STDC_CONSTANT_MACROS
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) __STDC_LIMIT_MACROS
GL_APIENTRYP=GLAPIENTRY*
// HAVE_OPENGLES=1
// HAVE_VULKAN=0 HAVE_JIT=0 WANT_16BPP=0 WANT_8BPP=1 LIGHTREC_DEBUG=0 HAVE_OPENGL=0 HAVE_SHM=1 USE_FIXED
// HAVE_CDROM=1
//OTHER_CFLAGS = $(inherited) -ObjC -ffast-math -ftree-vectorize -fno-strict-aliasing -fpermissive -fomit-frame-pointer -fmodules -fcxx-modules
OTHER_CFLAGS = $(inherited) -fmodules -fcxx-modules
OTHER_CFLAGS = $(inherited) -fmodules -fcxx-modules -Wno-module-import-in-extern-c

// OTHER_LDFLAGS = $(inherited) -ObjC -Wl,-all_load -all_load
OTHER_LDFLAGS = $(inherited) -ObjC -Wl,-all_load -all_load

// EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(inherited)

Expand All @@ -25,7 +68,7 @@ GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1 NEON=
// TODO: Why does this result in some missing symbols?
// HAVE_OPENGLES_3_1=1

OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -mfpu=neon -D__VEC4_OPT -D__NEON_OPT
OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) -D__VEC4_OPT -D__NEON_OPT
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*] = $(inherited)

// Simulator
Expand All @@ -34,6 +77,7 @@ GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = TARGET_IPHONE_SIMULATOR=1 I

// tvOS Device
//GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvos*] = $(inherited) TARGET_IPHONE=1 IOS=1 HAVE_OPENGLES3=1
OTHER_CFLAGS[sdk=appletvos*] = $(inherited) -D__VEC4_OPT -D__NEON_OPT
// HAVE_OPENGLES_3_1=1

// tvOS Simulator
Expand Down
3 changes: 1 addition & 2 deletions Cores/BeetlePSX/PVBeetlePSX.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ FOUNDATION_EXPORT double PVBeetlePSXVersionNumber;
FOUNDATION_EXPORT const unsigned char PVBeetlePSXVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <PVBeetlePSX/PublicHeader.h>
#import <PVBeetlePSX/PVBeetlePSXEmulatorCore.h>

#import <PVBeetlePSX/PVBeetlePSXCoreBridge.h>
Loading
Loading