Skip to content

Use Tuist Build Configuration & Bring DeltaCores into Repository #91

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

Draft
dcvz wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Use Tuist Build Configuration & Bring DeltaCores into Repository #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47a817f
Initial port to Tuist build configuration
dcvz Dec 27, 2020
cc55d1a
Remove xcodeproj & xcworkspace from repo
dcvz Dec 28, 2020
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
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ DerivedData
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xcodeproj
*.xcworkspace

## Other
*.xccheckout
Expand Down
42 changes: 24 additions & 18 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,36 @@
[submodule "Cores/DeltaCore"]
path = Cores/DeltaCore
url = git@github.com:rileytestut/DeltaCore.git
[submodule "Cores/SNESDeltaCore"]
path = Cores/SNESDeltaCore
url = git@github.com:rileytestut/SNESDeltaCore.git
[submodule "External/Roxas"]
path = External/Roxas
url = git@github.com:rileytestut/Roxas.git
[submodule "Cores/GBADeltaCore"]
path = Cores/GBADeltaCore
url = git@github.com:rileytestut/GBADeltaCore.git
[submodule "Cores/GBCDeltaCore"]
path = Cores/GBCDeltaCore
url = git@github.com:rileytestut/GBCDeltaCore.git
[submodule "External/Harmony"]
path = External/Harmony
url = https://github.com/rileytestut/Harmony.git
[submodule "Cores/NESDeltaCore"]
path = Cores/NESDeltaCore
url = git@github.com:rileytestut/NESDeltaCore.git
[submodule "Cores/N64DeltaCore"]
path = Cores/N64DeltaCore
url = git@github.com:rileytestut/N64DeltaCore.git
[submodule "Cores/DSDeltaCore"]
path = Cores/DSDeltaCore
url = https://github.com/rileytestut/DSDeltaCore.git
[submodule "Cores/MelonDSDeltaCore"]
path = Cores/MelonDSDeltaCore
url = https://github.com/rileytestut/MelonDSDeltaCore.git
[submodule "Cores/MelonDSDeltaCore/melonDS"]
path = Cores/MelonDSDeltaCore/melonDS
url = git@github.com:rileytestut/melonDS.git
[submodule "Cores/Mupen64PlusDeltaCore/Mupen64Plus/mupen64plus-core"]
path = Cores/Mupen64PlusDeltaCore/Mupen64Plus/mupen64plus-core
url = git@github.com:rileytestutrileytestut/mupen64plus-core.git
[submodule "Cores/Mupen64PlusDeltaCore/Mupen64Plus/GLideN64"]
path = Cores/Mupen64PlusDeltaCore/Mupen64Plus/GLideN64
url = git@github.com:rileytestut/GLideN64.git
[submodule "Cores/Mupen64PlusDeltaCore/Mupen64Plus/libpng"]
path = Cores/Mupen64PlusDeltaCore/Mupen64Plus/libpng
url = git://git.code.sf.net/p/libpng/code
[submodule "Cores/Mupen64PlusDeltaCore/Mupen64Plus/mupen64plus-rsp-hle"]
path = Cores/Mupen64PlusDeltaCore/Mupen64Plus/mupen64plus-rsp-hle
url = git@github.com:mupen64plus/mupen64plus-rsp-hle.git
[submodule "Cores/DeSmuMEDeltaCore/desmume"]
path = Cores/DeSmuMEDeltaCore/desmume
url = git@github.com:TASVideos/desmume.git
[submodule "External/Harmony"]
path = External/Harmony
url = git@github.com:rileytestut/Harmony.git
[submodule "External/Roxas"]
path = External/Roxas
url = git@github.com:rileytestut/Roxas.git
16 changes: 16 additions & 0 deletions .package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"object": {
"pins": [
{
"package": "ZIPFoundation",
"repositoryURL": "https://github.com/rileytestut/ZIPFoundation",
"state": {
"branch": "development",
"revision": "9ea4da96aae5ae4842f81aed684e10cff057d7b9",
"version": null
}
}
]
},
"version": 1
}
1 change: 1 addition & 0 deletions .tuist-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.29.1
1 change: 0 additions & 1 deletion Cores/DSDeltaCore
Open in desktop
Submodule DSDeltaCore deleted from b59ca1
22 changes: 22 additions & 0 deletions Cores/DeSmuMEDeltaCore/Derived/InfoPlists/DeSmuMEDeltaCore.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
</plist>
23 changes: 23 additions & 0 deletions Cores/DeSmuMEDeltaCore/Derived/Sources/Bundle+DeSmuMEDeltaCore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// swiftlint:disable all
import Foundation

// MARK: - Swift Bundle Accessor

private class BundleFinder {}

extension Foundation.Bundle {
/// Since DeSmuMEDeltaCore is a framework, the bundle containing the resources is copied into the final product.
static var module: Bundle = {
return Bundle(for: BundleFinder.self)
}()
}

// MARK: - Objective-C Bundle Accessor

