diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 35f74eee..db34bbdd 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -80,6 +80,7 @@ set(SOURCE_FILES Core.cpp Utilities.cpp FrameBase.cpp + CmdLine.cpp Configuration/PropertySheetHelper.cpp @@ -117,7 +118,7 @@ set(SOURCE_FILES linux/duplicates/Registry.cpp linux/duplicates/FourPlay.cpp linux/duplicates/SNESMAX.cpp - linux/duplicates/CmdLine.cpp + linux/duplicates/Keyboard.cpp Z80VICE/z80.cpp Z80VICE/z80mem.cpp diff --git a/source/frontends/sdl/imgui/settingshelper.cpp b/source/frontends/sdl/imgui/settingshelper.cpp index c37b5969..75665eff 100644 --- a/source/frontends/sdl/imgui/settingshelper.cpp +++ b/source/frontends/sdl/imgui/settingshelper.cpp @@ -35,6 +35,8 @@ namespace {CT_LanguageCard, "CT_LanguageCard"}, {CT_LanguageCardIIe, "CT_LanguageCardIIe"}, {CT_Saturn128K, "CT_Saturn128K"}, + {CT_FourPlay, "CT_FourPlay"}, + {CT_SNESMAX, "CT_SNESMAX"}, }; const std::map apple2Types = @@ -97,7 +99,7 @@ namespace {2, {CT_Empty, CT_SSC}}, {3, {CT_Empty, CT_Uthernet}}, {4, {CT_Empty, CT_MockingboardC, CT_MouseInterface, CT_Phasor}}, - {5, {CT_Empty, CT_MockingboardC, CT_Z80, CT_SAM, CT_Disk2}}, + {5, {CT_Empty, CT_MockingboardC, CT_Z80, CT_SAM, CT_Disk2, CT_FourPlay, CT_SNESMAX}}, {6, {CT_Empty, CT_Disk2}}, {7, {CT_Empty, CT_GenericHDD}}, }; diff --git a/source/linux/duplicates/CmdLine.cpp b/source/linux/duplicates/CmdLine.cpp deleted file mode 100644 index dbc0767f..00000000 --- a/source/linux/duplicates/CmdLine.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "StdAfx.h" -#include "CmdLine.h" - -CmdLine g_cmdLine; diff --git a/source/linux/duplicates/Joystick.cpp b/source/linux/duplicates/Joystick.cpp index e2c24e03..c18627b9 100644 --- a/source/linux/duplicates/Joystick.cpp +++ b/source/linux/duplicates/Joystick.cpp @@ -23,6 +23,14 @@ void JoyReset() { } +void JoySetHookAltKeys(bool hook) +{ +} + +void JoySetButtonVirtualKey(UINT button, UINT virtKey) +{ +} + #define SS_YAML_KEY_COUNTERRESETCYCLE "Counter Reset Cycle" #define SS_YAML_KEY_JOY0TRIMX "Joystick0 TrimX" #define SS_YAML_KEY_JOY0TRIMY "Joystick0 TrimY" diff --git a/source/linux/duplicates/Keyboard.cpp b/source/linux/duplicates/Keyboard.cpp new file mode 100644 index 00000000..663b687d --- /dev/null +++ b/source/linux/duplicates/Keyboard.cpp @@ -0,0 +1,6 @@ +#include "StdAfx.h" +#include "Keyboard.h" + +void KeybSetAltGrSendsWM_CHAR(bool state) +{ +} diff --git a/source/linux/windows/winuser.h b/source/linux/windows/winuser.h index 5f8cc35b..8f3df0f5 100644 --- a/source/linux/windows/winuser.h +++ b/source/linux/windows/winuser.h @@ -39,3 +39,5 @@ void WINAPI PostQuitMessage(INT); #define VK_DOWN 0x28 #define VK_OEM_3 0xC0 // '`~' for US #define VK_OEM_8 0xDF + +#define KF_EXTENDED 0x0100