Merge pull request #1153 from jobermayr/master

Dump.cpp: Fix Linux build.
This commit is contained in:
Gregory Hainaut 2016-01-31 17:55:17 +01:00
commit 64001c9643
2 changed files with 4 additions and 4 deletions

View File

@ -253,8 +253,8 @@ void iDumpBlock(u32 ee_pc, u32 ee_size, uptr x86_pc, u32 x86_size)
objdump.Close();
std::system(
wxsFormat("objdump -D -b binary -mi386 --disassembler-options=intel --no-show-raw-insn --adjust-vma=%d %s >> %s",
(u32) x86_pc, WX_STR(obj_filename), WX_STR(dump_filename))
wxsFormat( L"objdump -D -b binary -mi386 --disassembler-options=intel --no-show-raw-insn --adjust-vma=%d %s >> %s",
(u32) x86_pc, WX_STR(obj_filename), WX_STR(dump_filename)).mb_str()
);
#endif
}

View File

@ -281,8 +281,8 @@ static void iIopDumpBlock( int startpc, u8 * ptr )
f2.Write( ptr, (uptr)x86Ptr - (uptr)ptr );
}
std::system( wxsFormat("objdump -D -b binary -mi386 -M intel --no-show-raw-insn %s >> %s; rm %s",
"mydump1", WX_STR(filename), "mydump1") );
std::system( wxsFormat( L"objdump -D -b binary -mi386 -M intel --no-show-raw-insn %s >> %s; rm %s",
"mydump1", WX_STR(filename), "mydump1").mb_str() );
#endif
}