summaryrefslogtreecommitdiff
path: root/memory.c
diff options
context:
space:
mode:
authoraliaspider2014-12-09 05:16:09 +0100
committeraliaspider2014-12-09 05:16:09 +0100
commitb69fee8b3139eb26405c20aa3adde166f9034b59 (patch)
tree99cd6453677178d02e28ed867c76a2d440fc6cbc /memory.c
parent3cc3944725700c957b006de6f5a2ee2944d2f525 (diff)
downloadpicogpsp-b69fee8b3139eb26405c20aa3adde166f9034b59.tar.gz
picogpsp-b69fee8b3139eb26405c20aa3adde166f9034b59.tar.bz2
picogpsp-b69fee8b3139eb26405c20aa3adde166f9034b59.zip
video output now works in statically linked builds.
core can't be used as a shared library yet due to the dynarec not working when compiled with -fPIC
Diffstat (limited to 'memory.c')
-rw-r--r--memory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/memory.c b/memory.c
index 033312c..d1966d3 100644
--- a/memory.c
+++ b/memory.c
@@ -3160,7 +3160,7 @@ void bios_region_read_protect()
sound_##type##_savestate(savestate_file); \
video_##type##_savestate(savestate_file) \
-void load_state(char *savestate_filename)
+void gba_load_state(char *savestate_filename)
{
file_open(savestate_file, savestate_filename, read);
if(file_check_valid(savestate_file))
@@ -3196,7 +3196,7 @@ void load_state(char *savestate_filename)
{
reset_gba();
// Okay, so this takes a while, but for now it works.
- load_state(savestate_filename);
+ gba_load_state(savestate_filename);
}
else
{
@@ -3229,7 +3229,7 @@ void load_state(char *savestate_filename)
u8 savestate_write_buffer[506947];
u8 *write_mem_ptr;
-void save_state(char *savestate_filename, u16 *screen_capture)
+void gba_save_state(char *savestate_filename, u16 *screen_capture)
{
write_mem_ptr = savestate_write_buffer;
file_open(savestate_file, savestate_filename, write);