From d1c6b6b7898e77a965fa265375b6d4f8e5d1df03 Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Fri, 11 Dec 2020 09:57:00 +0100 Subject: [PATCH] PAD: fix macos build --- pcsx2/CMakeLists.txt | 4 ++-- pcsx2/PAD/Linux/PAD.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index fbd9dfeb0b..dd0071445a 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -974,6 +974,8 @@ set(Common ${pcsx2SPU2Headers} ${pcsx2DEV9Sources} ${pcsx2DEV9Headers} + ${pcsx2PADHeaders} + ${pcsx2PADSources} ${pcsx2DebugToolsSources} ${pcsx2GuiSources} ${pcsx2GuiResources} @@ -1002,8 +1004,6 @@ if(Linux) ${pcsx2LinuxHeaders} ${pcsx2USBSources} ${pcsx2USBHeaders} - ${pcsx2PADHeaders} - ${pcsx2PADSources} ) set(Platform_Libs diff --git a/pcsx2/PAD/Linux/PAD.cpp b/pcsx2/PAD/Linux/PAD.cpp index ab24a6c633..15a6afd45d 100644 --- a/pcsx2/PAD/Linux/PAD.cpp +++ b/pcsx2/PAD/Linux/PAD.cpp @@ -273,8 +273,12 @@ keyEvent* PADkeyEvent() return &s_event; } s_event = g_ev_fifo.dequeue(); + +//TODO: fix me for macOS +#ifdef __linux__ AnalyzeKeyEvent(s_event); // PAD_LOG("Returning Event. Event Type: %d, Key: %d\n", s_event.evt, s_event.key); +#endif return &s_event; }