From ec3170752a7fe33ccee5f625d9fa69f11e7dfbe2 Mon Sep 17 00:00:00 2001 From: Johannes Obermayr Date: Sat, 30 Jan 2016 14:50:30 +0100 Subject: [PATCH] Fix Linux build. pcsx2/Dump.cpp: In function 'void iDumpBlock(u32, u32, uptr, u32)': pcsx2/Dump.cpp:258:4: error: cannot convert 'wxString' to 'const char*' for argument '1' to 'int system(const char*)' pcsx2/x86/iR3000A.cpp: In function 'void iIopDumpBlock(int, u8*)': pcsx2/x86/iR3000A.cpp:285:45: error: cannot convert 'wxString' to 'const char*' for argument '1' to 'int system(const char*)' --- pcsx2/Dump.cpp | 4 ++-- pcsx2/x86/iR3000A.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pcsx2/Dump.cpp b/pcsx2/Dump.cpp index 2b895bc311..567c01882b 100644 --- a/pcsx2/Dump.cpp +++ b/pcsx2/Dump.cpp @@ -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 } diff --git a/pcsx2/x86/iR3000A.cpp b/pcsx2/x86/iR3000A.cpp index 3c63cc47af..90e1aa0431 100644 --- a/pcsx2/x86/iR3000A.cpp +++ b/pcsx2/x86/iR3000A.cpp @@ -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 }