archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 09:48:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compilation fixes for Mingw64 (MSYS2) (#4899)

Browse source 
fix compilation on mingw
This commit is contained in:
jmatich 2018-08-29 14:27:10 +03:00 • committed by kd-11
parent 37ee0a2f55
commit b5dbd44087
11 changed files with 78 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -16,8 +16,6 @@
#include "ds4_pad_handler.h"
#ifdef _WIN32
#include "xinput_pad_handler.h"
#endif
#ifdef _MSC_VER
#include "mm_joystick_handler.h"
#endif
#ifdef HAVE_LIBEVDEV
@ -673,12 +671,10 @@ std::shared_ptr<PadHandlerBase> pad_settings_dialog::GetHandler(pad_handler type
case pad_handler::ds4:
ret_handler = std::make_unique<ds4_pad_handler>();
break;
#ifdef _MSC_VER
#ifdef _WIN32
case pad_handler::xinput:
ret_handler = std::make_unique<xinput_pad_handler>();
break;
#endif
#ifdef _WIN32
case pad_handler::mm:
ret_handler = std::make_unique<mm_joystick_handler>();
break;
@ -720,7 +716,7 @@ void pad_settings_dialog::ChangeInputType()
// Refill the device combobox with currently available devices
switch (m_handler->m_type)
{
#ifdef _MSC_VER
#ifdef _WIN32
case pad_handler::xinput:
{
const QString name_string = qstr(m_handler->name_string());
@ -819,12 +815,10 @@ void pad_settings_dialog::ChangeProfile()
case pad_handler::ds4:
((ds4_pad_handler*)m_handler.get())->init_config(&m_handler_cfg, cfg_name);
break;
#ifdef _MSC_VER
#ifdef _WIN32
case pad_handler::xinput:
((xinput_pad_handler*)m_handler.get())->init_config(&m_handler_cfg, cfg_name);
break;
#endif
#ifdef _WIN32
case pad_handler::mm:
((mm_joystick_handler*)m_handler.get())->init_config(&m_handler_cfg, cfg_name);
break;