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

Edge towards fast loading in the Plus 4. #1465

Merged
merged 15 commits into from
Feb 3, 2025
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
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
name: Build
on: [pull_request]
jobs:
build-mac-xcodebuild:
name: Mac UI / xcodebuild / ${{ matrix.os }}
strategy:
matrix:
os: [macos-13, macos-14, macos-15]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Make
working-directory: OSBindings/Mac
run: xcodebuild CODE_SIGN_IDENTITY=-
# build-mac-xcodebuild:
# name: Mac UI / xcodebuild / ${{ matrix.os }}
# strategy:
# matrix:
# os: [macos-13, macos-14, macos-15]
# runs-on: ${{ matrix.os }}
# steps:
# - name: Checkout
# uses: actions/checkout@v4
# - name: Make
# working-directory: OSBindings/Mac
# run: xcodebuild CODE_SIGN_IDENTITY=-
build-sdl-cmake:
name: SDL UI / cmake / ${{ matrix.os }}
strategy:
Expand Down
4 changes: 2 additions & 2 deletions Analyser/Static/Commodore/StaticAnalyser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ struct FileAnalysis {
Analyser::Static::Media media;
};

template <TargetPlatform::IntType platform>
template <TargetPlatform::Type platform>
FileAnalysis analyse_files(const Analyser::Static::Media &media) {
FileAnalysis analysis;

Expand All @@ -226,7 +226,7 @@ FileAnalysis analyse_files(const Analyser::Static::Media &media) {
// Find all valid Commodore files on tapes.
for(auto &tape : media.tapes) {
auto serialiser = tape->serialiser();
std::vector<File> tape_files = GetFiles(*serialiser);
std::vector<File> tape_files = GetFiles(*serialiser, platform);
if(!tape_files.empty()) {
analysis.files.insert(
analysis.files.end(),
Expand Down
4 changes: 2 additions & 2 deletions Analyser/Static/Commodore/Tape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

using namespace Analyser::Static::Commodore;

std::vector<File> Analyser::Static::Commodore::GetFiles(Storage::Tape::TapeSerialiser &serialiser) {
Storage::Tape::Commodore::Parser parser;
std::vector<File> Analyser::Static::Commodore::GetFiles(Storage::Tape::TapeSerialiser &serialiser, TargetPlatform::Type type) {
Storage::Tape::Commodore::Parser parser(type);
std::vector<File> file_list;

std::unique_ptr<Storage::Tape::Commodore::Header> header = parser.get_next_header(serialiser);
Expand Down
3 changes: 2 additions & 1 deletion Analyser/Static/Commodore/Tape.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
#pragma once

#include "../../../Storage/Tape/Tape.hpp"
#include "../../../Storage/TargetPlatforms.hpp"
#include "File.hpp"

namespace Analyser::Static::Commodore {

std::vector<File> GetFiles(Storage::Tape::TapeSerialiser &);
std::vector<File> GetFiles(Storage::Tape::TapeSerialiser &, TargetPlatform::Type);

}
Loading
Loading