diff options
| author | Marcus Wanners <marcus@wanners.net> | 2009-07-15 18:56:19 +0000 |
|---|---|---|
| committer | Marcus Wanners <marcus@wanners.net> | 2009-07-15 18:56:19 +0000 |
| commit | d103e829fa63555bb9db667dae95428778cbaea5 (patch) | |
| tree | 5a2cfb4c4f2ebb1e6094933ea4ae41d261bbcf15 /Source | |
| parent | f5cb2efb3e405981b3390d53830d42d9fd7a1446 (diff) | |
Fixed Windows build problems caused by r3801.
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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/Core.vcproj | 84 | ||||
| -rw-r--r-- | Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp | 2 |
3 files changed, 82 insertions, 6 deletions
diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj index d9ce0fc178..df05ff5b2d 100644 --- a/Source/Core/Core/Core.vcproj +++ b/Source/Core/Core/Core.vcproj @@ -944,6 +944,14 @@ Name="PowerPC"
>
<File
+ RelativePath=".\Src\PowerPC\CoreGeneralize.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\Src\PowerPC\CoreGeneralize.h"
+ >
+ </File>
+ <File
RelativePath=".\Src\PowerPC\Gekko.h"
>
</File>
@@ -1159,6 +1167,26 @@ </FileConfiguration>
</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
RelativePath=".\Src\PowerPC\Jit64\Jit_Integer.cpp"
>
<FileConfiguration
@@ -1863,6 +1891,58 @@ </FileConfiguration>
</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
RelativePath=".\Src\PowerPC\Jit64IL\JitAsm.cpp"
>
<FileConfiguration
@@ -1931,10 +2011,6 @@ >
</File>
<File
- RelativePath=".\Src\PowerPC\JitCommon\Jit_Util.cpp"
- >
- </File>
- <File
RelativePath=".\Src\PowerPC\JitCommon\JitBackpatch.cpp"
>
</File>
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp index ad7a7ff8f2..707f4d4acc 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp @@ -107,7 +107,7 @@ void AsmRoutineManager::Generate() } //grab from list and jump to it #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)); #else JMPptr(MComplex(R15, RAX, 8, 0)); diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp index e266943e35..723369f6f0 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp @@ -109,7 +109,7 @@ void AsmRoutineManager::Generate() } //grab from list and jump to it #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)); #else JMPptr(MComplex(R15, RAX, 8, 0)); |