revive pandora and win32 builds, rm gp2x dep for linux, lots of refactoring

[libpicofe.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index d43aabc..b0ad4ba 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 \r
        /* in_init() must go before config, config accesses in_ fwk */\r
        in_init();\r
-       pemu_prep_defconfig();\r
+       emu_prep_defconfig();\r
        emu_read_config(0, 0);\r
        config_readlrom(PicoConfigFile);\r
 \r
@@ -104,6 +104,10 @@ int main(int argc, char *argv[])
                                menu_loop();\r
                                break;\r
 \r
+                       case PGS_TrayMenu:\r
+                               menu_loop_tray();\r
+                               break;\r
+\r
                        case PGS_ReloadRom:\r
                                if (emu_reload_rom(rom_fname_reload))\r
                                        engineState = PGS_Running;\r
@@ -115,9 +119,10 @@ int main(int argc, char *argv[])
 \r
                        case PGS_RestartRun:\r
                                engineState = PGS_Running;\r
+                               /* vvv fallthrough */\r
 \r
                        case PGS_Running:\r
-                               pemu_loop();\r
+                               emu_loop();\r
                                break;\r
 \r
                        case PGS_Quit:\r