mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed build.

This commit is contained in:
Branimir Karadžić 2017-06-29 22:30:35 -07:00
parent 917385f79e
commit 5df4969527
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/common/entry/entry_android.cpp
View File

@ -86,7 +86,7 @@ namespace entry
struct MainThreadEntry
{
int m_argc;
char** m_argv;
const char* const* m_argv;
static int32_t threadFunc(void* _userData);
};
@ -119,9 +119,9 @@ namespace entry
, 0
);
const char* argv[1] = { "android.so" };
const char* const argv[1] = { "android.so" };
m_mte.m_argc = 1;
m_mte.m_argv = const_cast<char**>(argv);
m_mte.m_argv = argv;
while (0 == m_app->destroyRequested)
{

4
examples/common/entry/entry_asmjs.cpp
View File

@ -86,7 +86,7 @@ namespace entry
}
}
int32_t run(int _argc, char** _argv)
int32_t run(int _argc, const char* const* _argv)
{
emscripten_set_mousedown_callback("#canvas", this, true, mouseCb);
emscripten_set_mouseup_callback("#canvas", this, true, mouseCb);
@ -397,7 +397,7 @@ namespace entry
}
}
int main(int _argc, char** _argv)
int main(int _argc, const char* const* _argv)
{
using namespace entry;
return s_ctx.run(_argc, _argv);

12
examples/common/entry/entry_ios.mm
View File

@ -27,7 +27,7 @@ namespace entry
struct MainThreadEntry
{
int m_argc;
char** m_argv;
const char* const* m_argv;
static int32_t threadFunc(void* _userData);
};
@ -38,9 +38,9 @@ namespace entry
{
Context(uint32_t _width, uint32_t _height)
{
static const char* argv[1] = { "ios" };
const char* const argv[1] = { "ios" };
m_mte.m_argc = 1;
m_mte.m_argv = const_cast<char**>(argv);
m_mte.m_argv = argv;
m_eventQueue.postSizeEvent(s_defaultWindow, _width, _height);
@ -261,7 +261,7 @@ static void* m_device = NULL;
CGPoint touchLocation = [touch locationInView:self];
touchLocation.x *= self.contentScaleFactor;
touchLocation.y *= self.contentScaleFactor;
s_ctx->m_eventQueue.postMouseEvent(s_defaultWindow, touchLocation.x, touchLocation.y, 0, MouseButton::Left, false);
}
@ -283,7 +283,7 @@ static void* m_device = NULL;
CGPoint touchLocation = [touch locationInView:self];
touchLocation.x *= self.contentScaleFactor;
touchLocation.y *= self.contentScaleFactor;
s_ctx->m_eventQueue.postMouseEvent(s_defaultWindow, touchLocation.x, touchLocation.y, 0, MouseButton::Left, false);
}
@ -371,7 +371,7 @@ static void* m_device = NULL;
@end
int main(int _argc, char* _argv[])
int main(int _argc, const char* const* _argv)
{
NSAutoreleasePool* pool = [ [NSAutoreleasePool alloc] init];
int exitCode = UIApplicationMain(_argc, _argv, @"UIApplication", NSStringFromClass([AppDelegate class]) );

2
examples/common/entry/entry_noop.cpp
View File

@ -71,7 +71,7 @@ namespace entry
} // namespace entry
int main(int _argc, char** _argv)
int main(int _argc, const char* const* _argv)
{
entry::main(_argc, _argv);
}

6
examples/common/entry/entry_osx.mm
View File

@ -64,7 +64,7 @@ namespace entry
struct MainThreadEntry
{
int m_argc;
char** m_argv;
const char* const* m_argv;
static int32_t threadFunc(void* _userData)
{
@ -409,7 +409,7 @@ namespace entry
m_eventQueue.postSuspendEvent(s_defaultWindow, Suspend::DidSuspend);
}
int32_t run(int _argc, char** _argv)
int32_t run(int _argc, const char* const* _argv)
{
[NSApplication sharedApplication];
@ -767,7 +767,7 @@ namespace entry
@end
int main(int _argc, char** _argv)
int main(int _argc, const char* const* _argv)
{
using namespace entry;
return s_ctx.run(_argc, _argv);

6
examples/common/entry/entry_windows.cpp
View File

@ -311,7 +311,7 @@ namespace entry
struct MainThreadEntry
{
int m_argc;
char** m_argv;
const char* const* m_argv;
static int32_t threadFunc(void* _userData);
};
@ -445,7 +445,7 @@ namespace entry
s_translateKey[uint8_t('Z')] = Key::KeyZ;
}
int32_t run(int _argc, char** _argv)
int32_t run(int _argc, const char* const* _argv)
{
SetDllDirectoryA(".");
@ -1095,7 +1095,7 @@ namespace entry
} // namespace entry
int main(int _argc, char** _argv)
int main(int _argc, const char* const* _argv)
{
using namespace entry;
return s_ctx.run(_argc, _argv);

2
examples/common/entry/entry_winrt.cx
View File

@ -24,7 +24,7 @@ using namespace Windows::Graphics::Display;
#endif // BX_PLATFORM_WINRT
using namespace Platform;
static char* g_emptyArgs[] = { "" };
static const char* const g_emptyArgs[] = { "" };
static entry::WindowHandle g_defaultWindow = { 0 };
static entry::EventQueue g_eventQueue;