Merge pull request #286 from xsacha/master

Update Qt/Symbian
This commit is contained in:
Henrik Rydgård committed 2012-12-29 08:19:28 -08:00
commit 1d9f27f3e3
2 files changed
+9 -1

No files matched your search

+5 -1
View File
@@ -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,
+4
View File
@@ -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 \