From 105c30027793717ce743f8d9c50508e1e78e7ca3 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 20 Dec 2018 09:52:04 +0000 Subject: [PATCH] umk: Fixed to compile git-svn-id: svn://ultimatepp.org/upp/trunk@12626 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Draw/DrawTextUtil.cpp | 2 +- uppsrc/ide/Builders/Builders.upp | 4 +++- uppsrc/ide/Builders/Cocoa.cpp | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/uppsrc/Draw/DrawTextUtil.cpp b/uppsrc/Draw/DrawTextUtil.cpp index fd37c649f..b761ca585 100644 --- a/uppsrc/Draw/DrawTextUtil.cpp +++ b/uppsrc/Draw/DrawTextUtil.cpp @@ -102,7 +102,7 @@ void DrawTLText(Draw& draw, int x, int y, int cx, const wchar *text, bool ak = false; start = q; while(q < s && *q >= ' ') { - if(akey && ToUpper(ToAscii(*q)) == akey && (apos == 0 || q - start + 1 == apos)) { + if(akey && (int)ToUpper(ToAscii(*q)) == akey && (apos == 0 || q - start + 1 == apos)) { ak = true; akey = 0; break; diff --git a/uppsrc/ide/Builders/Builders.upp b/uppsrc/ide/Builders/Builders.upp index 098175bc1..1bfc3293d 100644 --- a/uppsrc/ide/Builders/Builders.upp +++ b/uppsrc/ide/Builders/Builders.upp @@ -6,7 +6,9 @@ uses ide\Core, ide/Android, ide/Java, - ide/Android; + ide/Android, + Draw, + plugin/png; file Builders.h options(BUILDER_OPTION) PCH, diff --git a/uppsrc/ide/Builders/Cocoa.cpp b/uppsrc/ide/Builders/Cocoa.cpp index 7225cdcc1..4f8419602 100644 --- a/uppsrc/ide/Builders/Cocoa.cpp +++ b/uppsrc/ide/Builders/Cocoa.cpp @@ -28,8 +28,6 @@ void GccBuilder::CocoaAppBundle() RealizeDir(icons); PutConsole("Exporting bundle icons to " + icons); - bool icons_dirty = false; - for(String fn : { "icon_16x16.png", "icon_16x16@2x.png",