diff options
| author | twinaphex | 2012-11-28 06:35:30 +0100 |
|---|---|---|
| committer | twinaphex | 2012-11-28 06:35:30 +0100 |
| commit | b194a2ecd43debbb3724e332b660b993725acd52 (patch) | |
| tree | a41deacfa7a6841e97d67fce60bb7f39b54b12be /maemo | |
| parent | b6514bd168106e978a0af0f5043d5da6fd35800a (diff) | |
| parent | 06d2e1a58b6eb7fb449f79f7e807343bd8d39b59 (diff) | |
| download | pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.tar.gz pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.tar.bz2 pcsx_rearmed-b194a2ecd43debbb3724e332b660b993725acd52.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'maemo')
| -rw-r--r-- | maemo/hildon.c | 4 | ||||
| -rw-r--r-- | maemo/main.c | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/maemo/hildon.c b/maemo/hildon.c index 4458aa7..43e3e15 100644 --- a/maemo/hildon.c +++ b/maemo/hildon.c @@ -4,12 +4,12 @@ #include <stdint.h> #include <unistd.h> #include <hildon/hildon.h> -#include "plugin_lib.h" +#include "plugin_lib.h" #include "main.h" #include "plat.h" #include "../libpcsxcore/psemu_plugin_defs.h" -#include "common/readpng.h" +#include "libpicofe/readpng.h" #include "maemo_common.h" #define X_RES 800 diff --git a/maemo/main.c b/maemo/main.c index 2da693d..24db87a 100644 --- a/maemo/main.c +++ b/maemo/main.c @@ -16,11 +16,14 @@ #include "plugin_lib.h" #include "../libpcsxcore/misc.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" -#include "../plugins/dfinput/main.h" +#include "../plugins/dfinput/externals.h" #include "maemo_common.h" int g_opts = OPT_SHOWFPS; int g_maemo_opts; +int g_scaler, soft_filter; +int g_menuscreen_w, g_menuscreen_h; + char file_name[MAXPATHLEN]; enum sched_action emu_action; @@ -53,7 +56,10 @@ int main(int argc, char **argv) strcpy(Config.PluginsDir, "/opt/maemo/usr/games/plugins"); snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "/opt/maemo/usr/games" PATCHES_DIR); Config.PsxAuto = 1; - + + g_menuscreen_w = 800; + g_menuscreen_h = 480; + pl_init(); emu_core_init(); @@ -126,7 +132,7 @@ int main(int argc, char **argv) printf(_("Could not load CD-ROM!\n")); return -1; } - emu_on_new_cd(); + emu_on_new_cd(0); ready_to_go = 1; } } |