emscripten: Fix build

This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2015-07-29 06:22:59 +02:00
parent 289aa393c0
commit 0153145950
2 changed files with 23 additions and 7 deletions

View File

@ -66,8 +66,11 @@ u32 VertexCount=0;
u32 FrameCount=1;
Renderer* renderer;
#if !defined(TARGET_NO_THREADS)
cResetEvent rs(false,true);
cResetEvent re(false,true);
#endif
int max_idx,max_mvo,max_op,max_pt,max_tr,max_vtx,max_modt, ovrn;
@ -201,7 +204,7 @@ bool rend_single_frame()
//wait render start only if no frame pending
do
{
#if !defined(HOST_NO_THREADS)
#if !defined(TARGET_NO_THREADS)
rs.Wait();
#endif
_pvrrc = DequeueRender();
@ -305,7 +308,7 @@ void rend_start_render()
#endif
if (QueueRender(ctx)) {
palette_update();
#if !defined(HOST_NO_THREADS)
#if !defined(TARGET_NO_THREADS)
rs.Set();
#else
rend_single_frame();
@ -334,7 +337,7 @@ void rend_end_render()
#endif
if (pend_rend) {
#if !defined(HOST_NO_THREADS)
#if !defined(TARGET_NO_THREADS)
re.Wait();
#else
renderer->Present();
@ -369,7 +372,13 @@ bool rend_init()
#endif
#if !defined(_ANDROID) && HOST_OS != OS_DARWIN
#if !defined(TARGET_NO_THREADS)
rthd.Start();
#else
if (!renderer->Init()) die("rend->init() failed\n");
renderer->Resize(640, 480);
#endif
#endif
#if SET_AFNT

View File

@ -15,6 +15,9 @@
#include "hw/sh4/dyna/blockmanager.h"
#include <unistd.h>
#if defined(TARGET_EMSCRIPTEN)
#include <emscripten.h>
#endif
@ -417,6 +420,10 @@ void UpdateInputState(u32 port)
rt[port]=0;
lt[port]=0;
#if defined(TARGET_EMSCRIPTEN)
return;
#endif
#if defined(TARGET_GCW0) || defined(TARGET_PANDORA)
HandleJoystick(port);
HandleKb(port);
@ -835,9 +842,9 @@ int main(int argc, wchar* argv[])
dc_init(argc,argv);
#if !defined(TARGET_EMSCRIPTEN)
dc_run();
#else
dc_run();emscripten_set_main_loop(&dc_run, 100, false);
emscripten_set_main_loop(&dc_run, 100, false);
#endif
@ -858,7 +865,7 @@ void os_DebugBreak()
{
#if !defined(TARGET_EMSCRIPTEN)
raise(SIGTRAP);
#endif
#else
printf("DEBUGBREAK!\n");
exit(-1);
#endif