Mercurial > repos > blastem
comparison blastem.c @ 1474:c5c022c7aa54 nuklear_ui
Initial work on Nuklear-based UI
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Tue, 21 Nov 2017 19:07:43 -0800 |
parents | 4929325c3ce0 |
children | 001120e91fed |
comparison
equal
deleted
inserted
replaced
1473:152a60c6787e | 1474:c5c022c7aa54 |
---|---|
22 #include "romdb.h" | 22 #include "romdb.h" |
23 #include "terminal.h" | 23 #include "terminal.h" |
24 #include "arena.h" | 24 #include "arena.h" |
25 #include "config.h" | 25 #include "config.h" |
26 #include "menu.h" | 26 #include "menu.h" |
27 #include "nuklear_ui/blastem_nuklear.h" | |
27 | 28 |
28 #define BLASTEM_VERSION "0.5.2-pre" | 29 #define BLASTEM_VERSION "0.5.2-pre" |
29 | 30 |
30 #ifdef __ANDROID__ | 31 #ifdef __ANDROID__ |
31 #define FULLSCREEN_DEFAULT 1 | 32 #define FULLSCREEN_DEFAULT 1 |
460 if (menu) { | 461 if (menu) { |
461 menu_system = current_system; | 462 menu_system = current_system; |
462 } else { | 463 } else { |
463 game_system = current_system; | 464 game_system = current_system; |
464 } | 465 } |
466 | |
467 blastem_nuklear_init(game_system == current_system); | |
465 | 468 |
466 current_system->debugger_type = dtype; | 469 current_system->debugger_type = dtype; |
467 current_system->enter_debugger = start_in_debugger && menu == debug_target; | 470 current_system->enter_debugger = start_in_debugger && menu == debug_target; |
468 current_system->start_context(current_system, menu ? NULL : statefile); | 471 current_system->start_context(current_system, menu ? NULL : statefile); |
469 for(;;) | 472 for(;;) |