Skip to content

Update SDL references to fix compilation order #27

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
runs-on: macOS-latest
strategy:
matrix:
xcode: ["14.2"]
xcode: ["14.3"]
steps:
- name: Checkout
uses: actions/checkout@v3.5.2
uses: actions/checkout@v4

- name: Select Xcode ${{ matrix.xcode }}
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
Expand Down
10 changes: 5 additions & 5 deletions Package.resolved

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

10 changes: 5 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ import PackageDescription
let package = Package(
name: "FirebladeECSDemo",
platforms: [
.macOS(.v10_14),
.macOS(.v11),
.iOS(.v11),
.tvOS(.v11)
],
dependencies: [
.package(name: "SDL2", url: "https://github.com/ctreffs/SwiftSDL2.git", from: "1.3.2"),
.package(name: "SDL", url: "https://github.com/ctreffs/SwiftSDL2.git", from: "1.4.1"),
.package(name: "FirebladeECS", url: "https://github.com/fireblade-engine/ecs.git", from: "0.17.5"),
.package(name: "FirebladeMath", url: "https://github.com/fireblade-engine/math.git", from: "0.13.0")
],
targets: [
.target(
name: "SDLKit",
dependencies: ["SDL2"]),
dependencies: ["SDL"]),
.target(
name: "Particles",
dependencies: ["FirebladeECS", "SDL2", "SDLKit"]),
dependencies: ["FirebladeECS", "SDL", "SDLKit"]),
.target(
name: "Asteroids",
dependencies: ["FirebladeECS", "SDL2", "SDLKit", "FirebladeMath", "AsteroidsGameLibrary"],
dependencies: ["FirebladeECS", "SDL", "SDLKit", "FirebladeMath", "AsteroidsGameLibrary"],
exclude: ["Resources/source.txt"],
resources: [.copy("Resources/asteroid.wav"), .copy("Resources/ship.wav"), .copy("Resources/shoot.wav")]),
.target(name: "AsteroidsGameLibrary",
Expand Down
2 changes: 1 addition & 1 deletion Sources/Asteroids/EntityCreator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import FirebladeECS
import AsteroidsGameLibrary
import SDL2
import SDL

final class EntityCreator {
private let nexus: Nexus
Expand Down
2 changes: 1 addition & 1 deletion Sources/Asteroids/Systems/AudioSystem.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import Dispatch
import FirebladeECS
import SDL2
import SDL

/// In-memory copy of a sound file. Currently these remain loaded forever to avoid audio dropouts.
struct AudioData {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Asteroids/Timer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Christian Treffs on 28.10.17.
//

import SDL2
import SDL

public struct Timer {
private let countPerSecond: UInt64
Expand Down
2 changes: 1 addition & 1 deletion Sources/Particles/Timer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Christian Treffs on 28.10.17.
//

import SDL2
import SDL

public struct Timer {
private let countPerSecond: UInt64
Expand Down
2 changes: 1 addition & 1 deletion Sources/SDLKit/SDLKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//

import Foundation
@_exported import SDL2
@_exported import SDL

protocol FlagsValue: RawRepresentable {
}
Expand Down
Loading