From 6be288b67852215e7adccc91c777139af4150a6b Mon Sep 17 00:00:00 2001 From: Sacha Date: Wed, 20 Feb 2013 00:34:03 +1000 Subject: [PATCH] Add new file 'OpenGLBase' to Qt Windows build. Fixup previous mistake, missing 'new'. Update native. --- Qt/Core.pro | 5 +++++ Qt/debugger_displaylist.cpp | 2 +- native | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Qt/Core.pro b/Qt/Core.pro index d9f6260185..bd22ca070a 100755 --- a/Qt/Core.pro +++ b/Qt/Core.pro @@ -18,6 +18,11 @@ x86 { HEADERS += ../Core/MIPS/x86/*.h } +win32 { + SOURCES += ../Windows/OpenGLBase.cpp + HEADERS += ../Windows/OpenGLBase.h +} + SOURCES += ../Core/CPU.cpp \ # Core ../Core/Config.cpp \ ../Core/Core.cpp \ diff --git a/Qt/debugger_displaylist.cpp b/Qt/debugger_displaylist.cpp index 330dcbb9b8..ed63f5bc48 100644 --- a/Qt/debugger_displaylist.cpp +++ b/Qt/debugger_displaylist.cpp @@ -1686,7 +1686,7 @@ void Debugger_DisplayList::UpdateVertexInfo() VertexDecoder vtcDec; vtcDec.SetVertexType(state.vertType); - u8* tmp = u8(20*vtcDec.GetDecVtxFmt().stride); + u8* tmp = new u8(20*vtcDec.GetDecVtxFmt().stride); vtcDec.DecodeVerts(tmp,Memory::GetPointer(vaddr),0,0,0,0,19); VertexReader vtxRead(tmp,vtcDec.GetDecVtxFmt(),state.vertType); delete tmp; diff --git a/native b/native index 14386f87b0..f807e225f7 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 14386f87b044ff59bf509a35591debf89d917fb2 +Subproject commit f807e225f75b131e614c92770fb93a5e902be22b