Removed the remake.

Unfortunately, it wasn't compiling anymore due to `psx`, and that crate seems to be out of date for the current nightly, so we'll drop the idea of a remake for now.
This commit is contained in:
Filipe Rodrigues 2024-07-23 17:54:06 +01:00
parent cfe674bcd0
commit cc4c02e2de
Signed by: zenithsiz
SSH Key Fingerprint: SHA256:Mb5ppb3Sh7IarBO/sBTXLHbYEOz37hJAlslLQPPAPaU
9 changed files with 0 additions and 2730 deletions

View File

@ -7,4 +7,3 @@ resources/
tools/target/
tools/__pycache__
rust/target/
remake-rust/target/

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +0,0 @@
[build]
dep-info-basedir = ".."
target = "mipsel-sony-psx"
rustflags = ["-Clink-arg=-Tpsexe.ld", "-Clink-arg=--oformat=binary"]
[unstable]
build-std = ["core", "alloc"]
build-std-features = ["compiler-builtins-mem"]

View File

@ -1,2 +0,0 @@
# Rust output
target/

25
remake-rust/Cargo.lock generated
View File

@ -1,25 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "dw2003"
version = "0.1.0"
dependencies = [
"psx",
]
[[package]]
name = "linked_list_allocator"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "549ce1740e46b291953c4340adcd74c59bcf4308f4cac050fd33ba91b7168f4a"
[[package]]
name = "psx"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47204f4a0c027798cd54dfa8ae34a3ce0d9fa0e2f59de7403f0c0a5e404e3198"
dependencies = [
"linked_list_allocator",
]

View File

@ -1,10 +0,0 @@
[workspace]
resolver = "2"
members = ["dw2003"]
[workspace.dependencies]
# Workspace
dw2003 = { path = "dw2003" }

View File

@ -1,8 +0,0 @@
[package]
name = "dw2003"
version = "0.1.0"
edition = "2021"
[dependencies]
psx = { version = "0.1.6", features = ["EU_region", "heap"] }

View File

@ -1,24 +0,0 @@
#![no_std]
#![no_main]
use psx::{dprintln, Framebuffer};
psx::heap!( 1536 KB );
#[no_mangle]
fn main() {
let buf0 = (0, 0);
let buf1 = (0, 240);
let res = (320, 240);
let txt_offset = (0, 8);
let mut fb = Framebuffer::new(buf0, buf1, res, None).unwrap();
let font = fb.load_default_font();
let mut txt = font.new_text_box(txt_offset, res);
loop {
txt.reset();
dprintln!(txt, "Hello, world!");
fb.draw_sync();
fb.wait_vblank();
fb.swap();
}
}

View File

@ -67,7 +67,6 @@ alias:
build_map_dir : $(build_dir)/map
build_map_tile_dir : $(build_dir)/map-tile
build_rlen_dir : $(build_dir)/rlen
build_remake_psexe_dir: $(build_dir)/remake-psexe
# Licenses
license_psx_iso : licenses/psx-bin.dat
@ -93,7 +92,6 @@ alias:
# Psx iso
dw2003_psx_iso : $(build_psx_iso_dir)/dw2003.bin
dw2003_remake_psx_iso: $(build_psx_iso_dir)/dw2003-remake.bin
dw3_psx_iso : $(build_psx_iso_dir)/dw3.bin
psx_iso : $(build_psx_iso_dir)/^(path).bin
psx_iso_cue : $(build_psx_iso_dir)/^(path).cue
@ -117,10 +115,6 @@ alias:
psexe_deps: $(build_psexe_dir)/^(path).d
psexe_toml: psexe/^(path).toml
# Psexe remake
remake_psexe : $(build_remake_psexe_dir)/^(name).exe
remake_psexe_deps: $(build_remake_psexe_dir)/^(name).d
# Raw exe
raw_exe : $(build_raw_exe_dir)/^(path).bin
raw_exe_deps: $(build_raw_exe_dir)/^(path).d
@ -165,7 +159,6 @@ alias:
default:
- $(dw3_psx_iso)
- $(dw2003_psx_iso)
- $(dw2003_remake_psx_iso)
rules:
# Format
@ -229,7 +222,6 @@ rules:
- [$(rm), -rf, $(python3_venv)/]
- [$(rm), -rf, tools/target/]
- [$(rm), -rf, rust/target/]
- [$(rm), -rf, remake-rust/target/]
# Directories
mkdir:
@ -621,30 +613,3 @@ rules:
- -e
- 's,rust/$(build_target_dir)/lib^(name).a,$(build_rust_dir)/^(name).a,g'
- $(rust_lib_deps)
# psexe (remake)
remake_psexe:
alias:
build_target_dir: target/mipsel-sony-psx/release
out:
- $(remake_psexe)
- deps_file: $(remake_psexe_deps)
deps:
- static: $(remake_psexe::dir_name)/
exec:
# Build the crate
- cwd: remake-rust/
args:
- $(cargo)
- build
- --release
- --package=^(name)
- [$(cp), remake-rust/$(build_target_dir)/^(name).exe, $(remake_psexe)]
# Then copy the dependency file and adjust the references
- [$(cp), remake-rust/$(build_target_dir)/^(name).d, $(remake_psexe_deps)]
- - sed
- -i
- -e
- 's,remake-rust/$(build_target_dir)/^(name).exe,$(build_remake_psexe_dir)/^(name).exe,g'
- $(remake_psexe_deps)