From c7a8c628e400c796d6b98abc99008173cde29f50 Mon Sep 17 00:00:00 2001 From: Andrea Odetti Date: Thu, 12 Nov 2020 18:43:04 +0000 Subject: [PATCH] Changes required from upstream. --- source/CMakeLists.txt | 6 +++++- source/Memory.h | 1 + source/NTSC.h | 2 ++ source/frontends/common2/utils.cpp | 2 +- source/frontends/ncurses/main.cpp | 2 +- source/frontends/ncurses/world.cpp | 2 +- source/frontends/qapple/options.cpp | 2 +- source/frontends/qapple/qapple.cpp | 4 ++-- source/frontends/qapple/video.cpp | 2 +- source/frontends/sa2/emulator.cpp | 2 +- source/frontends/sa2/main.cpp | 3 +-- source/linux/benchmark.cpp | 2 +- source/linux/data.cpp | 2 +- source/linux/duplicates/Applewin.cpp | 2 +- source/linux/duplicates/Video.cpp | 2 +- source/linux/keyboard.cpp | 2 +- 16 files changed, 22 insertions(+), 16 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index f95bc0a5..10fe3c13 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -76,11 +76,15 @@ find_package(Boost REQUIRED) target_include_directories(appleii PRIVATE ${YAML_INCLUDE_DIRS} - ${MINIZIP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} Debugger ) +# this one appears in header files +target_include_directories(appleii PUBLIC + ${MINIZIP_INCLUDE_DIRS} + ) + target_link_libraries(appleii PRIVATE ${YAML_LIBRARIES} ${MINIZIP_LIBRARIES} diff --git a/source/Memory.h b/source/Memory.h index 921d437a..5c3f6f95 100644 --- a/source/Memory.h +++ b/source/Memory.h @@ -1,6 +1,7 @@ #pragma once #include "Common.h" +#include "Card.h" // Memory Flag #define MF_80STORE 0x00000001 diff --git a/source/NTSC.h b/source/NTSC.h index fc629553..05938b1a 100644 --- a/source/NTSC.h +++ b/source/NTSC.h @@ -1,5 +1,7 @@ #pragma once +#include "Video.h" + // Globals (Public) extern uint16_t g_nVideoClockVert; extern uint16_t g_nVideoClockHorz; diff --git a/source/frontends/common2/utils.cpp b/source/frontends/common2/utils.cpp index ec86fbb0..06d4d7fd 100644 --- a/source/frontends/common2/utils.cpp +++ b/source/frontends/common2/utils.cpp @@ -2,7 +2,7 @@ #include "StdAfx.h" #include "Common.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CardManager.h" #include "Disk.h" #include "SaveState.h" diff --git a/source/frontends/ncurses/main.cpp b/source/frontends/ncurses/main.cpp index b6f50f07..4ea00a66 100644 --- a/source/frontends/ncurses/main.cpp +++ b/source/frontends/ncurses/main.cpp @@ -7,7 +7,7 @@ #include "Common.h" #include "CardManager.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Disk.h" #include "Harddisk.h" #include "Log.h" diff --git a/source/frontends/ncurses/world.cpp b/source/frontends/ncurses/world.cpp index 520c8901..759e3db3 100644 --- a/source/frontends/ncurses/world.cpp +++ b/source/frontends/ncurses/world.cpp @@ -13,7 +13,7 @@ #include "Log.h" #include "DiskImageHelper.h" #include "Memory.h" -#include "Applewin.h" +#include "AppleWin.h" #include "RGBMonitor.h" #include "linux/interface.h" diff --git a/source/frontends/qapple/options.cpp b/source/frontends/qapple/options.cpp index 1c070b26..3ffbed5f 100644 --- a/source/frontends/qapple/options.cpp +++ b/source/frontends/qapple/options.cpp @@ -3,7 +3,7 @@ #include "StdAfx.h" #include "Common.h" #include "CardManager.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Disk.h" #include "Harddisk.h" #include "Registry.h" diff --git a/source/frontends/qapple/qapple.cpp b/source/frontends/qapple/qapple.cpp index 4028957e..59e47251 100644 --- a/source/frontends/qapple/qapple.cpp +++ b/source/frontends/qapple/qapple.cpp @@ -4,7 +4,7 @@ #include "StdAfx.h" #include "Common.h" #include "CardManager.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Disk.h" #include "Harddisk.h" #include "Log.h" @@ -86,7 +86,7 @@ namespace FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES); - ResetDefaultMachineMemTypes(); + // ResetDefaultMachineMemTypes(); switch (options.slot0Card) { case 1: // Language Card diff --git a/source/frontends/qapple/video.cpp b/source/frontends/qapple/video.cpp index 800a749d..f17aad70 100644 --- a/source/frontends/qapple/video.cpp +++ b/source/frontends/qapple/video.cpp @@ -10,7 +10,7 @@ #include "Common.h" #include "CardManager.h" #include "MouseInterface.h" -#include "Applewin.h" +#include "AppleWin.h" Video::Video(QWidget *parent) : VIDEO_BASECLASS(parent) { diff --git a/source/frontends/sa2/emulator.cpp b/source/frontends/sa2/emulator.cpp index 882a8793..ea4e8540 100644 --- a/source/frontends/sa2/emulator.cpp +++ b/source/frontends/sa2/emulator.cpp @@ -9,7 +9,7 @@ #include "StdAfx.h" #include "Common.h" #include "CardManager.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Disk.h" #include "CPU.h" #include "Frame.h" diff --git a/source/frontends/sa2/main.cpp b/source/frontends/sa2/main.cpp index d21f14fa..9609ecd3 100644 --- a/source/frontends/sa2/main.cpp +++ b/source/frontends/sa2/main.cpp @@ -17,7 +17,7 @@ #include "StdAfx.h" #include "Common.h" #include "CardManager.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Disk.h" #include "Mockingboard.h" #include "SoundCore.h" @@ -53,7 +53,6 @@ namespace CheckCpu(); SetWindowTitle(); FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES); - ResetDefaultMachineMemTypes(); DSInit(); MB_Initialize(); diff --git a/source/linux/benchmark.cpp b/source/linux/benchmark.cpp index 3e4eb594..1405767f 100644 --- a/source/linux/benchmark.cpp +++ b/source/linux/benchmark.cpp @@ -3,7 +3,7 @@ #include "Video.h" #include "Common.h" #include "CardManager.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Memory.h" #include "Common.h" #include "Frame.h" diff --git a/source/linux/data.cpp b/source/linux/data.cpp index 14a09fc8..679dbd5c 100644 --- a/source/linux/data.cpp +++ b/source/linux/data.cpp @@ -3,7 +3,7 @@ #include "Log.h" #include "CPU.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Video.h" diff --git a/source/linux/duplicates/Applewin.cpp b/source/linux/duplicates/Applewin.cpp index e74ff80c..e55c3381 100644 --- a/source/linux/duplicates/Applewin.cpp +++ b/source/linux/duplicates/Applewin.cpp @@ -11,7 +11,7 @@ #include "SaveState_Structs_v1.h" #include "Registry.h" #include "Log.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CPU.h" #include "Joystick.h" #include "DiskImage.h" diff --git a/source/linux/duplicates/Video.cpp b/source/linux/duplicates/Video.cpp index ab5b79c0..3b054626 100644 --- a/source/linux/duplicates/Video.cpp +++ b/source/linux/duplicates/Video.cpp @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CPU.h" #include "Memory.h" diff --git a/source/linux/keyboard.cpp b/source/linux/keyboard.cpp index 747191f3..12aced29 100644 --- a/source/linux/keyboard.cpp +++ b/source/linux/keyboard.cpp @@ -1,7 +1,7 @@ #include "linux/keyboard.h" #include "StdAfx.h" -#include "Applewin.h" +#include "AppleWin.h" #include "YamlHelper.h" #include