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

[WIP] AppStore target #2327

Closed
wants to merge 60 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
a52e857
AllowMultiplePlatforms=1 various cores,frameworks
JoeMatt Jan 9, 2024
0f518fd
Fix build targets and flags various targets
JoeMatt Apr 2, 2024
1d3f1e6
Warnings, minor ones fixed
JoeMatt Apr 10, 2024
79aa4ba
Fix various warnings and duplicated build flags
JoeMatt Apr 11, 2024
969e369
Fix warnings, C func missing void, neon,fpu flags
JoeMatt Apr 11, 2024
3dd4ec7
Fix warnings about missing supported platforms
JoeMatt Apr 11, 2024
bba64e9
delete superfulous ;
JoeMatt Apr 15, 2024
38f7807
gitignore flycast build dir
JoeMatt Apr 15, 2024
95792b6
crab emu mutli target
JoeMatt Apr 15, 2024
50542c6
virtualjaguar update for warnings
JoeMatt Apr 15, 2024
387cb07
play update submodules
JoeMatt Apr 15, 2024
aa3b5be
Play! Add BUILDING.md instructions for building
JoeMatt Apr 15, 2024
adf2a8b
play CMAKE update script updated
JoeMatt Apr 19, 2024
8912e25
Play project updates post update.sh
JoeMatt Apr 19, 2024
ecc39d7
Play! project update for updated upstream
JoeMatt Apr 23, 2024
303783f
play! update submodule
JoeMatt Apr 23, 2024
5188721
play! xcode touched project
JoeMatt Apr 23, 2024
a303af9
play! playcore.mm controls api update
JoeMatt Apr 23, 2024
7a1aa5b
play! cmake auto created files updated
JoeMatt Apr 23, 2024
c5ac013
visionOS force SwiftUI
JoeMatt Apr 23, 2024
48ffd3c
spm update
JoeMatt Apr 23, 2024
8616b0f
bliss core minor project file updates
JoeMatt Apr 23, 2024
9f08b5f
play! xcodeproj xcode touched some things bcs xc
JoeMatt Apr 24, 2024
efe3b51
Play! tvOS patch around missing apis
JoeMatt Apr 28, 2024
e39ab51
play! update submodule for Prov tvOS ifdefs
JoeMatt Apr 28, 2024
6f7b44e
dolphin cmake script and readme updates
JoeMatt Apr 23, 2024
ed17048
dolphin reformat update.sh markdown.md
JoeMatt Apr 27, 2024
fc03b10
dolphin update.sh and readme updates
JoeMatt Apr 24, 2024
90c6371
dolphin oragnize xcconfig
JoeMatt Apr 28, 2024
3f1cf3f
dolphin fix tvOS missing touch UI call
JoeMatt Apr 28, 2024
20cd426
Dolphin copy cmake toolchain file locally
JoeMatt Apr 28, 2024
0587b55
dolphin add xcconfig just for generated dolphin project
JoeMatt Apr 28, 2024
4d099e7
AppStore trim down to simulator building, no cds
JoeMatt Apr 28, 2024
5e70f74
AppStore retitle Beta to Advanced, hide options
JoeMatt Apr 28, 2024
38e1aef
AppStore filter systems menu for empty cores
JoeMatt Apr 28, 2024
cd7a969
update bliss repo to inhibit warns
JoeMatt Apr 28, 2024
4add2a5
AppStore remove targets using LibRetro, fix plist
JoeMatt Apr 28, 2024
ce2f4c0
AppStore make patreon text more apple approved
JoeMatt Apr 28, 2024
be8c41e
fix small for loop warning
JoeMatt Apr 28, 2024
15afdae
AppStore add back public entitlements
JoeMatt Apr 29, 2024
b8a30c7
libretro inhibit warnings
JoeMatt Apr 29, 2024
0685b90
crabemu minor commit ignore warnings
JoeMatt Apr 29, 2024
09e4a46
AppStore PVSNES fix archiving settings
JoeMatt Apr 29, 2024
d42ade6
AppStore PVLibrary fix archiving settings
JoeMatt Apr 29, 2024
1c71ff3
AppStore target fix to archive correctlyish
JoeMatt Apr 29, 2024
53fe7f2
Bump version number 2.3.0 tvOS 15.1
JoeMatt Apr 29, 2024
eae3777
Provenance tv lite fix plist path
JoeMatt Apr 29, 2024
d0a8f67
AppStore update entitlements
JoeMatt Apr 29, 2024
79ff41d
PVSupport normalize optiization of targets
JoeMatt Apr 29, 2024
337a849
AppStore main project updates
JoeMatt Apr 29, 2024
56fda14
AppStore fix launch screen storyboard submit issue
JoeMatt Apr 29, 2024
d68025c
AppStore del wrong retro core framework embeds
JoeMatt Apr 29, 2024
8ad59db
AppStore remove application mon service
JoeMatt Apr 29, 2024
c0aa97e
AppStore replace launch sb with launchimage
JoeMatt Apr 29, 2024
5d85714
bump build to 2804
JoeMatt Apr 29, 2024
29b8bf2
AppStore PVLibrary optional link LibRetro.fmwk
JoeMatt Apr 30, 2024
b7d67ea
AppStore remove GME from build
JoeMatt Apr 30, 2024
a47cda9
Package.resolved update PLCrashReporter 1.11.2
JoeMatt Apr 30, 2024
6de3c74
AppStore remove unused carplay code
JoeMatt Apr 30, 2024
e1eb623
Bump build 2805
JoeMatt Apr 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,4 @@ Cores/DuckStation/lib/
/Cores/PPSSPP/lib/libzstd_staticPPSSPP.a
/Cores/PPSSPP/lib/ppsspp
/CoresRetro/RetroArch/lib
/Cores/Flycast/build
4 changes: 2 additions & 2 deletions Build.xcconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Configuration settings file format documentation can be found at:
// https://help.apple.com/xcode/#/dev745c5c974

