Browse Source

Fix compilation on iOS (#1240)

attilaz 8 years ago
parent
commit
bc065cc4d0
2 changed files with 3 additions and 3 deletions
  1. 2 2
      examples/20-nanovg/blendish.h
  2. 1 1
      examples/common/entry/entry_ios.mm

+ 2 - 2
examples/20-nanovg/blendish.h

@@ -2229,10 +2229,10 @@ int bndIconLabelTextPosition(NVGcontext *ctx, float x, float y, float w, float h
         ctx, x, y, rows[row].start, rows[row].end + 1, glyphs, BND_MAX_GLYPHS);
     int col, p = 0;
     for (col = 0; col < nglyphs && glyphs[col].x < px; ++col)
-        p = glyphs[col].str - label;
+        p = (int)(glyphs[col].str - label);
     // see if we should move one character further
     if (col > 0 && col < nglyphs && glyphs[col].x - px < px - glyphs[col - 1].x)
-        p = glyphs[col].str - label;
+        p = (int)(glyphs[col].str - label);
     return p;
 }
 

+ 1 - 1
examples/common/entry/entry_ios.mm

@@ -374,7 +374,7 @@ static	void* m_device = NULL;
 int main(int _argc, const char* const* _argv)
 {
 	NSAutoreleasePool* pool = [ [NSAutoreleasePool alloc] init];
-	int exitCode = UIApplicationMain(_argc, _argv, @"UIApplication", NSStringFromClass([AppDelegate class]) );
+	int exitCode = UIApplicationMain(_argc, (char**)_argv, @"UIApplication", NSStringFromClass([AppDelegate class]) );
 	[pool release];
 	return exitCode;
 }