summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/entry/entry_sdl.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-09-12 10:23:53 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-09-12 10:23:53 +0200
commit7ca8f88a5c399317265d9a2f5132eab2ab7723ac (patch)
treecf7af75fb307bd040508c4c2455d3bd6755619f4 /3rdparty/bgfx/examples/common/entry/entry_sdl.cpp
parent6d06509293e2fe6b1743085471f0ff5268a1b351 (diff)
Added latest BGFX (nw)
Diffstat (limited to '3rdparty/bgfx/examples/common/entry/entry_sdl.cpp')
-rw-r--r--3rdparty/bgfx/examples/common/entry/entry_sdl.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/3rdparty/bgfx/examples/common/entry/entry_sdl.cpp b/3rdparty/bgfx/examples/common/entry/entry_sdl.cpp
index 91bfef74865..b9094e8c3c3 100644
--- a/3rdparty/bgfx/examples/common/entry/entry_sdl.cpp
+++ b/3rdparty/bgfx/examples/common/entry/entry_sdl.cpp
@@ -320,7 +320,7 @@ namespace entry
initTranslateGamepadAxis(SDL_CONTROLLER_AXIS_TRIGGERRIGHT, GamepadAxis::RightZ);
}
- void run(int _argc, char** _argv)
+ int run(int _argc, char** _argv)
{
m_mte.m_argc = _argc;
m_mte.m_argv = _argv;
@@ -644,7 +644,7 @@ namespace entry
Msg* msg = (Msg*)uev.data2;
if (isValid(handle) )
{
- SDL_SetWindowTitle(m_window[handle.idx], msg->m_title.c_str());
+ SDL_SetWindowTitle(m_window[handle.idx], msg->m_title.c_str() );
}
delete msg;
}
@@ -710,6 +710,8 @@ namespace entry
SDL_DestroyWindow(m_window[0]);
SDL_Quit();
+
+ return m_thread.getExitCode();
}
WindowHandle findHandle(uint32_t _windowId)
@@ -896,8 +898,7 @@ namespace entry
int main(int _argc, char** _argv)
{
using namespace entry;
- s_ctx.run(_argc, _argv);
- return 0;
+ return s_ctx.run(_argc, _argv);
}
#endif // ENTRY_CONFIG_USE_SDL