From cf6632c0f1874623aaeab0c95381076ab22f5127 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Fri, 11 Feb 2011 21:47:18 +0000 Subject: [PATCH] Fix SCons build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7137 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 3 --- Source/Core/DolphinWX/Src/BreakpointView.cpp | 2 +- Source/Core/DolphinWX/Src/CodeWindow.cpp | 2 +- Source/Core/DolphinWX/Src/CodeWindowFunctions.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 6 +++--- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/SConstruct b/SConstruct index b39277f640..39f862a00e 100644 --- a/SConstruct +++ b/SConstruct @@ -338,13 +338,10 @@ dirs = [ 'Source/Core/AudioCommon/Src', 'Source/Core/Common/Src', 'Source/Core/Core/Src', - 'Source/Core/DebuggerUICommon/Src', - 'Source/Core/DebuggerWX/Src', 'Source/Core/DiscIO/Src', 'Source/Core/DolphinWX/Src', 'Source/Core/InputCommon/Src', 'Source/Core/VideoCommon/Src', - 'Source/Core/VideoUICommon/Src', 'Source/DSPTool/Src', 'Source/Plugins/Plugin_VideoOGL/Src', 'Source/Plugins/Plugin_VideoSoftware/Src', diff --git a/Source/Core/DolphinWX/Src/BreakpointView.cpp b/Source/Core/DolphinWX/Src/BreakpointView.cpp index 5c0b9735da..8d5fa6beab 100644 --- a/Source/Core/DolphinWX/Src/BreakpointView.cpp +++ b/Source/Core/DolphinWX/Src/BreakpointView.cpp @@ -29,7 +29,7 @@ extern "C" { #include "../resources/toolbar_add_breakpoint.c" #include "../resources/toolbar_add_memorycheck.c" -#include "../resources/toolbar_delete.c" +#include "../resources/toolbar_debugger_delete.c" } diff --git a/Source/Core/DolphinWX/Src/CodeWindow.cpp b/Source/Core/DolphinWX/Src/CodeWindow.cpp index 28b80e8a62..4568c5d70d 100644 --- a/Source/Core/DolphinWX/Src/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Src/CodeWindow.cpp @@ -62,7 +62,7 @@ extern "C" // Bitmaps #include "../resources/toolbar_play.c" #include "../resources/toolbar_pause.c" #include "../resources/toolbar_add_memorycheck.c" - #include "../resources/toolbar_delete.c" + #include "../resources/toolbar_debugger_delete.c" #include "../resources/toolbar_add_breakpoint.c" } diff --git a/Source/Core/DolphinWX/Src/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/CodeWindowFunctions.cpp index 1cbca44a06..bca5714799 100644 --- a/Source/Core/DolphinWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Src/CodeWindowFunctions.cpp @@ -67,7 +67,7 @@ extern "C" // Bitmaps #include "../resources/toolbar_play.c" #include "../resources/toolbar_pause.c" #include "../resources/toolbar_add_memorycheck.c" - #include "../resources/toolbar_delete.c" + #include "../resources/toolbar_debugger_delete.c" #include "../resources/toolbar_add_breakpoint.c" } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index ef50045de6..214d30d476 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -1214,9 +1214,9 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons { s_criticalScreenshot.Enter(); char movie_file_name[255]; - int w = dst_rect.GetWidth(); - int h = dst_rect.GetHeight(); - u8 *data = new u8[3 * w * h]; + w = dst_rect.GetWidth(); + h = dst_rect.GetHeight(); + data = new u8[3 * w * h]; glPixelStorei(GL_PACK_ALIGNMENT, 1); glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, data); if (GL_REPORT_ERROR() == GL_NO_ERROR)