From de243df77e7fa8e179a383bf9cf20cbbf8c4f817 Mon Sep 17 00:00:00 2001 From: Tom Morton Date: Thu, 18 Jul 2024 21:47:10 +0100 Subject: [PATCH] Fix for crash when running plasma.bin, https://github.com/jblang/agon-demos --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/vdp/Makefile | 2 +- src/vdp/vdp-console8 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index daf26e9..78bffc4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,7 +15,7 @@ dependencies = [ [[package]] name = "agon-light-emulator-debugger" -version = "0.9.56" +version = "0.9.57" dependencies = [ "agon-cpu-emulator", "ctrlc", @@ -196,7 +196,7 @@ source = "git+https://github.com/tomm/ez80.git?rev=64558c2acda1464248193f2f10804 [[package]] name = "fab-agon-emulator" -version = "0.9.56" +version = "0.9.57" dependencies = [ "agon-cpu-emulator", "agon-light-emulator-debugger", diff --git a/Cargo.toml b/Cargo.toml index 7f5fc54..249d970 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ members = ["agon-light-emulator-debugger"] [workspace.package] -version = "0.9.56" +version = "0.9.57" edition = "2021" authors = ["Tom Morton "] license = "GPL-3.0" diff --git a/src/vdp/Makefile b/src/vdp/Makefile index b171b49..bd39159 100644 --- a/src/vdp/Makefile +++ b/src/vdp/Makefile @@ -1,5 +1,5 @@ CXX ?= g++ -CFLAGS = -Wall -fmax-errors=1 -std=c++11 $(EXTRA_FLAGS) -DUSERSPACE -fPIC -g -I.. -I. -I./dispdrivers -I./userspace-vdp-gl/src -I./userspace-vdp-gl/src/userspace-platform -I./userspace-vdp-gl/src/dispdrivers -I./userspace-vdp-gl/src/userspace-platform/matrix +CFLAGS = -Wall -O2 -fmax-errors=1 -std=c++11 $(EXTRA_FLAGS) -DUSERSPACE -fPIC -g -I.. -I. -I./dispdrivers -I./userspace-vdp-gl/src -I./userspace-vdp-gl/src/userspace-platform -I./userspace-vdp-gl/src/dispdrivers -I./userspace-vdp-gl/src/userspace-platform/matrix OPTIONS = ELECTRONHAL_CFLAGS = -I./AgonElectronHAL/include diff --git a/src/vdp/vdp-console8 b/src/vdp/vdp-console8 index d179b59..9a87197 160000 --- a/src/vdp/vdp-console8 +++ b/src/vdp/vdp-console8 @@ -1 +1 @@ -Subproject commit d179b5975f481ef58bdb4bdcf625dfb00a454bb3 +Subproject commit 9a87197bde64d29d73b945950bc272fe2ca3e12d