diff --git a/ide/lazarusmanager.pas b/ide/lazarusmanager.pas index 87b8e1534a..7d735a83ce 100644 --- a/ide/lazarusmanager.pas +++ b/ide/lazarusmanager.pas @@ -370,17 +370,21 @@ begin {$IFDEF darwin} if FileExistsUTF8(FLazarusPath+'.app') then begin // start the bundle instead + {$IFDEF LCLCocoa} + FLazarusPath:= FLazarusPath+'.app/Contents/MacOS/'+ExtractFileName(FLazarusPath); + {$ELSE} FLazarusPath:= FLazarusPath+'.app';// /Contents/MacOS/'+ExtractFileName(FLazarusPath); + {$ENDIF} end; {$ENDIF} - DebugLn(['TLazarusManager.Run starting ',FLazarusPath,' ...']); + DebugLn(['Info: (startlazarus) [TLazarusManager.Run] starting ',FLazarusPath,' ...']); EnvOverrides:=TStringList.Create; try {$IFDEF Linux} EnvOverrides.Values['LIBOVERLAY_SCROLLBAR']:='0'; {$ENDIF} - {$IFDEF darwin} + {$IFDEF LCLCarbon} FLazarusProcess := TLazarusProcess.Create('open', ' -a ' + FLazarusPath + ' --args ' + GetCommandLineParameters(FCmdLineParams, True)+' '+FCmdLineFiles, diff --git a/ide/startlazarus.res b/ide/startlazarus.res index 81e18b4a1c..7ca3bf528e 100644 Binary files a/ide/startlazarus.res and b/ide/startlazarus.res differ