aboutsummaryrefslogtreecommitdiff
path: root/frontend
diff options
context:
space:
mode:
authornotaz2013-04-02 01:34:21 +0300
committernotaz2013-04-02 01:34:21 +0300
commita95a5e2e0c4bd0da035729d2fd16c068cbd0f633 (patch)
tree30b05666e7883393820fd4c4152fd77b6e112d0c /frontend
parent55bf68531a29da02569d0c53caa2f08608a191bb (diff)
parent0069615fdda3a28da547a191bef990256620ff69 (diff)
downloadpcsx_rearmed-a95a5e2e0c4bd0da035729d2fd16c068cbd0f633.tar.gz
pcsx_rearmed-a95a5e2e0c4bd0da035729d2fd16c068cbd0f633.tar.bz2
pcsx_rearmed-a95a5e2e0c4bd0da035729d2fd16c068cbd0f633.zip
Merge branch 'master' into libretro
Diffstat (limited to 'frontend')
-rw-r--r--frontend/main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/frontend/main.c b/frontend/main.c
index 09f6a1c..2cf5ee0 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -402,7 +402,14 @@ int emu_core_preinit(void)
// it may be redefined by -cfg on the command line
strcpy(cfgfile_basename, "pcsx.cfg");
+#ifdef IOS
+ emuLog = fopen("/User/Documents/pcsxr.log", "w");
+ if (emuLog == NULL)
+ emuLog = fopen("pcsxr.log", "w");
+ if (emuLog == NULL)
+#endif
emuLog = stdout;
+
SetIsoFile(NULL);
memset(&Config, 0, sizeof(Config));