empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes required from upstream.

Browse source
This commit is contained in:
Andrea Odetti 2020-11-12 18:43:04 +00:00
parent aa473958d0
commit c7a8c628e4
16 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/CMakeLists.txt
View file

@ -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}

1
source/Memory.h
View file

@ -1,6 +1,7 @@
#pragma once
#include "Common.h"
#include "Card.h"
// Memory Flag
#define MF_80STORE 0x00000001

2
source/NTSC.h
View file

@ -1,5 +1,7 @@
#pragma once
#include "Video.h"
// Globals (Public)
extern uint16_t g_nVideoClockVert;
extern uint16_t g_nVideoClockHorz;

2
source/frontends/common2/utils.cpp
View file

@ -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"

2
source/frontends/ncurses/main.cpp
View file

@ -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"

2
source/frontends/ncurses/world.cpp
View file

@ -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"

2
source/frontends/qapple/options.cpp
View file

@ -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"

4
source/frontends/qapple/qapple.cpp
View file

@ -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

2
source/frontends/qapple/video.cpp
View file

@ -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)
{

2
source/frontends/sa2/emulator.cpp
View file

@ -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"

3
source/frontends/sa2/main.cpp
View file

@ -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();

2
source/linux/benchmark.cpp
View file

@ -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"

2
source/linux/data.cpp
View file

@ -3,7 +3,7 @@
#include "Log.h"
#include "CPU.h"
#include "Applewin.h"
#include "AppleWin.h"
#include "Video.h"

2
source/linux/duplicates/Applewin.cpp
View file

@ -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"

2
source/linux/duplicates/Video.cpp
View file

@ -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"

2
source/linux/keyboard.cpp
View file

@ -1,7 +1,7 @@
#include "linux/keyboard.h"
#include "StdAfx.h"
#include "Applewin.h"
#include "AppleWin.h"
#include "YamlHelper.h"
#include <queue>