ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PAD: fix macos build

This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech 2020-12-11 09:57:00 +01:00 committed by lightningterror
parent c6d6865bb9
commit d1c6b6b789
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/CMakeLists.txt
View File

@ -974,6 +974,8 @@ set(Common
${pcsx2SPU2Headers} ${pcsx2SPU2Headers}
${pcsx2DEV9Sources} ${pcsx2DEV9Sources}
${pcsx2DEV9Headers} ${pcsx2DEV9Headers}
${pcsx2PADHeaders}
${pcsx2PADSources}
${pcsx2DebugToolsSources} ${pcsx2DebugToolsSources}
${pcsx2GuiSources} ${pcsx2GuiSources}
${pcsx2GuiResources} ${pcsx2GuiResources}
@ -1002,8 +1004,6 @@ if(Linux)
${pcsx2LinuxHeaders} ${pcsx2LinuxHeaders}
${pcsx2USBSources} ${pcsx2USBSources}
${pcsx2USBHeaders} ${pcsx2USBHeaders}
${pcsx2PADHeaders}
${pcsx2PADSources}
) )
set(Platform_Libs set(Platform_Libs

4
pcsx2/PAD/Linux/PAD.cpp
View File

@ -273,8 +273,12 @@ keyEvent* PADkeyEvent()
return &s_event; return &s_event;
} }
s_event = g_ev_fifo.dequeue(); s_event = g_ev_fifo.dequeue();
//TODO: fix me for macOS
#ifdef __linux__
AnalyzeKeyEvent(s_event); AnalyzeKeyEvent(s_event);
// PAD_LOG("Returning Event. Event Type: %d, Key: %d\n", s_event.evt, s_event.key); // PAD_LOG("Returning Event. Event Type: %d, Key: %d\n", s_event.evt, s_event.key);
#endif
return &s_event; return &s_event;
} }