MARKETING_VERSION = 2.2.1
CURRENT_PROJECT_VERSION = 2803
MARKETING_VERSION = 2.3.0
CURRENT_PROJECT_VERSION = 2805

GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GLES_SILENCE_DEPRECATION=1 NONJAILBROKEN=1

Expand Down
3 changes: 3 additions & 0 deletions Cores/Atari800/PVAtari800.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,7 @@
B324C5122191A38D009F4EDC /* Archive */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -736,6 +737,7 @@
B36DE74E1D6AB19C002EE3ED /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down Expand Up @@ -780,6 +782,7 @@
B36DE74F1D6AB19C002EE3ED /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
Expand Down
8 changes: 6 additions & 2 deletions Cores/BeetlePSX/PVBeetlePSX.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3317,6 +3317,8 @@
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos appletvsimulator appletvos";
SUPPORTS_MACCATALYST = YES;
SYMROOT = "${SRCROOT}/cmake";
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
TVOS_DEPLOYMENT_TARGET = 13.0;
Expand Down Expand Up @@ -3361,7 +3363,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = B3447EBF218BE9DA00557ACE /* BuildFlags.xcconfig */;
buildSettings = {
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
ALLOW_TARGET_PLATFORM_SPECIALIZATION = NO;
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down Expand Up @@ -3438,6 +3440,8 @@
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "xrsimulator xros watchsimulator watchos macosx iphonesimulator iphoneos appletvsimulator appletvos";
SUPPORTS_MACCATALYST = YES;
SYMROOT = "${SRCROOT}/cmake";
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
TVOS_DEPLOYMENT_TARGET = 13.0;
Expand All @@ -3451,7 +3455,7 @@
B3D067A62BC4EF3800A7327F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
ALLOW_TARGET_PLATFORM_SPECIALIZATION = NO;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
DEFINES_MODULE = YES;
Expand Down
2 changes: 1 addition & 1 deletion Cores/Bliss
2 changes: 1 addition & 1 deletion Cores/CrabEMU
2 changes: 1 addition & 1 deletion Cores/Debug/PVDebug.c
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
void PVDebug() {
void PVDebug(void) {
}
23 changes: 16 additions & 7 deletions Cores/Dolphin/BuildFlags.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,43 @@
//
//

// All
GCC_PREPROCESSOR_DEFINITIONS = $(inherited)
OTHER_CFLAGS = $(inherited) -mno-thumb -mfpu=neon -fno-operator-names -fno-rtti -ffast-math -ftree-vectorize -fno-strict-aliasing -frename-registers -fno-rtti -fpermissive -fsingle-precision-constant -DTARGET_NO_NIXPROF
// MARK: - All

GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GLES_SILENCE_DEPRECATIONS=1
OTHER_CFLAGS = $(inherited) -fno-operator-names -fno-rtti -ffast-math -ftree-vectorize -fno-strict-aliasing -frename-registers -fno-rtti -fpermissive -fsingle-precision-constant -DTARGET_NO_NIXPROF
// -DUSE_MEMORYWATCHER=1
OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -l"z" -DIPHONEOS
//-l"nanopb" -l"PromisesObjC"

// Device
// MARK: - Device

GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1
OTHER_CFLAGS[sdk=iphoneos*] = $(inherited)

// Simulator
// MARK: - Simulator

GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) TARGET_IPHONE_SIMULATOR=1
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = *
INCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = PVDebug.c

// tvOS Device
// MARK: - tvOS Device

GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvos*] = $(inherited) TARGET_IPHONE=1
//EXCLUDED_SOURCE_FILE_NAMES[sdk=appletvos*][arch=*] = *
//INCLUDED_SOURCE_FILE_NAMES[sdk=appletvos*][arch=*] = PVDebug.c

