Merge branch 'master' of github.com:bkaradzic/bgfx

This commit is contained in:
Branimir Karadžić 2014-03-16 16:52:24 -07:00
commit 9a20f4ff31
2 changed files with 41 additions and 1 deletions

View file

@ -0,0 +1,40 @@
/*
* Copyright 2011-2014 Branimir Karadzic. All rights reserved.
* License: http://www.opensource.org/licenses/BSD-2-Clause
*/
#include "entry_p.h"
#if BX_PLATFORM_EMSCRIPTEN
#include <emscripten.h>
namespace entry
{
const Event* poll()
{
}
void release(const Event* /*_event*/)
{
}
void setWindowSize(uint32_t /*_width*/, uint32_t /*_height*/)
{
}
void toggleWindowFrame()
{
}
void setMouseLock(bool /*_lock*/)
{
}
}
int main(int _argc, char** _argv)
{
return entry::main(_argc, _argv);
}
#endif // BX_PLATFORM_EMSCRIPTEN

View file

@ -2685,6 +2685,7 @@ namespace bgfx
bx::Semaphore m_renderSem; bx::Semaphore m_renderSem;
bx::Semaphore m_gameSem; bx::Semaphore m_gameSem;
bx::Thread m_thread;
#else #else
void gameSemPost() void gameSemPost()
{ {
@ -2703,7 +2704,6 @@ namespace bgfx
} }
#endif // BGFX_CONFIG_MULTITHREADED #endif // BGFX_CONFIG_MULTITHREADED
bx::Thread m_thread;
Frame m_frame[2]; Frame m_frame[2];
Frame* m_render; Frame* m_render;
Frame* m_submit; Frame* m_submit;