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

Merge branch 'master' of https://github.com/project64/project64

This commit is contained in:
zilmar 2016-04-22 06:30:51 +10:00
parent 02d7ac014e 4e2b618625
commit 699f70a0d5
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-core/N64System/Mips/SystemTiming.h
View File

@ -12,7 +12,7 @@
#include <Common/LogClass.h> #include <Common/LogClass.h>
#include <Project64-core/N64System/N64Types.h> #include <Project64-core/N64System/N64Types.h>
#include <Project64-core/3rdParty/Zip.h> #include <Project64-core/3rdParty/zip.h>
class CSystemTimer class CSystemTimer
{ {

4
Source/Project64-core/N64System/Recompiler/x86CodeLog.h
View File

@ -10,6 +10,10 @@
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
/* vsprintf() needs to have both of these included. */
#include <stdio.h>
#include <stdarg.h>
#define CPU_Message(Message,... ) if (bX86Logging) { x86_Log_Message(Message,## __VA_ARGS__); } #define CPU_Message(Message,... ) if (bX86Logging) { x86_Log_Message(Message,## __VA_ARGS__); }
void x86_Log_Message (const char * Message, ...); void x86_Log_Message (const char * Message, ...);

12
Source/Project64-core/Plugins/GFXPlugin.cpp
View File

@ -173,13 +173,17 @@ bool CGfxPlugin::Initiate(CN64System * System, RenderWindow * Window)
GFX_INFO Info = { 0 }; GFX_INFO Info = { 0 };
Info.MemoryBswaped = true; Info.MemoryBswaped = true;
#ifdef _WIN32 #if defined(ANDROID) || defined(__ANDROID__)
Info.hWnd = Window ? Window->GetWindowHandle() : NULL;
Info.hStatusBar = Window ? Window->GetStatusBar() : NULL;
#else
Info.SwapBuffers = SwapBuffers; Info.SwapBuffers = SwapBuffers;
#endif
Info.hWnd = NULL; Info.hWnd = NULL;
Info.hStatusBar = NULL; Info.hStatusBar = NULL;
#ifdef _WIN32
if (Window != NULL)
{
Info.hWnd = Window->GetWindowHandle();
Info.hStatusBar = Window->GetStatusBar();
}
#endif #endif
Info.CheckInterrupts = DummyCheckInterrupts; Info.CheckInterrupts = DummyCheckInterrupts;