Core on Android compiles one more time - improvments in Android builder, code refactoring

git-svn-id: svn://ultimatepp.org/upp/trunk@10567 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2016-12-24 14:18:27 +00:00
parent aae3c4a238
commit 61606fd866
11 changed files with 320 additions and 170 deletions

View file

@ -2,29 +2,33 @@
namespace Upp {
void AndroidMakeFile::AppendString(String& makeFile,
const String& variable,
const String& variableName)
void AndroidMakeFile::AppendString(
String& makeFile,
const String& variable,
const String& variableName)
{
if(!variable.IsEmpty())
makeFile << variableName << " := " << variable << "\n";
}
void AndroidMakeFile::AppendStringVector(String& makeFile,
const Vector<String>& vec,
const String& variableName,
const String& variablePrefix,
const String& variableSuffix)
void AndroidMakeFile::AppendStringVector(
String& makeFile,
const Vector<String>& vec,
const String& variableName,
const String& variablePrefix,
const String& variableSuffix)
{
if(!vec.IsEmpty()) {
makeFile << variableName << " := ";
for(int i = 0; i < vec.GetCount(); i++) {
makeFile << variablePrefix << vec[i] << variableSuffix;
if(i + 1 < vec.GetCount())
makeFile << " ";
}
makeFile << "\n";
if(vec.IsEmpty()) {
return;
}
makeFile << variableName << " := ";
for(int i = 0; i < vec.GetCount(); ++i) {
makeFile << variablePrefix << vec[i] << variableSuffix;
if(i + 1 < vec.GetCount())
makeFile << " ";
}
makeFile << "\n";
}
AndroidMakeFile::AndroidMakeFile()