ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SCons build. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7137 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-02-11 21:47:18 +00:00
parent efd22d234f
commit cf6632c0f1
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SConstruct
View File

@ -338,13 +338,10 @@ dirs = [
'Source/Core/AudioCommon/Src', 'Source/Core/AudioCommon/Src',
'Source/Core/Common/Src', 'Source/Core/Common/Src',
'Source/Core/Core/Src', 'Source/Core/Core/Src',
'Source/Core/DebuggerUICommon/Src',
'Source/Core/DebuggerWX/Src',
'Source/Core/DiscIO/Src', 'Source/Core/DiscIO/Src',
'Source/Core/DolphinWX/Src', 'Source/Core/DolphinWX/Src',
'Source/Core/InputCommon/Src', 'Source/Core/InputCommon/Src',
'Source/Core/VideoCommon/Src', 'Source/Core/VideoCommon/Src',
'Source/Core/VideoUICommon/Src',
'Source/DSPTool/Src', 'Source/DSPTool/Src',
'Source/Plugins/Plugin_VideoOGL/Src', 'Source/Plugins/Plugin_VideoOGL/Src',
'Source/Plugins/Plugin_VideoSoftware/Src', 'Source/Plugins/Plugin_VideoSoftware/Src',

2
Source/Core/DolphinWX/Src/BreakpointView.cpp
View File

@ -29,7 +29,7 @@
extern "C" { extern "C" {
#include "../resources/toolbar_add_breakpoint.c" #include "../resources/toolbar_add_breakpoint.c"
#include "../resources/toolbar_add_memorycheck.c" #include "../resources/toolbar_add_memorycheck.c"
#include "../resources/toolbar_delete.c" #include "../resources/toolbar_debugger_delete.c"
} }

2
Source/Core/DolphinWX/Src/CodeWindow.cpp
View File

@ -62,7 +62,7 @@ extern "C" // Bitmaps
#include "../resources/toolbar_play.c" #include "../resources/toolbar_play.c"
#include "../resources/toolbar_pause.c" #include "../resources/toolbar_pause.c"
#include "../resources/toolbar_add_memorycheck.c" #include "../resources/toolbar_add_memorycheck.c"
#include "../resources/toolbar_delete.c" #include "../resources/toolbar_debugger_delete.c"
#include "../resources/toolbar_add_breakpoint.c" #include "../resources/toolbar_add_breakpoint.c"
} }

2
Source/Core/DolphinWX/Src/CodeWindowFunctions.cpp
View File

@ -67,7 +67,7 @@ extern "C" // Bitmaps
#include "../resources/toolbar_play.c" #include "../resources/toolbar_play.c"
#include "../resources/toolbar_pause.c" #include "../resources/toolbar_pause.c"
#include "../resources/toolbar_add_memorycheck.c" #include "../resources/toolbar_add_memorycheck.c"
#include "../resources/toolbar_delete.c" #include "../resources/toolbar_debugger_delete.c"
#include "../resources/toolbar_add_breakpoint.c" #include "../resources/toolbar_add_breakpoint.c"
} }

6
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -1214,9 +1214,9 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
{ {
s_criticalScreenshot.Enter(); s_criticalScreenshot.Enter();
char movie_file_name[255]; char movie_file_name[255];
int w = dst_rect.GetWidth(); w = dst_rect.GetWidth();
int h = dst_rect.GetHeight(); h = dst_rect.GetHeight();
u8 *data = new u8[3 * w * h]; data = new u8[3 * w * h];
glPixelStorei(GL_PACK_ALIGNMENT, 1); glPixelStorei(GL_PACK_ALIGNMENT, 1);
glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, data); glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, data);
if (GL_REPORT_ERROR() == GL_NO_ERROR) if (GL_REPORT_ERROR() == GL_NO_ERROR)