github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-08 02:54:56 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.AndroidBuilder support .cc files extension and ndkbuild command is append in real time to ide console.

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10715 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2017-01-15 21:53:49 +00:00
parent 46aa17f928
commit c3dc8f88ca
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/ide/Builders/AndroidBuilder.cpp
View file

@ -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) + ".");

4
uppsrc/ide/Builders/AndroidBuilderUtils.cpp
View file

@ -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)