Update AppleWin.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
audetto · Jun 2, 2024 · 86155a3 · 86155a3
1 parent c5f2c54
commit 86155a3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/source/frontends/common2/commonframe.cpp b/source/frontends/common2/commonframe.cpp
@@ -71,7 +71,6 @@ namespace common2
 
   std::string CommonFrame::getBitmapFilename(const std::string & resource)
   {
-    if (resource == "CHARSET40") return "CHARSET4.BMP";
     if (resource == "CHARSET82") return "CHARSET82.bmp";
     if (resource == "CHARSET8M") return "CHARSET8M.bmp";
     if (resource == "CHARSET8C") return "CHARSET8C.bmp";

diff --git a/source/frontends/qt/qapple.qrc b/source/frontends/qt/qapple.qrc
@@ -3,7 +3,8 @@
         <file>resources/Apple2.rom</file>
         <file>resources/Apple2e.rom</file>
         <file>resources/Apple2e_Enhanced.rom</file>
-        <file alias="resources/CHARSET40.BMP">resources/CHARSET4.BMP</file>
+        <file>resources/Apple2_Video.rom</file>
+        <file>resources/Apple2e_Enhanced_Video.rom</file>
         <file alias="resources/CHARSET82.BMP">resources/CHARSET82.bmp</file>
         <file alias="resources/CHARSET8M.BMP">resources/CHARSET8M.bmp</file>
         <file alias="resources/CHARSET8C.BMP">resources/CHARSET8C.bmp</file>

diff --git a/source/frontends/qt/resources/Apple2_Video.rom b/source/frontends/qt/resources/Apple2_Video.rom
@@ -0,0 +1 @@
+../../../../resource/Apple2_Video.rom
diff --git a/source/frontends/qt/resources/Apple2e_Enhanced_Video.rom b/source/frontends/qt/resources/Apple2e_Enhanced_Video.rom
@@ -0,0 +1 @@
+../../../../resource/Apple2e_Enhanced_Video.rom
diff --git a/source/frontends/qt/resources/CHARSET4.BMP b/source/frontends/qt/resources/CHARSET4.BMP
diff --git a/source/linux/resources.cpp b/source/linux/resources.cpp
@@ -8,6 +8,8 @@ namespace
     {
      {IDR_APPLE2_ROM, "Apple2.rom"},
      {IDR_APPLE2_PLUS_ROM, "Apple2_Plus.rom"},
+     {IDR_APPLE2_VIDEO_ROM, "Apple2_Video.rom"},
+     {IDR_APPLE2E_ENHANCED_VIDEO_ROM, "Apple2e_Enhanced_Video.rom"},
      {IDR_APPLE2_JPLUS_ROM, "Apple2_JPlus.rom"},
      {IDR_APPLE2E_ROM, "Apple2e.rom"},
      {IDR_APPLE2E_ENHANCED_ROM, "Apple2e_Enhanced.rom"},