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

ide: 'Disable UHD mode' run option

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12256 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-09-07 07:10:23 +00:00
parent 68a4f69269
commit ea02579b4d
11 changed files with 31 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/ide/Debug.cpp
View file

@ -36,6 +36,7 @@ void Ide::RunArgs() {
dlg.consolemode = consolemode;
dlg.utf8 <<= console_utf8;
dlg.runmode <<= dlg.Breaker(222);
dlg.disable_uhd <<= disable_uhd;
for(;;) {
bool b = ~dlg.runmode == RUN_FILE;
@ -53,6 +54,7 @@ void Ide::RunArgs() {
consolemode = dlg.consolemode;
console_utf8 = ~dlg.utf8;
stdout_file = ~dlg.stdout_file;
disable_uhd = ~dlg.disable_uhd;
dlg.arg.AddHistory();
{
StringStream ss;
@ -74,7 +76,7 @@ void Ide::RunArgs() {
One<Host> Ide::CreateHostRunDir()
{
One<Host> h = CreateHost(false);
One<Host> h = CreateHost(false, disable_uhd);
if(IsNull(rundir))
h->ChDir(GetFileFolder(target));
else
@ -212,7 +214,7 @@ void Ide::ExecuteApk()
if(!select.GetDeviceCount())
return;
One<Host> host = CreateHost(false);
One<Host> host = CreateHost(false, disable_uhd);
Apk apk(target, sdk);
String packageName = apk.FindPackageName();
String activityName = apk.FindLaunchableActivity();
@ -401,7 +403,7 @@ void Ide::ConditionalBreak()
brk = "1";
Index<String> cfg = PackageConfig(IdeWorkspace(), 0, GetMethodVars(method), mainconfigparam,
*CreateHost(true), *CreateBuilder(~CreateHostRunDir()));
*CreateHost(true, disable_uhd), *CreateBuilder(~CreateHostRunDir()));
#ifdef PLATFORM_WIN32
if(cfg.Find("MSC") >= 0) {
if(EditPDBExpression("Conditional breakpoint", brk, NULL))