diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 19fcbb4c..e231e25e 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -63,7 +63,6 @@ add_library(appleii SHARED linux/linuxframe.cpp linux/duplicates/Debug.cpp - linux/duplicates/WinVideo.cpp linux/duplicates/Joystick.cpp linux/duplicates/SerialComms.cpp linux/duplicates/PropertySheet.cpp diff --git a/source/linux/data.h b/source/linux/data.h index 28584c6b..386d1cfd 100644 --- a/source/linux/data.h +++ b/source/linux/data.h @@ -1,5 +1,3 @@ #pragma once void CheckCpu(); - -extern int g_nAltCharSetOffset; // alternate character set diff --git a/source/linux/duplicates/WinVideo.cpp b/source/linux/duplicates/WinVideo.cpp deleted file mode 100644 index f40381ec..00000000 --- a/source/linux/duplicates/WinVideo.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "StdAfx.h" - -#include "Video.h" -#include "NTSC.h" - -void VideoRefreshScreen ( uint32_t uRedrawWholeScreenVideoMode /* =0*/, bool bRedrawWholeScreen /* =false*/ ) -{ - if (bRedrawWholeScreen) - { - // uVideoModeForWholeScreen set if: - // . MODE_DEBUG : always - // . MODE_RUNNING : called from VideoRedrawScreen(), eg. during full-speed - if (bRedrawWholeScreen) - NTSC_SetVideoMode(uRedrawWholeScreenVideoMode); - NTSC_VideoRedrawWholeScreen(); - } -} diff --git a/source/linux/interface.h b/source/linux/interface.h index 89dd1dd7..0613d57f 100644 --- a/source/linux/interface.h +++ b/source/linux/interface.h @@ -8,28 +8,15 @@ #include // Resources - HRSRC FindResource(void *, const char * filename, const char *); // Bitmap HBITMAP LoadBitmap(HINSTANCE hInstance, const char * filename); LONG GetBitmapBits(HBITMAP hbit, LONG cb, LPVOID lpvBits); -// Keyboard - -BYTE KeybGetKeycode(); -BYTE KeybReadData(); -BYTE KeybReadFlag(); - -// Joystick - -BYTE JoyReadButton(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG uExecutedCycles); -BYTE JoyReadPosition(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG uExecutedCycles); - // MessageBox - int MessageBox(HWND, const char * text, const char * caption, UINT type); -// Mockingboard +// Sound void registerSoundBuffer(IDirectSoundBuffer * buffer); void unregisterSoundBuffer(IDirectSoundBuffer * buffer); diff --git a/test/TestCPU6502/CMakeLists.txt b/test/TestCPU6502/CMakeLists.txt index f0267889..898698e1 100644 --- a/test/TestCPU6502/CMakeLists.txt +++ b/test/TestCPU6502/CMakeLists.txt @@ -1,5 +1,4 @@ add_executable(testcpu6502 stdafx.cpp ../../source/SynchronousEventManager.cpp - dummy.cpp TestCPU6502.cpp) diff --git a/test/TestCPU6502/dummy.cpp b/test/TestCPU6502/dummy.cpp deleted file mode 100644 index 0be5c85c..00000000 --- a/test/TestCPU6502/dummy.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "linux/interface.h" - -void registerSoundBuffer(IDirectSoundBuffer * buffer) -{ -} - -void unregisterSoundBuffer(IDirectSoundBuffer * buffer) -{ -} - -// Resources - -HRSRC FindResource(void *, const char * filename, const char *) -{ - return HRSRC(); -} - -// Keyboard - -BYTE KeybGetKeycode() { return 0; } -BYTE KeybReadData() { return 0; } -BYTE KeybReadFlag() { return 0; } - -// Joystick - -BYTE JoyReadButton(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG nCyclesLeft) { return 0; } -BYTE JoyReadPosition(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG nCyclesLeft) { return 0; } - -// MessageBox - -int MessageBox(HWND, const char * text, const char * caption, UINT type) { return 0; } - -// Bitmap - -HBITMAP LoadBitmap(HINSTANCE hInstance, const char * filename) -{ - return nullptr; -} - -LONG GetBitmapBits(HBITMAP hbit, LONG cb, LPVOID lpvBits) -{ - return 0; -}