github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-16 06:05:58 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Clang and clang standard library is now default for all Android builds, c++14 enable by default for Android and minor improvments in code.

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10568 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2016-12-24 19:04:32 +00:00
parent 61606fd866
commit df056c5e9f
8 changed files with 146 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

24
uppsrc/ide/Builders/AndroidModuleMakeFileBuilder.cpp
View file

@ -9,8 +9,8 @@ AndroidModuleMakeFileCreator::AndroidModuleMakeFileCreator(const Index<String>&
void AndroidModuleMakeFileCreator::AddSources(Vector<String>& sources)
{
for(int i = 0; i < sources.GetCount(); ++i) {
makeFile.AddSourceFile(sources[i]);
for(const String& source : sources) {
makeFile.AddSourceFile(source);
}
}
@ -43,38 +43,38 @@ void AndroidModuleMakeFileCreator::AddIncludeWithSubdirs(const String& path)
void AndroidModuleMakeFileCreator::AddIncludes(const Array<OptItem>& uses)
{
for(int i = 0; i < uses.GetCount(); ++i) {
makeFile.AddInclude(AndroidBuilderUtils::GetAssemblyDir(uses[i].text));
for(const OptItem& use : uses) {
makeFile.AddInclude(AndroidBuilderUtils::GetAssemblyDir(use.text));
}
}
void AndroidModuleMakeFileCreator::AddFlags(const Array<OptItem>& flags)
{
for(int i = 0; i < flags.GetCount(); ++i) {
makeFile.AddCppFlag(flags[i].text);
for(const OptItem& flag : flags) {
makeFile.AddCppFlag(flag.text);
}
}
void AndroidModuleMakeFileCreator::AddLdLibraries(const Array<OptItem>& libraries)
{
Vector<String> libs = Split(Gather(libraries, config.GetKeys()), ' ');
for(int i = 0; i < libs.GetCount(); ++i) {
makeFile.AddLdLibrary(libs[i]);
for(const String& lib : libs) {
makeFile.AddLdLibrary(lib);
}
}
void AndroidModuleMakeFileCreator::AddStaticModuleLibrary(Array<OptItem>& staticLibraries)
{
Vector<String> slibs = Split(Gather(staticLibraries, config.GetKeys()), ' ');
for(int i = 0; i < slibs.GetCount(); ++i) {
makeFile.AddStaticModuleLibrary(slibs[i]);
for(const String& slib : slibs) {
makeFile.AddStaticModuleLibrary(slib);
}
}
void AndroidModuleMakeFileCreator::AddSharedLibraries(const Array<OptItem>& uses)
{
for(int i = 0; i < uses.GetCount(); i++) {
makeFile.AddSharedLibrary(uses[i].text);
for(const OptItem& use : uses) {
makeFile.AddSharedLibrary(use.text);
}
}