Skip to content

Feature/steam controller #36

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Feature/steam controller #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73fdd76
Add SteamController to DeltaCore for SteamController support in Delta
lbibass Oct 24, 2021
1c87420
fix typo
lbibass Oct 24, 2021
4735ed2
fixed delta core address
lbibass Oct 24, 2021
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
4 changes: 2 additions & 2 deletions DeltaCore.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Pod::Spec.new do |spec|
spec.version = "0.1"
spec.summary = "iOS Emulator Plug-in Framework"
spec.description = "iOS framework that powers Delta emulator."
spec.homepage = "https://github.com/rileytestut/DeltaCore"
spec.homepage = "https://github.com/lbibass/DeltaCore"
spec.platform = :ios, "12.0"
spec.source = { :git => "https://github.com/rileytestut/DeltaCore.git" }
spec.source = { :git => "https://github.com/lbibass/DeltaCore.git" }

spec.author = { "Riley Testut" => "riley@rileytestut.com" }
spec.social_media_url = "https://twitter.com/rileytestut"
Expand Down
46 changes: 41 additions & 5 deletions DeltaCore.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 52;
objects = {

/* Begin PBXBuildFile section */
2BF284A22725FD4E000913E5 /* SteamController in Frameworks */ = {isa = PBXBuildFile; productRef = 2BF284A12725FD4E000913E5 /* SteamController */; };
BF0B260B23E91745007BE38B /* Bundle+Resources.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0B260A23E91745007BE38B /* Bundle+Resources.swift */; };
BF0BC4FA225C138A000151C6 /* BitmapProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0BC4F9225C138A000151C6 /* BitmapProcessor.swift */; };
BF0BC4FD225C15E8000151C6 /* OpenGLESProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0BC4FC225C15E8000151C6 /* OpenGLESProcessor.swift */; };
Expand Down Expand Up @@ -170,6 +171,7 @@
buildActionMask = 2147483647;
files = (
BFCBD91C20CC6F790028E309 /* ZIPFoundation.framework in Frameworks */,
2BF284A22725FD4E000913E5 /* SteamController in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -479,6 +481,9 @@
BFA07F07221F3A070012699D /* PBXTargetDependency */,
);
name = DeltaCore;
packageProductDependencies = (
2BF284A12725FD4E000913E5 /* SteamController */,
);
productName = DeltaCore;
productReference = BF46895D1AACF36800A2586D /* DeltaCore.framework */;
productType = "com.apple.product-type.framework";
Expand Down Expand Up @@ -509,6 +514,9 @@
Base,
);
mainGroup = BF4689531AACF36800A2586D;
packageReferences = (
2BF284A02725FD4E000913E5 /* XCRemoteSwiftPackageReference "SteamController" */,
);
productRefGroup = BF46895E1AACF36800A2586D /* Products */;
projectDirPath = "";
projectReferences = (
Expand All @@ -534,7 +542,7 @@
};
BFCBD91320CC6F6F0028E309 /* ZIPFoundationTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = file;
fileType = wrapper.cfbundle;
path = ZIPFoundationTests.xctest;
remoteRef = BFCBD91220CC6F6F0028E309 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
Expand Down Expand Up @@ -759,7 +767,11 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
PRODUCT_BUNDLE_IDENTIFIER = "com.rileytestut.$(PRODUCT_NAME:rfc1034identifier)";
SKIP_INSTALL = YES;
Expand All @@ -780,12 +792,17 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
PRODUCT_BUNDLE_IDENTIFIER = "com.rileytestut.$(PRODUCT_NAME:rfc1034identifier)";
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = FRAMEWORK;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
};
name = Release;
Expand All @@ -812,6 +829,25 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
2BF284A02725FD4E000913E5 /* XCRemoteSwiftPackageReference "SteamController" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/zydeco/SteamController";
requirement = {
branch = master;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
2BF284A12725FD4E000913E5 /* SteamController */ = {
isa = XCSwiftPackageProductDependency;
package = 2BF284A02725FD4E000913E5 /* XCRemoteSwiftPackageReference "SteamController" */;
productName = SteamController;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = BF4689541AACF36800A2586D /* Project object */;
}
2 changes: 1 addition & 1 deletion DeltaCore.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions DeltaCore/Game Controllers/ExternalGameControllerManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import Foundation
import GameController
import SteamController

private let ExternalKeyboardStatusDidChange: @convention(c) (CFNotificationCenter?, UnsafeMutableRawPointer?, CFNotificationName?, UnsafeRawPointer?, CFDictionary?) -> Void = {
(notificationCenter, observer, name, object, userInfo) in
Expand Down
2 changes: 1 addition & 1 deletion DeltaCore/Game Controllers/MFi/MFiGameController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import GameController

import SteamController
public extension GameControllerInputType
{
static let mfi = GameControllerInputType("mfi")
Expand Down
3 changes: 2 additions & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ let package = Package(
.library(name: "DeltaCore", targets: ["DeltaCore", "CDeltaCore"]),
],
dependencies: [
.package(name: "ZIPFoundation", url: "https://github.com/weichsel/ZIPFoundation.git", .upToNextMinor(from: "0.9.11"))
.package(name: "ZIPFoundation", url: "https://github.com/weichsel/ZIPFoundation.git", .upToNextMinor(from: "0.9.11")),
.package(name:"SteamController", url:"https://github.com/zydeco/SteamController", .branch("master"))
],
targets: [
.target(
Expand Down