From ae7d6c0c2fb84ba533294454486bbae9e8e3f5cc Mon Sep 17 00:00:00 2001 From: Sacha Date: Tue, 25 Dec 2012 09:13:50 +1000 Subject: [PATCH] Update Qt project/Symbian --- Common/MemoryUtil.cpp | 6 +++++- Qt/Core.pro | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Common/MemoryUtil.cpp b/Common/MemoryUtil.cpp index 282ffe2ee4..f4ff4da1a5 100644 --- a/Common/MemoryUtil.cpp +++ b/Common/MemoryUtil.cpp @@ -115,7 +115,11 @@ void* AllocateMemoryPages(size_t size) #ifdef _WIN32 void* ptr = VirtualAlloc(0, size, MEM_COMMIT, PAGE_READWRITE); #else - void* ptr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0); + void* ptr = mmap(0, size, PROT_READ | PROT_WRITE, +#ifndef __SYMBIAN32__ + MAP_ANON | +#endif + MAP_PRIVATE, -1, 0); #endif // printf("Mapped memory at %p (size %ld)\n", ptr, diff --git a/Qt/Core.pro b/Qt/Core.pro index 6c2cada922..d3fadba4bc 100755 --- a/Qt/Core.pro +++ b/Qt/Core.pro @@ -136,6 +136,8 @@ SOURCES += ../Core/CPU.cpp \ # Core ../GPU/GLES/TransformPipeline.cpp \ ../GPU/GLES/VertexDecoder.cpp \ ../GPU/GLES/VertexShaderGenerator.cpp \ + ../GPU/GeDisasm.cpp \ + ../GPU/GPUCommon.cpp \ ../GPU/GPUState.cpp \ ../GPU/Math3D.cpp \ ../GPU/Null/NullGpu.cpp \ # Kirk @@ -245,6 +247,8 @@ HEADERS += ../Core/CPU.h \ ../GPU/GLES/VertexDecoder.h \ ../GPU/GLES/VertexShaderGenerator.h \ ../GPU/GPUInterface.h \ + ../GPU/GeDisasm.h \ + ../GPU/GPUCommon.h \ ../GPU/GPUState.h \ ../GPU/Math3D.h \ ../GPU/Null/NullGpu.h \