From 7b86b84b0a71f84dbbe7c05fa7638ee0e3761fe9 Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 22 Dec 2020 22:18:08 +0000 Subject: [PATCH] uppsrc: Fixed to compile in MacOS git-svn-id: svn://ultimatepp.org/upp/trunk@15618 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/Builders/Build.cpp | 2 +- uppsrc/ide/Builders/Cocoa.cpp | 2 +- uppsrc/ide/idewin.cpp | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/uppsrc/ide/Builders/Build.cpp b/uppsrc/ide/Builders/Build.cpp index a68c601ed..615a65843 100644 --- a/uppsrc/ide/Builders/Build.cpp +++ b/uppsrc/ide/Builders/Build.cpp @@ -297,7 +297,7 @@ bool MakeBuild::BuildPackage(const Workspace& wspc, int pkindex, int pknumber, i #ifdef PLATFORM_COCOA if(m.target_override && !IsNull(m.target) && IsFolder(m.target) && GetFileExt(m.target) == ".app") - target = host->NormalizePath(m.target); + target = NormalizePath(m.target); else #endif if(m.target_override && !IsNull(m.target) && IsFolder(m.target)) diff --git a/uppsrc/ide/Builders/Cocoa.cpp b/uppsrc/ide/Builders/Cocoa.cpp index 6e61faad9..72fc190ac 100644 --- a/uppsrc/ide/Builders/Cocoa.cpp +++ b/uppsrc/ide/Builders/Cocoa.cpp @@ -28,7 +28,7 @@ void GccBuilder::CocoaAppBundle() } if(imgs.GetCount() && convert_icons) { String icons = AppendFileName(outdir, "icons.iconset"); - RealizeDir(icons); + RealizeDirectory(icons); PutConsole("Exporting bundle icons to " + icons); for(String fn : { diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp index 1a9f33106..b3ef0df98 100644 --- a/uppsrc/ide/idewin.cpp +++ b/uppsrc/ide/idewin.cpp @@ -627,7 +627,9 @@ Ide::Ide() #ifdef PLATFORM_COCOA WhenDockMenu = [=](Bar& bar) { bar.Add("Open main package..", [=] { - CreateHost(false, false)->Launch(GetExeFilePath() + " --nosplash"); + Host h; + CreateHost(h, false, false); + h.Launch(GetExeFilePath() + " --nosplash"); }); }; #endif