From 98b5c0bd7dbf5d401ce07c5498bb247f7e5ecef7 Mon Sep 17 00:00:00 2001 From: mattias Date: Thu, 17 Dec 2015 11:47:18 +0000 Subject: [PATCH] IDE: setup dialog: search fpc in lazarus/fpc/fpcversion/bin/cpu-os/ git-svn-id: branches/fixes_1_6@50858 - --- ide/initialsetupproc.pas | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ide/initialsetupproc.pas b/ide/initialsetupproc.pas index c820f78dd5..03e89e241a 100644 --- a/ide/initialsetupproc.pas +++ b/ide/initialsetupproc.pas @@ -482,8 +482,12 @@ begin // check paths with versions ShortCompFile:='fpc'+ExeExt; + // check $(LazarusDir)\fpc\3.0.0\bin\i386-win32\fpc.exe + if CheckFile(SetDirSeparators('$(LazarusDir)/fpc/'+GetCompiledFPCVersion+'/bin/'+GetCompiledTargetCPU+'-'+GetCompiledTargetOS+'/')+ShortCompFile,Result) + then exit; + // check $(LazarusDir)\fpc\bin\i386-win32\fpc.exe - if CheckFile(SetDirSeparators('$(LazarusDir)/fpc/bin/$(TargetCPU)-$(TargetOS)/')+ShortCompFile,Result) + if CheckFile(SetDirSeparators('$(LazarusDir)/fpc/bin/'+GetCompiledTargetCPU+'-'+GetCompiledTargetOS+'/')+ShortCompFile,Result) then exit; // check common directories