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

Android can be treated as regular host - thanks SenderGhost!

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10798 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
klugier 2017-01-29 19:51:39 +00:00
parent 69a5026b55
commit 84d1260efc
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/ide/Android/AndroidSDK.cpp
View file

@ -11,7 +11,6 @@ String AndroidSDK::GetDownloadUrl()
AndroidSDK::AndroidSDK()
{
}
AndroidSDK::AndroidSDK(const String& path, bool deduceValues)
@ -23,7 +22,6 @@ AndroidSDK::AndroidSDK(const String& path, bool deduceValues)
AndroidSDK::~AndroidSDK()
{
}
void AndroidSDK::DeducePathReleatedValues()

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

@ -313,8 +313,8 @@ bool AndroidBuilder::Preprocess(
void AndroidBuilder::AddFlags(Index<String>& cfg)
{
cfg.Add("LINUX");
cfg.Add("POSIX");
cfg.Add("LINUX");
cfg.Add("ANDROID");
}

14
uppsrc/ide/Core/Host.cpp
View file

@ -322,12 +322,16 @@ void LocalHost::AddFlags(Index<String>& cfg)
cfg.Add("WIN32");
#endif
#ifdef PLATFORM_POSIX
cfg.Add("POSIX");
#endif
#ifdef PLATFORM_LINUX
cfg.Add("LINUX");
#endif
#ifdef PLATFORM_POSIX
cfg.Add("POSIX");
#ifdef PLATFORM_ANDROID
cfg.Add("ANDROID");
#endif
#ifdef PLATFORM_BSD
@ -362,15 +366,15 @@ void LocalHost::AddFlags(Index<String>& cfg)
bool LocalHost::HasPlatformFlag(const Index<String>& cfg)
{
static const Index<String> platformFlags = {
"ANDROID", "WIN32", "LINUX", "POSIX",
"WIN32", "POSIX", "LINUX", "ANDROID",
"BSD", "FREEBSD", "OPENBSD", "NETBSD",
"DRAGONFLY", "SOLARIS", "OSX11"
};
for(const String& flag : cfg)
if(platformFlags.Find(flag) >= 0)
return true;
return false;
}