Incorporate AW changes.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>

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

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<eApple2Type, std::string> 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}},
     };

source/linux/duplicates/CmdLine.cpp

@@ -1,4 +0,0 @@
-#include "StdAfx.h"
-#include "CmdLine.h"
-
-CmdLine g_cmdLine;

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"

source/linux/duplicates/Keyboard.cpp

@@ -0,0 +1,6 @@
+#include "StdAfx.h"
+#include "Keyboard.h"
+
+void KeybSetAltGrSendsWM_CHAR(bool state)
+{
+}

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