From fed55e99188ae189afa64cb409e5e49a095245a9 Mon Sep 17 00:00:00 2001 From: oblivion Date: Sun, 20 Sep 2020 21:26:51 +0000 Subject: [PATCH] Turtle: DroidFonts/FT_fontsyss packages are added as dependencies for (MSC & WIN32).configuration. git-svn-id: svn://ultimatepp.org/upp/trunk@15116 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Turtle/Event.cpp | 2 +- uppsrc/Turtle/Turtle.h | 4 ++-- uppsrc/Turtle/Turtle.upp | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/uppsrc/Turtle/Event.cpp b/uppsrc/Turtle/Event.cpp index e1ff4eb28..fd0cc91c0 100644 --- a/uppsrc/Turtle/Event.cpp +++ b/uppsrc/Turtle/Event.cpp @@ -142,7 +142,7 @@ bool TurtleServer::IsWaitingEvent() } catch(const CParser::Error& e) { - LLOG("IsWaitingEvent() -> Parser error. " << e); + LLOG("IsWaitingEvent() -> Parser error."); } } if(recieved_update_serial == serial_0) { diff --git a/uppsrc/Turtle/Turtle.h b/uppsrc/Turtle/Turtle.h index 58f3d73ee..839ef4601 100644 --- a/uppsrc/Turtle/Turtle.h +++ b/uppsrc/Turtle/Turtle.h @@ -83,8 +83,8 @@ public: SystemDraw sysdraw; }; - friend class TurtleServer::Draw; - friend class TurtleServer::ImageSysData; + friend struct TurtleServer::Draw; + friend struct TurtleServer::ImageSysData; public: enum Commands { diff --git a/uppsrc/Turtle/Turtle.upp b/uppsrc/Turtle/Turtle.upp index cbc88fc55..71b36ed78 100644 --- a/uppsrc/Turtle/Turtle.upp +++ b/uppsrc/Turtle/Turtle.upp @@ -4,6 +4,8 @@ uses CtrlLib, VirtualGui; +uses(WIN32 & MSC) plugin/DroidFonts; + file Turtle.h, Init.cpp,