Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #201 from Nekotekina/master

Browse Source 
Compilation fix again
This commit is contained in:
Alexandro Sánchez Bach
2014-04-26 12:55:29 +02:00
parent 6facd8d9c6 0d375809b1
commit a2157a5365
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asmjit
+1 -1
Submodule asmjit updated: 316812daf0...b76922fde9
asmjit.vcxproj
+2 -2
View File
@@ -96,12 +96,12 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\libs\$(Configuration)_x86\</OutDir>
<OutDir>.\libs\$(Configuration)\</OutDir>
<IntDir>
</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\libs\$(Configuration)_x86\</OutDir>
<OutDir>.\libs\$(Configuration)\</OutDir>
<IntDir>
</IntDir>
</PropertyGroup>
rpcs3/Emu/Cell/SPURecompiler.h
+2 -2
View File
@@ -393,7 +393,7 @@ public:
}
}
Mem XmmConst(const __m128i data)
Mem XmmConst(const __m128i& data)
{
for (u32 i = 0; i < rec.imm_table.size(); i++)
{
@@ -407,7 +407,7 @@ public:
return oword_ptr(*imm_var, shift);
}
Mem XmmConst(const __m128 data)
Mem XmmConst(const __m128& data)
{
return XmmConst((__m128i&)data);
}
rpcs3/Emu/SysCalls/Modules/sys_fs.cpp
+1 -3
View File
@@ -152,8 +152,6 @@ void fsAioRead(u32 fd, mem_ptr_t<CellFsAio> aio, int xid, mem_func_ptr_t<void (*
vfsFileBase* orig_file;
if(!sys_fs.CheckId(fd, orig_file)) return;
std::string path = orig_file->GetPath();
u64 nbytes = aio->size;
u32 buf_addr = aio->buf_addr;
@@ -207,7 +205,7 @@ fin:
file.Seek(old_pos);
ConLog.Warning("*** fsAioRead(fd=%d, offset=0x%llx, buf_addr=0x%x, size=0x%x, error=0x%x, res=0x%x, xid=0x%x [%s])",
fd, (u64)aio->offset, buf_addr, (u64)aio->size, error, res, xid, path.c_str());
fd, (u64)aio->offset, buf_addr, (u64)aio->size, error, res, xid, orig_file->GetPath().c_str());
if (func) // start callback thread
{