Blackberry buildfix.

This commit is contained in:
Sacha committed 2013-08-19 00:26:00 +10:00
1 parent b8b4add222
commit 2f7f6adfd2
3 files changed
+4 -5

No files matched your search

-1
View File
@@ -172,7 +172,6 @@ void BlackberryMain::startMain(int argc, char *argv[]) {
// TODO: Enable/disable based on setting
sensor_set_rate(SENSOR_TYPE_ACCELEROMETER, 25000);
sensor_request_events(SENSOR_TYPE_ACCELEROMETER);
old_buttons = 0;
net::Init();
startDisplays();
+1 -1
View File
@@ -48,7 +48,7 @@ public:
BlackberryMain(int argc, char *argv[]) :
emulating(false),
screen_ui(0), screen_emu(0),
controller_buttons(0),
old_buttons(0),
egl_cont(EGL_NO_CONTEXT)
{
startMain(argc, argv);
+3 -3
View File
@@ -10,8 +10,8 @@ static const std::map<int, int> KeyMapPadBlackberrytoNative = InitConstMap<int,
(SCREEN_Z_GAME_BUTTON, NKCODE_BUTTON_Z)
(SCREEN_MENU1_GAME_BUTTON, NKCODE_BUTTON_START)
(SCREEN_MENU2_GAME_BUTTON, NKCODE_BUTTON_SELECT)
(SCREEN_MENU3_GAME_BUTTON, NKCODE_BUTTON_MENU)
(SCREEN_MENU4_GAME_BUTTON, NKCODE_BUTTON_ESCAPE)
(SCREEN_MENU3_GAME_BUTTON, NKCODE_MENU)
(SCREEN_MENU4_GAME_BUTTON, NKCODE_ESCAPE)
(SCREEN_L1_GAME_BUTTON, NKCODE_BUTTON_L1)
(SCREEN_L2_GAME_BUTTON, NKCODE_BUTTON_L2)
(SCREEN_L3_GAME_BUTTON, NKCODE_OUYA_BUTTON_L3)
@@ -21,7 +21,7 @@ static const std::map<int, int> KeyMapPadBlackberrytoNative = InitConstMap<int,
(SCREEN_DPAD_UP_GAME_BUTTON, NKCODE_DPAD_UP)
(SCREEN_DPAD_DOWN_GAME_BUTTON, NKCODE_DPAD_DOWN)
(SCREEN_DPAD_LEFT_GAME_BUTTON, NKCODE_DPAD_LEFT)
(SCREEN_DPAD_RIGHT_GAME_BUTTON, NKCODE_DPAD_RIGHT)
(SCREEN_DPAD_RIGHT_GAME_BUTTON, NKCODE_DPAD_RIGHT);
// TODO: Add any missing keys
static const std::map<int, int> KeyMapRawBlackberrytoNative = InitConstMap<int, int>