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

#99, fix windows dmd detection

This commit is contained in:
Basile Burg 2016-11-11 19:52:19 +01:00
parent 401b735c4f
commit 3e0c085f7d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ce_compilers.pas
View File

@ -172,13 +172,13 @@ begin
fname := getCoeditDocPath + optFname; fname := getCoeditDocPath + optFname;
if fname.fileExists then if fname.fileExists then
fPaths.loadFromFile(fname) fPaths.loadFromFile(fname);
else if not isCompilerValid(dmd) then
begin
autoDetectDMD; autoDetectDMD;
if not isCompilerValid(gdc) then
autoDetectGDC; autoDetectGDC;
if not isCompilerValid(ldc) then
autoDetectLDC; autoDetectLDC;
end;
fPathsBackup.Assign(fPaths); fPathsBackup.Assign(fPaths);
dataToGui; dataToGui;
@ -664,31 +664,31 @@ var
begin begin
{$IFDEF WINDOWS} {$IFDEF WINDOWS}
path := exeFullName('dmd' + exeExt); path := exeFullName('dmd' + exeExt);
if path.dirExists then if path.fileExists then
begin begin
fPaths.DmdExeName:= path; fPaths.DmdExeName:= path;
path := path.extractFileDir.extractFileDir.extractFileDir; path := path.extractFileDir.extractFileDir.extractFileDir;
if (path + '\src\drunime\import').dirExists then if (path + '\src\druntime\import').dirExists then
fPaths.DmdRuntimePath := path + '\src\drunime\import'; fPaths.DmdRuntimePath := path + '\src\druntime\import';
if (path + '\src\phobos').dirExists then if (path + '\src\phobos').dirExists then
fPaths.DmdRuntimePath := path + '\src\phobos'; fPaths.DmdPhobosPath := path + '\src\phobos';
end; end;
{$ENDIF} {$ENDIF}
{$IFDEF LINUX} {$IFDEF LINUX}
if '/usr/bin/dmd'.fileExists then if '/usr/bin/dmd'.fileExists then
fPaths.DmdExeName:='/usr/bin/dmd'; fPaths.DmdExeName:='/usr/bin/dmd';
if '/usr/include/dmd/phobos'.dirExists then
fPaths.DmdPhobosPath:='/usr/include/dmd/phobos';
if '/usr/include/dmd/druntime/import'.dirExists then if '/usr/include/dmd/druntime/import'.dirExists then
fPaths.DmdRuntimePath:='/usr/include/dmd/druntime/import'; fPaths.DmdRuntimePath:='/usr/include/dmd/druntime/import';
if '/usr/include/dmd/phobos'.dirExists then
fPaths.DmdPhobosPath:='/usr/include/dmd/phobos';
{$ENDIF} {$ENDIF}
{$IFDEF DARWIN} {$IFDEF DARWIN}
if '/usr/local/bin/dmd'.fileExists then if '/usr/local/bin/dmd'.fileExists then
fPaths.DmdExeName:='/usr/local/bin/dmd'; fPaths.DmdExeName:='/usr/local/bin/dmd';
if '/Library/D/dmd/src/phobos'.dirExists then
fPaths.DmdPhobosPath:='/Library/D/dmd/src/phobos';
if '/Library/D/dmd/src/druntime/import' then if '/Library/D/dmd/src/druntime/import' then
fPaths.DmdRuntimePath:='/Library/D/dmd/src/druntime/import'; fPaths.DmdRuntimePath:='/Library/D/dmd/src/druntime/import';
if '/Library/D/dmd/src/phobos'.dirExists then
fPaths.DmdPhobosPath:='/Library/D/dmd/src/phobos';
{$ENDIF} {$ENDIF}
end; end;