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