dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-08 00:03:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Windows build problems caused by r3801.

Browse Source 
The Windows build is still broken (for me at least) by r3797.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3805 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Marcus Wanners 2009-07-15 18:56:19 +00:00
parent f5cb2efb3e
commit d103e829fa
3 changed files with 82 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Source/Core/Core/Core.vcproj
View File

@ -943,6 +943,14 @@
<Filter <Filter
Name="PowerPC" Name="PowerPC"
> >
<File
RelativePath=".\Src\PowerPC\CoreGeneralize.cpp"
>
</File>
<File
RelativePath=".\Src\PowerPC\CoreGeneralize.h"
>
</File>
<File <File
RelativePath=".\Src\PowerPC\Gekko.h" RelativePath=".\Src\PowerPC\Gekko.h"
> >
@ -1158,6 +1166,26 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath=".\Src\PowerPC\Jit64\Jit_Util.cpp"
>
<FileConfiguration
Name="Release_JITIL|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release_JITIL|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File <File
RelativePath=".\Src\PowerPC\Jit64\Jit_Integer.cpp" RelativePath=".\Src\PowerPC\Jit64\Jit_Integer.cpp"
> >
@ -1862,6 +1890,58 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath=".\Src\PowerPC\Jit64IL\Jit_Util.cpp"
>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File <File
RelativePath=".\Src\PowerPC\Jit64IL\JitAsm.cpp" RelativePath=".\Src\PowerPC\Jit64IL\JitAsm.cpp"
> >
@ -1930,10 +2010,6 @@
RelativePath=".\Src\PowerPC\JitCommon\Jit_Tables.h" RelativePath=".\Src\PowerPC\JitCommon\Jit_Tables.h"
> >
</File> </File>
<File
RelativePath=".\Src\PowerPC\JitCommon\Jit_Util.cpp"
>
</File>
<File <File
RelativePath=".\Src\PowerPC\JitCommon\JitBackpatch.cpp" RelativePath=".\Src\PowerPC\JitCommon\JitBackpatch.cpp"
> >

2
Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
View File

@ -107,7 +107,7 @@ void AsmRoutineManager::Generate()
} }
//grab from list and jump to it //grab from list and jump to it
#ifdef _M_IX86 #ifdef _M_IX86
MOV(32, R(EDX), ImmPtr(jit.GetBlockCache()->GetCodePointers())); MOV(32, R(EDX), ImmPtr(jit->GetBlockCache()->GetCodePointers()));
JMPptr(MComplex(EDX, EAX, 4, 0)); JMPptr(MComplex(EDX, EAX, 4, 0));
#else #else
JMPptr(MComplex(R15, RAX, 8, 0)); JMPptr(MComplex(R15, RAX, 8, 0));

2
Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp
View File

@ -109,7 +109,7 @@ void AsmRoutineManager::Generate()
} }
//grab from list and jump to it //grab from list and jump to it
#ifdef _M_IX86 #ifdef _M_IX86
MOV(32, R(EDX), ImmPtr(jit.GetBlockCache()->GetCodePointers())); MOV(32, R(EDX), ImmPtr(jit->GetBlockCache()->GetCodePointers()));
JMPptr(MComplex(EDX, EAX, 4, 0)); JMPptr(MComplex(EDX, EAX, 4, 0));
#else #else
JMPptr(MComplex(R15, RAX, 8, 0)); JMPptr(MComplex(R15, RAX, 8, 0));