From c3dc8f88ca20f58099139b6c19f427319e48c040 Mon Sep 17 00:00:00 2001 From: klugier Date: Sun, 15 Jan 2017 21:53:49 +0000 Subject: [PATCH] .AndroidBuilder support .cc files extension and ndkbuild command is append in real time to ide console. git-svn-id: svn://ultimatepp.org/upp/trunk@10715 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/Builders/AndroidBuilder.cpp | 5 ++--- uppsrc/ide/Builders/AndroidBuilderUtils.cpp | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/uppsrc/ide/Builders/AndroidBuilder.cpp b/uppsrc/ide/Builders/AndroidBuilder.cpp index 9a455ce90..5999f19d8 100644 --- a/uppsrc/ide/Builders/AndroidBuilder.cpp +++ b/uppsrc/ide/Builders/AndroidBuilder.cpp @@ -149,7 +149,7 @@ bool AndroidBuilder::BuildPackage( } if(isResourcesPackage || nativeSources.IsEmpty()) { - LOG(INFO_METHOD_NAME + "There is not native files in following package " + package + "."); + LOG(INFO_METHOD_NAME + "There are not native files in following package " + package + "."); return true; } @@ -246,8 +246,7 @@ bool AndroidBuilder::Link( NDKBuild ndkBuild(ndk.GetNdkBuildPath()); ndkBuild.SetWorkingDir(project->GetDir()); ndkBuild.SetJobs(GetHydraThreads()); - if(Execute(ndkBuild.MakeCmd(), ss) != 0 ) { - PutConsole(ss.GetResult()); + if(host->Execute(ndkBuild.MakeCmd()) != 0 ) { return false; } PutConsole("Native sources compiled in " + GetPrintTime(time) + "."); diff --git a/uppsrc/ide/Builders/AndroidBuilderUtils.cpp b/uppsrc/ide/Builders/AndroidBuilderUtils.cpp index cf696c616..ccd60d6cc 100644 --- a/uppsrc/ide/Builders/AndroidBuilderUtils.cpp +++ b/uppsrc/ide/Builders/AndroidBuilderUtils.cpp @@ -41,12 +41,12 @@ bool AndroidBuilderUtils::IsCFile(const String& path) bool AndroidBuilderUtils::IsCppFile(const String& path) { - return HasExt(path, { "icpp", "cpp", "cxx" }); + return HasExt(path, { "icpp", "cpp", "cc", "cxx" }); } bool AndroidBuilderUtils::IsCppOrCFile(const String& path) { - return HasExt(path, { "c", "icpp", "cpp", "cxx" }); + return HasExt(path, { "c", "icpp", "cpp", "cc", "cxx" }); } bool AndroidBuilderUtils::IsXmlFile(const String& path)