forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#99, upstream fixes (runnable + CE proj with user1 & 2)

This commit is contained in:
Basile Burg 2016-11-14 20:09:17 +01:00
parent af7d5d6c34
commit c77da7e6e3
No known key found for this signature in database
GPG Key ID: 1868039F415CB8CF
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ce_ceproject.pas
View File

@ -1035,7 +1035,7 @@ var
begin begin
str := TStringList.Create; str := TStringList.Create;
try try
str.Add(CEProjectCompilerFilename.extractFileName); str.Add(CEProjectCompilerFilename);
getOpts(str); getOpts(str);
result := str.Text; result := str.Text;
finally finally

14
src/ce_dmdwrap.pas
View File

@ -1238,17 +1238,17 @@ var
i: integer; i: integer;
str: string; str: string;
baseopt: TOtherOpts; baseopt: TOtherOpts;
lst: TStringList; lst: TStringList = nil;
begin begin
if base.isNil then if base.isNil then
begin begin
// TODO-cCompilerPaths paths: add other options to CE proj format for the other comps // TODO-cCompilerPaths paths: add other options to CE proj format for the other comps
case compiler of case compiler of
dmd: lst := fDmdOthers; dmd: lst := fDmdOthers;
ldc: lst := fLdcOthers; ldc, ldmd: lst := fLdcOthers;
gdc: lst := fGdcOthers; gdc, gdmd: lst := fGdcOthers;
end; end;
for i := 0 to lst.Count-1 do if lst.isNotNil then for i := 0 to lst.Count-1 do
begin begin
str := lst[i]; str := lst[i];
if str.isEmpty or isStringDisabled(str) then if str.isEmpty or isStringDisabled(str) then
@ -1266,18 +1266,18 @@ begin
lst := baseopt.fDmdOthers lst := baseopt.fDmdOthers
else else
lst := fDmdOthers; lst := fDmdOthers;
ldc: ldc, ldmd:
if fLdcOthers.Count = 0 then if fLdcOthers.Count = 0 then
lst := baseopt.fLdcOthers lst := baseopt.fLdcOthers
else else
lst := fLdcOthers; lst := fLdcOthers;
gdc: gdc, gdmd:
if fGdcOthers.Count = 0 then if fGdcOthers.Count = 0 then
lst := baseopt.fGdcOthers lst := baseopt.fGdcOthers
else else
lst := fGdcOthers; lst := fGdcOthers;
end; end;
for i := 0 to lst.Count-1 do if lst.isNotNil then for i := 0 to lst.Count-1 do
begin begin
str := lst[i]; str := lst[i];
if str.isEmpty or isStringDisabled(str) then if str.isEmpty or isStringDisabled(str) then

4
src/ce_main.pas
View File

@ -2650,8 +2650,8 @@ begin
dmd: dmdProc.Executable := fCompilerSelector.getCompilerPath(dmd); dmd: dmdProc.Executable := fCompilerSelector.getCompilerPath(dmd);
gdc, gdmd: dmdProc.Executable := fCompilerSelector.getCompilerPath(gdmd); gdc, gdmd: dmdProc.Executable := fCompilerSelector.getCompilerPath(gdmd);
ldc, ldmd: dmdProc.Executable := fCompilerSelector.getCompilerPath(ldmd); ldc, ldmd: dmdProc.Executable := fCompilerSelector.getCompilerPath(ldmd);
user1: fCompilerSelector.getCompilerPath(user1); user1: dmdProc.Executable := fCompilerSelector.getCompilerPath(user1);
user2: fCompilerSelector.getCompilerPath(user2); user2: dmdProc.Executable := fCompilerSelector.getCompilerPath(user2);
end; end;
dmdproc.Parameters.Add(fDoc.fileName); dmdproc.Parameters.Add(fDoc.fileName);
if not asObj then if not asObj then