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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

25
uppsrc/ide/Methods.cpp
View file

@ -81,38 +81,38 @@ AndroidBuilderSetup::AndroidBuilderSetup()
{
CtrlLayout(*this);
sdk_path <<= THISBACK(OnSdkPathChange);
sdk_path << [=] { OnSdkPathChange(); };
sdkDownload.SetImage(IdeImg::DownloadBlack());
sdkDownload.Tip("Download");
sdkDownload <<= callback1(LaunchWebBrowser, AndroidSDK::GetDownloadUrl());
sdkDownload << [=] { LaunchWebBrowser(AndroidSDK::GetDownloadUrl()); };
sdk_path.AddFrame(sdkDownload);
sdkBrowse.SetImage(CtrlImg::right_arrow());
sdkBrowse.Tip("Select directory");
sdkBrowse <<= THISBACK(OnSdkPathInsert);
sdkBrowse << [=]{ OnSdkPathInsert(); };
sdk_path.AddFrame(sdkBrowse);
ndk_path <<= THISBACK(OnNdkPathChange);
ndk_path << [=] { OnNdkPathChange(); };
ndkDownload.SetImage(IdeImg::DownloadBlack());
ndkDownload.Tip("Download");
ndkDownload <<= callback1(LaunchWebBrowser, AndroidNDK::GetDownloadUrl());
ndkDownload << [=] { LaunchWebBrowser(AndroidNDK::GetDownloadUrl()); };
ndk_path.AddFrame(ndkDownload);
ndkBrowse.SetImage(CtrlImg::right_arrow());
ndkBrowse.Tip("Select directory");
ndkBrowse <<= THISBACK(OnNdkPathInsert);
ndkBrowse << [=] { OnNdkPathInsert(); };
ndk_path.AddFrame(ndkBrowse);
jdkDownload.SetImage(IdeImg::DownloadBlack());
jdkDownload.Tip("Download");
jdkDownload <<= callback1(LaunchWebBrowser, Jdk::GetDownloadUrl());
jdkDownload << [=] { LaunchWebBrowser(Jdk::GetDownloadUrl()); };
jdk_path.AddFrame(jdkDownload);
jdkBrowse.SetImage(CtrlImg::right_arrow());
jdkBrowse.Tip("Select directory");
jdkBrowse <<= callback1(InsertPath, &jdk_path);
jdkBrowse << [=] { InsertPath(&jdk_path); };
jdk_path.AddFrame(jdkBrowse);
}
@ -256,7 +256,7 @@ void AndroidBuilderSetup::OnNdkPathChange0(const String& ndkPath)
ndk_arch_armeabi.Set(1);
ndk_arch_armeabi_v7a.Set(1);
ndk_arch_arm64_v8a.Set(1);
ndk_common_cpp_options.SetData("-std=c++11 -fexceptions -frtti");
ndk_common_cpp_options.SetData("-std=c++14 -fexceptions -frtti");
}
else
ClearNdkCtrls();
@ -297,9 +297,10 @@ void AndroidBuilderSetup::LoadCppRuntimes(const AndroidNDK& ndk)
LoadDropList(ndk_cpp_runtime, runtimes, ndk.FindDefaultCppRuntime());
}
void AndroidBuilderSetup::LoadDropList(DropList& dropList,
const Vector<String>& values,
const String& defaultKey)
void AndroidBuilderSetup::LoadDropList(
DropList& dropList,
const Vector<String>& values,
const String& defaultKey)
{
dropList.Clear();