// tvOS Simulator
// MARK: - tvOS Simulator

GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvsimulator*] = $(inherited) TARGET_IPHONE_SIMULATOR=1
EXCLUDED_SOURCE_FILE_NAMES[sdk=appletvsimulator*][arch=*] = *
INCLUDED_SOURCE_FILE_NAMES[sdk=appletvsimulator*][arch=*] = PVDebug.c


// MARK: - Other XCode flags

//Kept in same TARGET_BUILD_DIR as others
//BUILD_DIR = $(SRCROOT)/lib
OBJROOT = $(SRCROOT)/lib/dolphin-emu
SYMROOT = $(SRCROOT)/lib/dolphin-emu
PROJECT_TEMP_DIR = $(SRCROOT)/lib/dolphin-emu/build/$(PROJECT_NAME).build
VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES
2 changes: 1 addition & 1 deletion Cores/Dolphin/PVDolphinCore/Core/FastmemUtil.m
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ bool CanEnableFastmem(void)
return s_can_enable_fastmem;
}

DOLFastmemType GetFastmemType()
DOLFastmemType GetFastmemType(void)
{
return s_fastmem_type;
}
104 changes: 0 additions & 104 deletions Cores/Dolphin/PVDolphinCore/Core/PVDolphinCore+Controls.mm
Original file line number Diff line number Diff line change
Expand Up @@ -565,110 +565,6 @@ -(void)setupControllers {
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_IR_RECENTER action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:gcPort button:ButtonManager::ButtonType::BUTTON_START action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
};
} else if (controller.gamepad != nil) {
controller.gamepad.buttonB.pressedChangedHandler = ^(GCControllerButtonInput* button, float value, bool pressed) {
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_BUTTON_A
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::CLASSIC_BUTTON_B
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:gcPort button:ButtonManager::ButtonType::BUTTON_B
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
};

controller.gamepad.buttonY.pressedChangedHandler = ^(GCControllerButtonInput* button, float value, bool pressed) {
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::WIIMOTE_BUTTON_B
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::CLASSIC_BUTTON_Y
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:gcPort button:ButtonManager::ButtonType::BUTTON_Y action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
};
controller.gamepad.buttonA.pressedChangedHandler = ^(GCControllerButtonInput* button, float value, bool pressed) {
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_BUTTON_1
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadMoveEventOnPad:port axis:WIIMOTE_SHAKE_Z value:value];
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::CLASSIC_BUTTON_A
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:gcPort button:ButtonManager::ButtonType::BUTTON_A
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
};
controller.gamepad.buttonX.pressedChangedHandler = ^(GCControllerButtonInput* button, float value, bool pressed) {
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::WIIMOTE_BUTTON_2
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadMoveEventOnPad:port axis:WIIMOTE_SHAKE_Z value:value];
[self gamepadMoveEventOnPad:port axis:WIIMOTE_SHAKE_Y value:value];
[self gamepadMoveEventOnPad:port axis:WIIMOTE_SHAKE_X value:value];
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::CLASSIC_BUTTON_X
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:gcPort button:ButtonManager::ButtonType::BUTTON_X
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
};
controller.gamepad.leftShoulder.pressedChangedHandler = ^(GCControllerButtonInput* button, float value, bool pressed) {
[self gamepadMoveEventOnPad:port axis:WIIMOTE_SHAKE_Z value:value];
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_BUTTON_PLUS action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::CLASSIC_BUTTON_ZL
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:gcPort button:ButtonManager::ButtonType::TRIGGER_L action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
};
controller.gamepad.rightShoulder.pressedChangedHandler = ^(GCControllerButtonInput* button, float value, bool pressed) {
[self gamepadMoveEventOnPad:port axis:WIIMOTE_SHAKE_X value:value];
[self gamepadMoveEventOnPad:port axis:WIIMOTE_SHAKE_Y value:value];
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_BUTTON_MINUS action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::CLASSIC_BUTTON_ZR
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:gcPort button:ButtonManager::ButtonType::TRIGGER_R action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
};
controller.gamepad.dpad.up.pressedChangedHandler = ^(GCControllerButtonInput* button, float value, bool pressed) {
if (rotateControls) {
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_RIGHT action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
} else {
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_UP action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
}
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::CLASSIC_DPAD_UP
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:gcPort button:ButtonManager::ButtonType::BUTTON_UP action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
};
controller.gamepad.dpad.left.pressedChangedHandler = ^(GCControllerButtonInput* button, float value, bool pressed) {
if (rotateControls) {
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_UP action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
} else {
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_LEFT action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
}
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::CLASSIC_DPAD_LEFT
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:gcPort button:ButtonManager::ButtonType::BUTTON_LEFT action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
};
controller.gamepad.dpad.right.pressedChangedHandler = ^(GCControllerButtonInput* button, float value, bool pressed) {
if (rotateControls) {
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_DOWN action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
} else {
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_RIGHT action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
}
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::CLASSIC_DPAD_RIGHT
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:gcPort button:ButtonManager::ButtonType::BUTTON_RIGHT action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
};
controller.gamepad.dpad.down.pressedChangedHandler = ^(GCControllerButtonInput* button, float value, bool pressed) {
if (rotateControls) {
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_LEFT action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
} else {
[self gamepadEventOnPad:port button:ButtonManager::ButtonType::WIIMOTE_DOWN action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
}
[self gamepadEventOnPad:port
button:ButtonManager::ButtonType::CLASSIC_DPAD_DOWN
action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
[self gamepadEventOnPad:gcPort button:ButtonManager::ButtonType::BUTTON_DOWN action:(pressed?ButtonManager::BUTTON_PRESSED:ButtonManager::BUTTON_RELEASED)];
};
} else if (controller.microGamepad != nil) {
controller.microGamepad.buttonA.pressedChangedHandler = ^(GCControllerButtonInput* button, float value, bool pressed) {
Expand Down
28 changes: 14 additions & 14 deletions Cores/Dolphin/PVDolphinCore/Core/PVDolphinCore.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@
uint8_t padData[4][PVDreamcastButtonCount];
int8_t xAxis[4];
int8_t yAxis[4];
int videoWidth;
int videoHeight;
int videoBitDepth;
// int videoWidth;
// int videoHeight;
// int videoBitDepth;
int videoDepthBitDepth; // eh
int8_t gsPreference;
int8_t resFactor;
int8_t cpuType;
int8_t cpuOClock;
int8_t msaa;
BOOL ssaa;
BOOL fastMemory;
// int8_t gsPreference;
// int8_t resFactor;
// int8_t cpuType;
// int8_t cpuOClock;
// int8_t msaa;
// BOOL ssaa;
// BOOL fastMemory;
float sampleRate;
BOOL isNTSC;
BOOL isBilinear;
BOOL isWii;
BOOL enableCheatCode;
BOOL multiPlayer;
// BOOL isBilinear;
// BOOL isWii;
// BOOL enableCheatCode;
// BOOL multiPlayer;
UIView *m_view;
UIViewController *m_view_controller;
CAMetalLayer* m_metal_layer;
Expand Down
6 changes: 4 additions & 2 deletions Cores/Dolphin/PVDolphinCore/Core/PVDolphinCore.mm
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ @implementation PVDolphinCore
{
//DolHost *dol_host;
uint16_t *_soundBuffer;
bool _isWii;
float _frameInterval;
NSString *autoLoadStatefileName;
NSString *_dolphinCoreModule;
Expand Down Expand Up @@ -523,7 +522,9 @@ - (void)setupView {
self.touchViewController.view.userInteractionEnabled=true;
self.touchViewController.view.autoresizesSubviews=true;
self.touchViewController.view.userInteractionEnabled=true;
#if !TARGET_OS_TV
self.touchViewController.view.multipleTouchEnabled=true;
#endif
} else {
if(self.gsPreference == 0)
{
Expand Down Expand Up @@ -597,6 +598,7 @@ -(void)processOption:(NSString *)key value:(NSString*)value {
if (action)
action();
}

@end

/* Dolphin Host (Required by Core) */
Expand All @@ -622,7 +624,7 @@ void Host_Message(HostMessageID id)
if (Core::IsRunning())
Core::QueueHostJob(&Core::Stop);
} else if (id == HostMessageID::WMUserCreate)
NSLog(@"User Create Called\n", (int)id);
NSLog(@"User Create Called %i\n", (int)id);
}

void Host_UpdateTitle(const std::string& title)
Expand Down
53 changes: 53 additions & 0 deletions Cores/Dolphin/cmake/BuildFlags.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
//
// BuildFlags.xcconfig
// PVDolphin
//
// Created by Joseph Mattiello on 11/1/18.
//
//

// MARK: - All

GCC_PREPROCESSOR_DEFINITIONS[arch=arm64] = $(inherited) _ARCH_64=1 _M_ARM_64=1
GCC_PREPROCESSOR_DEFINITIONS[arch=arm64e] = $(inherited) _ARCH_64=1 _M_ARM_64=1
GCC_PREPROCESSOR_DEFINITIONS[arch=x86_64] = $(inherited) _ARCH_64=1 _M_X86_64=1

//
//GCC_PREPROCESSOR_DEFINITIONS = $(inherited) GLES_SILENCE_DEPRECATIONS=1
//OTHER_CFLAGS = $(inherited) -fno-operator-names -fno-rtti -ffast-math -ftree-vectorize -fno-strict-aliasing -frename-registers -fno-rtti -fpermissive -fsingle-precision-constant -DTARGET_NO_NIXPROF
//// -DUSE_MEMORYWATCHER=1
//OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -l"z" -DIPHONEOS
////-l"nanopb" -l"PromisesObjC"
//
//// MARK: - Device
//
//GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*] = $(inherited) TARGET_IPHONE=1
//OTHER_CFLAGS[sdk=iphoneos*] = $(inherited)
//
//// MARK: - Simulator
//
//GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) TARGET_IPHONE_SIMULATOR=1
//EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = *
//INCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*] = PVDebug.c
//
//// MARK: - tvOS Device
//
//GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvos*] = $(inherited) TARGET_IPHONE=1
////EXCLUDED_SOURCE_FILE_NAMES[sdk=appletvos*][arch=*] = *
////INCLUDED_SOURCE_FILE_NAMES[sdk=appletvos*][arch=*] = PVDebug.c
//
//// MARK: - tvOS Simulator
//
//GCC_PREPROCESSOR_DEFINITIONS[sdk=appletvsimulator*] = $(inherited) TARGET_IPHONE_SIMULATOR=1
//EXCLUDED_SOURCE_FILE_NAMES[sdk=appletvsimulator*][arch=*] = *
//INCLUDED_SOURCE_FILE_NAMES[sdk=appletvsimulator*][arch=*] = PVDebug.c
//
//
//// MARK: - Other XCode flags
//
////Kept in same TARGET_BUILD_DIR as others
////BUILD_DIR = $(SRCROOT)/lib
//OBJROOT = $(SRCROOT)/lib/dolphin-emu
//SYMROOT = $(SRCROOT)/lib/dolphin-emu
//PROJECT_TEMP_DIR = $(SRCROOT)/lib/dolphin-emu/build/$(PROJECT_NAME).build
//VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES
Loading
Loading