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

Android Builder now includes u++ assemblies

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9597 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2016-03-13 19:08:08 +00:00
parent aa36ae7f1a
commit 8dc095c07c
5 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/ide/Builders/AndroidModuleMakeFile.cpp
View file

@ -21,6 +21,7 @@ void AndroidModuleMakeFile::Clear()
{
name.Clear();
sourceFiles.Clear();
includes.Clear();
cppFlags.Clear();
ldLibraries.Clear();
staticLibraries.Clear();
@ -34,6 +35,7 @@ String AndroidModuleMakeFile::ToString() const
makeFile << "include $(CLEAR_VARS)\n";
AppendName(makeFile);
AppendSourceFiles(makeFile);
AppendIncludes(makeFile);
AppendCppFlags(makeFile);
AppendLdLibraries(makeFile);
AppendStaticLibraries(makeFile);
@ -49,6 +51,11 @@ void AndroidModuleMakeFile::AddSourceFile(const String& path)
sourceFiles.Add(path);
}
void AndroidModuleMakeFile::AddInclude(const String& includePath)
{
includes.Add(includePath);
}
void AndroidModuleMakeFile::AddCppFlag(const String& name, const String& value)
{
cppFlags.Add(name, value);
@ -84,6 +91,11 @@ void AndroidModuleMakeFile::AppendSourceFiles(String& makeFile) const
AndroidMakeFile::AppendStringVector(makeFile, sourceFiles, "LOCAL_SRC_FILES");
}
void AndroidModuleMakeFile::AppendIncludes(String& makeFile) const
{
AndroidMakeFile::AppendStringVector(makeFile, includes, "LOCAL_C_INCLUDES");
}
void AndroidModuleMakeFile::AppendCppFlags(String& makeFile) const
{
if(!cppFlags.IsEmpty()) {