From 39d570dc70f1cde515d524eb5b69b8101e056aba Mon Sep 17 00:00:00 2001 From: hrydgard Date: Tue, 19 Jan 2010 19:44:04 +0000 Subject: [PATCH] (linux build fix) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4893 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/MemTools.cpp | 1 + .../Core/Src/PowerPC/JitCommon/JitBackpatch.cpp | 17 ----------------- .../Core/Src/PowerPC/JitCommon/JitBackpatch.h | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Source/Core/Core/Src/MemTools.cpp b/Source/Core/Core/Src/MemTools.cpp index 9018624e88..965af81c30 100644 --- a/Source/Core/Core/Src/MemTools.cpp +++ b/Source/Core/Core/Src/MemTools.cpp @@ -45,6 +45,7 @@ #include "HW/Memmap.h" #include "PowerPC/PowerPC.h" #include "PowerPC/JitCommon/JitBase.h" +#include "PowerPC/JitCommon/JitBackpatch.h" #include "x64Analyzer.h" namespace EMM diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp index 181146ddbc..8cb7cb1ee4 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp @@ -34,23 +34,6 @@ #include #endif -#ifndef _WIN32 - - // A bit of a hack to get things building under linux. We manually fill in this structure as needed - // from the real context. - struct CONTEXT - { - #ifdef _M_X64 - u64 Rip; - u64 Rax; - #else - u32 Eip; - u32 Eax; - #endif - }; - -#endif - using namespace Gen; diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h index 793d640e8c..9fca638d59 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.h @@ -27,6 +27,23 @@ // void Jit(u32 em_address); +#ifndef _WIN32 + + // A bit of a hack to get things building under linux. We manually fill in this structure as needed + // from the real context. + struct CONTEXT + { + #ifdef _M_X64 + u64 Rip; + u64 Rax; + #else + u32 Eip; + u32 Eax; + #endif + }; + +#endif + class TrampolineCache : public Gen::XCodeBlock {