1
0
mirror of https://github.com/libretro/RetroArch synced 2025-03-23 19:21:03 +00:00

Merge branch 'master' of github.com:libretro/RetroArch

This commit is contained in:
fr500 2015-04-19 14:15:42 -05:00
commit 5e5b20332c

@ -225,10 +225,10 @@ enum
#define INPUT_DEFAULT_DRIVER INPUT_XINPUT #define INPUT_DEFAULT_DRIVER INPUT_XINPUT
#elif defined(ANDROID) #elif defined(ANDROID)
#define INPUT_DEFAULT_DRIVER INPUT_ANDROID #define INPUT_DEFAULT_DRIVER INPUT_ANDROID
#elif defined(_WIN32)
#define INPUT_DEFAULT_DRIVER INPUT_DINPUT
#elif defined(EMSCRIPTEN) #elif defined(EMSCRIPTEN)
#define INPUT_DEFAULT_DRIVER INPUT_RWEBINPUT #define INPUT_DEFAULT_DRIVER INPUT_RWEBINPUT
#elif defined(_WIN32)
#define INPUT_DEFAULT_DRIVER INPUT_DINPUT
#elif defined(__CELLOS_LV2__) #elif defined(__CELLOS_LV2__)
#define INPUT_DEFAULT_DRIVER INPUT_PS3 #define INPUT_DEFAULT_DRIVER INPUT_PS3
#elif (defined(SN_TARGET_PSP2) || defined(PSP)) #elif (defined(SN_TARGET_PSP2) || defined(PSP))