@objc
public class DeSmuMEDeltaCoreResources: NSObject {
@objc public class var bundle: Bundle {
return .module
}
}
// swiftlint:enable all
85 changes: 85 additions & 0 deletions Cores/DeSmuMEDeltaCore/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import ProjectDescription

let project = Project(name: "DeSmuMEDeltaCore",
packages: [],
targets: [
Target(name: "DeSmuMEDeltaCore",
platform: .iOS,
product: .framework,
bundleId: "com.rileytestut.desmumeDeltaCore",
deploymentTarget: .iOS(targetVersion: "12.2", devices: [.iphone, .ipad]),
infoPlist: .extendingDefault(with: [:]),
sources: ["Sources/**/*.swift", "Sources/Bridge/DeSmuMEEmulatorBridge.{h,mm}"],
resources: ["Resources/**/*.{deltamapping,deltaskin}"],
headers: Headers(public: ["Sources/DeSmuMEDeltaCore.h", "Sources/Bridge/DeSmuMEEmulatorBridge.h"], project: "Sources/Types/DeSmuMETypes.h"),
dependencies: [
.project(target: "DeltaCore", path: "../DeltaCore"),
.target(name: "libDeSMuME"),
.sdk(name: "libz.tbd"),
],
settings: Settings(base: [
"HEADER_SEARCH_PATHS": "\"$(SRCROOT)/desmume/desmume/src/libretro-common/include\"",
"OTHER_CFLAGS": "-DHOST_DARWIN -DDESMUME_COCOA -DHAVE_OPENGL -DHAVE_LIBZ -DANDROID -fexceptions -ftree-vectorize -DCOMPRESS_MT -DIOS -DOBJ_C -marm -fvisibility=hidden"
])),
Target(name: "libDeSMuME",
platform: .iOS,
product: .staticLibrary,
bundleId: "com.rileytestut.libDeSMuME",
deploymentTarget: .iOS(targetVersion: "12.2", devices: [.iphone, .ipad]),
infoPlist: .extendingDefault(with: [:]),
sources: [
SourceFileGlob("desmume/desmume/src/**/*.{c,cpp}", excluding: [
"desmume/desmume/src/OGLRender*.{c,cpp}",
"desmume/desmume/src/lua-engine.{c,cpp}",
"desmume/desmume/src/frontend/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/algorithms/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/compat/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/conversion/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/crt/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/dynamic/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/file/nbio/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/file/archive_*.{c,cpp}",
"desmume/desmume/src/libretro-common/file/config_file.{c,cpp}",
"desmume/desmume/src/libretro-common/file/config_file.{c,cpp}",
"desmume/desmume/src/libretro-common/formats/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/gfx/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/glsm/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/glsym/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/hash/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/include/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/libco/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/lists/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/memmap/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/net/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/queues/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/rthreads/async_job.{c,cpp}",
"desmume/desmume/src/libretro-common/rthreads/rsemaphore.{c,cpp}",
"desmume/desmume/src/libretro-common/rthreads/xenon_sdl_threads.{c,cpp}",
"desmume/desmume/src/libretro-common/streams/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/string/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/utils/**/*.{c,cpp}",
"desmume/desmume/src/libretro-common/vulkan/**/*.{c,cpp}",
"desmume/desmume/src/metaspu/SoundTouch/*_win.{c,cpp}",
"desmume/desmume/src/metaspu/win32/**/*.{c,cpp}",
"desmume/desmume/src/utils/arm_arm/**/*.{c,cpp}",
"desmume/desmume/src/utils/AsmJit/**/*.{c,cpp}",
"desmume/desmume/src/utils/colorspacehandler/*_*.{c,cpp}"
])
],
headers: Headers(
project: [
"desmume/desmume/src/*.{h,hpp}",
"desmume/desmume/src/libretro-common/include/*.{h,hpp}",
"desmume/desmume/src/libretro-common/include/math/*.{h,hpp}",
"desmume/desmume/src/metaspu/**/*.{h,hpp}",
"libDeSmuME/*.{h,hpp}"
]
),
settings: Settings(base: [
"OTHER_LDFLAGS": "-ObjC",
"CLANG_CXX_LANGUAGE_STANDARD": "compiler-default",
"CLANG_CXX_LIBRARY": "compiler-default",
"HEADER_SEARCH_PATHS": "\"$(SRCROOT)/desmume/desmume/src/libretro-common/include\"",
"OTHER_CFLAGS": "-DHOST_DARWIN -DDESMUME_COCOA -DHAVE_OPENGL -DHAVE_LIBZ -DANDROID -fexceptions -ftree-vectorize -DCOMPRESS_MT -DIOS -DOBJ_C -marm -fvisibility=hidden"
])),
])
Binary file added Cores/DeSmuMEDeltaCore/Resources/Standard.deltamapping
View file
Open in desktop
Binary file not shown.
Binary file added Cores/DeSmuMEDeltaCore/Resources/Standard.deltaskin
View file
Open in desktop
Binary file not shown.
Loading