Merge branch 'master' of https://github.com/project64/project64
This commit is contained in:
commit
699f70a0d5
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include <Common/LogClass.h>
|
||||
#include <Project64-core/N64System/N64Types.h>
|
||||
#include <Project64-core/3rdParty/Zip.h>
|
||||
#include <Project64-core/3rdParty/zip.h>
|
||||
|
||||
class CSystemTimer
|
||||
{
|
||||
|
|
|
@ -10,6 +10,10 @@
|
|||
****************************************************************************/
|
||||
#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__); }
|
||||
|
||||
void x86_Log_Message (const char * Message, ...);
|
||||
|
|
|
@ -173,13 +173,17 @@ bool CGfxPlugin::Initiate(CN64System * System, RenderWindow * Window)
|
|||
GFX_INFO Info = { 0 };
|
||||
|
||||
Info.MemoryBswaped = true;
|
||||
#ifdef _WIN32
|
||||
Info.hWnd = Window ? Window->GetWindowHandle() : NULL;
|
||||
Info.hStatusBar = Window ? Window->GetStatusBar() : NULL;
|
||||
#else
|
||||
#if defined(ANDROID) || defined(__ANDROID__)
|
||||
Info.SwapBuffers = SwapBuffers;
|
||||
#endif
|
||||
Info.hWnd = NULL;
|
||||
Info.hStatusBar = NULL;
|
||||
#ifdef _WIN32
|
||||
if (Window != NULL)
|
||||
{
|
||||
Info.hWnd = Window->GetWindowHandle();
|
||||
Info.hStatusBar = Window->GetStatusBar();
|
||||
}
|
||||
#endif
|
||||
Info.CheckInterrupts = DummyCheckInterrupts;
|
||||
|
||||
|
|
Loading…
Reference in New Issue