diff --git a/README.md b/README.md index 1a1c980c..279becd6 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,15 @@ CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chro CEF4Delphi is based on DCEF3 and fpCEF3. The original license of those projects still applies to CEF4Delphi. Read the license terms in the first lines of any *.pas file. -CEF4Delphi uses CEF 112.2.8 which includes Chromium 112.0.5615.49. +CEF4Delphi uses CEF 112.2.9 which includes Chromium 112.0.5615.87. The CEF binaries used by CEF4Delphi are available for download at Spotify : -* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.8%2Bg09ce0e7%2Bchromium-112.0.5615.49_windows32.tar.bz2) -* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.8%2Bg09ce0e7%2Bchromium-112.0.5615.49_windows64.tar.bz2) -* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.8%2Bg09ce0e7%2Bchromium-112.0.5615.49_linux64.tar.bz2) -* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.8%2Bg09ce0e7%2Bchromium-112.0.5615.49_linuxarm.tar.bz2) -* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.8%2Bg09ce0e7%2Bchromium-112.0.5615.49_linuxarm64.tar.bz2) -* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.8%2Bg09ce0e7%2Bchromium-112.0.5615.49_macosx64.tar.bz2) +* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.9%2Bg3303e87%2Bchromium-112.0.5615.87_windows32.tar.bz2) +* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.9%2Bg3303e87%2Bchromium-112.0.5615.87_windows64.tar.bz2) +* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.9%2Bg3303e87%2Bchromium-112.0.5615.87_linux64.tar.bz2) +* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.9%2Bg3303e87%2Bchromium-112.0.5615.87_linuxarm.tar.bz2) +* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.9%2Bg3303e87%2Bchromium-112.0.5615.87_linuxarm64.tar.bz2) +* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_112.2.9%2Bg3303e87%2Bchromium-112.0.5615.87_macosx64.tar.bz2) CEF4Delphi was developed and tested on Delphi 11.3 and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2, Delphi 10.3, Delphi 10.4 and Lazarus 2.2.6/FPC 3.2.2. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/packages/CEF4DelphiVCLFMX_Register.pas b/packages/CEF4DelphiVCLFMX_Register.pas index 852347f1..6b9b8562 100644 --- a/packages/CEF4DelphiVCLFMX_Register.pas +++ b/packages/CEF4DelphiVCLFMX_Register.pas @@ -39,7 +39,7 @@ unit CEF4DelphiVCLFMX_Register; {$R res\chromium.dcr} -{$I cef.inc} +{$I ..\source\cef.inc} interface @@ -48,7 +48,7 @@ procedure Register; implementation uses - System.Classes, + System.Classes, Winapi.Windows, System.SysUtils, ToolsApi, uCEFChromium, uCEFWindowParent, uCEFChromiumWindow, uCEFBufferPanel, uCEFWorkScheduler, uCEFFMXBufferPanel, uCEFFMXChromium, uCEFFMXWorkScheduler, uCEFServerComponent, uCEFLinkedWindowParent, uCEFUrlRequestClientComponent, @@ -56,6 +56,29 @@ uses uCEFMenuButtonComponent, uCEFPanelComponent, uCEFTextfieldComponent, uCEFScrollViewComponent, uCEFWindowComponent; +procedure AddBitmapToSplashScreen; +const + {$I ..\source\uCEFVersion.inc} +var + TempBitmap : HBITMAP; + TempVersion : string; +begin + if assigned(SplashScreenServices) then + begin + TempBitmap := LoadBitmap(FindResourceHInstance(HInstance), 'TChromium'); + try + TempVersion := IntToStr(CEF_SUPPORTED_VERSION_MAJOR) + '.' + + IntToStr(CEF_SUPPORTED_VERSION_MINOR) + '.' + + IntToStr(CEF_SUPPORTED_VERSION_RELEASE) + '.' + + IntToStr(CEF_SUPPORTED_VERSION_BUILD); + + SplashScreenServices.AddPluginBitmap('CEF4Delphi ' + TempVersion, TempBitmap, False, 'MPL 1.1 license'); + finally + DeleteObject(TempBitmap); + end; + end; +end; + procedure Register; begin RegisterComponents('Chromium', @@ -71,6 +94,8 @@ begin TCEFMenuButtonComponent, TCEFPanelComponent, TCEFTextfieldComponent, TCEFScrollViewComponent, TCEFWindowComponent]); + + AddBitmapToSplashScreen; end; end. diff --git a/packages/CEF4DelphiVCL_Register.pas b/packages/CEF4DelphiVCL_Register.pas index f068bab6..70e469ab 100644 --- a/packages/CEF4DelphiVCL_Register.pas +++ b/packages/CEF4DelphiVCL_Register.pas @@ -39,7 +39,7 @@ unit CEF4DelphiVCL_Register; {$R res\chromium.dcr} -{$I cef.inc} +{$I ..\source\cef.inc} interface diff --git a/packages/CEF4Delphi_designtime.dpk b/packages/CEF4Delphi_designtime.dpk index b6b0def8..e47225c9 100644 --- a/packages/CEF4Delphi_designtime.dpk +++ b/packages/CEF4Delphi_designtime.dpk @@ -32,6 +32,7 @@ package CEF4Delphi_designtime; requires rtl, vcl, + designide, CEF4DelphiVCLRTL, CEF4DelphiFMXRTL; diff --git a/packages/cef.inc b/packages/cef.inc deleted file mode 100644 index af4e9092..00000000 --- a/packages/cef.inc +++ /dev/null @@ -1,515 +0,0 @@ -// ************************************************************************ -// ***************************** CEF4Delphi ******************************* -// ************************************************************************ -// -// CEF4Delphi is based on DCEF3 which uses CEF3 to embed a chromium-based -// browser in Delphi applications. -// -// The original license of DCEF3 still applies to CEF4Delphi. -// -// For more information about CEF4Delphi visit : -// https://www.briskbard.com/index.php?lang=en&pageid=cef -// -// Copyright © 2023 Salvador Diaz Fau. All rights reserved. -// -// ************************************************************************ -// ************ vvvv Original license and comments below vvvv ************* -// ************************************************************************ -(* - * Delphi Chromium Embedded 3 - * - * Usage allowed under the restrictions of the Lesser GNU General Public License - * or alternatively the restrictions of the Mozilla Public License 1.1 - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for - * the specific language governing rights and limitations under the License. - * - * Unit owner : Henri Gourvest - * Web site : http://www.progdigy.com - * Repository : http://code.google.com/p/delphichromiumembedded/ - * Group : http://groups.google.com/group/delphichromiumembedded - * - * Embarcadero Technologies, Inc is not permitted to use or redistribute - * this source code without explicit permission. - * - *) - - // The complete list of compiler versions is here : - // http://docwiki.embarcadero.com/RADStudio/Tokyo/en/Compiler_Versions - -{$DEFINE DELPHI_VERSION_UNKNOW} - -// Delphi 5 -{$IFDEF VER130} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} -{$ENDIF} - -// Delphi 6 -{$IFDEF VER140} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} -{$ENDIF} - -// Delphi 7 -{$IFDEF VER150} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} -{$ENDIF} - -// Delphi 8 -{$IFDEF VER160} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} -{$ENDIF} - -// Delphi 2005 -{$IFDEF VER170} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} -{$ENDIF} - -{$IFDEF VER180} - {$UNDEF DELPHI_VERSION_UNKNOW} - // Delphi 2007 - {$IFDEF VER185} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - // Delphi 2006 - {$ELSE} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$ENDIF} -{$ENDIF} - -// Delphi 2009 -{$IFDEF VER200} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} -{$ENDIF} - -//Delphi 2010 -{$IFDEF VER210} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} -{$ENDIF} - -// Delphi XE -{$IFDEF VER220} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} -{$ENDIF} - -// Delphi XE2 (First FireMonkey and 64bit compiler) -{$IFDEF VER230} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} -{$ENDIF} - -// Delphi XE3 -{$IFDEF VER240} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} -{$ENDIF} - -// Delphi XE4 -{$IFDEF VER250} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} -{$ENDIF} - -// Delphi XE5 -{$IFDEF VER260} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} - {$DEFINE DELPHI19_UP} -{$ENDIF} - -// Delphi XE6 -{$IFDEF VER270} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} - {$DEFINE DELPHI19_UP} - {$DEFINE DELPHI20_UP} -{$ENDIF} - -// Delphi XE7 -{$IFDEF VER280} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} - {$DEFINE DELPHI19_UP} - {$DEFINE DELPHI20_UP} - {$DEFINE DELPHI21_UP} -{$ENDIF} - -// Delphi XE8 -{$IFDEF VER290} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} - {$DEFINE DELPHI19_UP} - {$DEFINE DELPHI20_UP} - {$DEFINE DELPHI21_UP} - {$DEFINE DELPHI22_UP} -{$ENDIF VER290} - -// Rad Studio 10 - Delphi Seattle -{$IFDEF VER300} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} - {$DEFINE DELPHI19_UP} - {$DEFINE DELPHI20_UP} - {$DEFINE DELPHI21_UP} - {$DEFINE DELPHI22_UP} - {$DEFINE DELPHI23_UP} -{$ENDIF} - -// Rad Studio 10.1 - Delphi Berlin -{$IFDEF VER310} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} - {$DEFINE DELPHI19_UP} - {$DEFINE DELPHI20_UP} - {$DEFINE DELPHI21_UP} - {$DEFINE DELPHI22_UP} - {$DEFINE DELPHI23_UP} - {$DEFINE DELPHI24_UP} -{$ENDIF} - -// Rad Studio 10.2 - Delphi Tokyo -{$IFDEF VER320} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} - {$DEFINE DELPHI19_UP} - {$DEFINE DELPHI20_UP} - {$DEFINE DELPHI21_UP} - {$DEFINE DELPHI22_UP} - {$DEFINE DELPHI23_UP} - {$DEFINE DELPHI24_UP} - {$DEFINE DELPHI25_UP} -{$ENDIF} - -// Rad Studio 10.3 - Delphi Rio -{$IFDEF VER330} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} - {$DEFINE DELPHI19_UP} - {$DEFINE DELPHI20_UP} - {$DEFINE DELPHI21_UP} - {$DEFINE DELPHI22_UP} - {$DEFINE DELPHI23_UP} - {$DEFINE DELPHI24_UP} - {$DEFINE DELPHI25_UP} - {$DEFINE DELPHI26_UP} -{$ENDIF} - -// Rad Studio 10.4 - Delphi Sydney -{$IFDEF VER340} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} - {$DEFINE DELPHI19_UP} - {$DEFINE DELPHI20_UP} - {$DEFINE DELPHI21_UP} - {$DEFINE DELPHI22_UP} - {$DEFINE DELPHI23_UP} - {$DEFINE DELPHI24_UP} - {$DEFINE DELPHI25_UP} - {$DEFINE DELPHI26_UP} - {$DEFINE DELPHI27_UP} -{$ENDIF} - -// Rad Studio 11.0 - Delphi Alexandria -{$IFDEF VER350} - {$UNDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} - {$DEFINE DELPHI19_UP} - {$DEFINE DELPHI20_UP} - {$DEFINE DELPHI21_UP} - {$DEFINE DELPHI22_UP} - {$DEFINE DELPHI23_UP} - {$DEFINE DELPHI24_UP} - {$DEFINE DELPHI25_UP} - {$DEFINE DELPHI26_UP} - {$DEFINE DELPHI27_UP} - {$DEFINE DELPHI28_UP} -{$ENDIF} - -{$IFDEF FPC} - {$DEFINE SUPPORTS_INLINE} - {$IF DEFINED(FPC_FULLVERSION) AND (FPC_FULLVERSION >= 30200)} - {$DEFINE FPC_VER_320} - {$IFEND} -{$ELSE} - {$IFDEF DELPHI_VERSION_UNKNOW} - {$DEFINE DELPHI5_UP} - {$DEFINE DELPHI6_UP} - {$DEFINE DELPHI7_UP} - {$DEFINE DELPHI8_UP} - {$DEFINE DELPHI9_UP} - {$DEFINE DELPHI10_UP} - {$DEFINE DELPHI11_UP} - {$DEFINE DELPHI12_UP} - {$DEFINE DELPHI14_UP} - {$DEFINE DELPHI15_UP} - {$DEFINE DELPHI16_UP} - {$DEFINE DELPHI17_UP} - {$DEFINE DELPHI18_UP} - {$DEFINE DELPHI19_UP} - {$DEFINE DELPHI20_UP} - {$DEFINE DELPHI21_UP} - {$DEFINE DELPHI22_UP} - {$DEFINE DELPHI23_UP} - {$DEFINE DELPHI24_UP} - {$DEFINE DELPHI25_UP} - {$DEFINE DELPHI26_UP} - {$DEFINE DELPHI27_UP} - {$DEFINE DELPHI28_UP} - {$ENDIF} -{$ENDIF} - -{$IFDEF DELPHI9_UP} - {$DEFINE SUPPORTS_INLINE} -{$ENDIF} - -{$IF DEFINED(CPUX32) OR - DEFINED(CPU32) OR - DEFINED(CPU32BITS) OR - DEFINED(CPUARM32) OR - DEFINED(WIN32) OR - DEFINED(IOS32) OR - DEFINED(MACOS32) OR - DEFINED(LINUX32) OR - DEFINED(POSIX32) OR - DEFINED(ANDROID32)} - {$DEFINE TARGET_32BITS} -{$ELSE} - {$IF DEFINED(CPUX64) OR - DEFINED(CPU64) OR - DEFINED(CPU64BITS) OR - DEFINED(CPUARM64) OR - DEFINED(WIN64) OR - DEFINED(IOS64) OR - DEFINED(MACOS64) OR - DEFINED(LINUX64) OR - DEFINED(POSIX64) OR - DEFINED(ANDROID64)} - {$DEFINE TARGET_64BITS} - {$IFEND} -{$IFEND} - -// Delphi uses MACOS for the new MacOSX and DARWIN is not defined -// FPC uses DARWIN for the new MacOSX and MACOS is defined for the classic Macintosh OS (System 7) -// We define MACOSX to avoid conflicts in both situations -{$IFDEF FPC} - {$IFDEF DARWIN} - {$DEFINE MACOSX} - {$ENDIF} -{$ELSE} - {$IFDEF MACOS} - {$DEFINE MACOSX} - {$ENDIF} -{$ENDIF} - -{$IFDEF LINUX} - {$IFDEF FPC} - {$DEFINE LINUXFPC} - {$ELSE} - {$DEFINE LINUXFMX} - {$ENDIF} -{$ENDIF} diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index 7aa70fda..838caed2 100644 --- a/packages/cef4delphi_lazarus.lpk +++ b/packages/cef4delphi_lazarus.lpk @@ -21,7 +21,7 @@ - + diff --git a/source/uCEFApplicationCore.pas b/source/uCEFApplicationCore.pas index 15182579..b40abb6e 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -67,15 +67,7 @@ uses uCEFSchemeRegistrar, uCEFPreferenceRegistrar; const - CEF_SUPPORTED_VERSION_MAJOR = 112; - CEF_SUPPORTED_VERSION_MINOR = 2; - CEF_SUPPORTED_VERSION_RELEASE = 8; - CEF_SUPPORTED_VERSION_BUILD = 0; - - CEF_CHROMEELF_VERSION_MAJOR = CEF_SUPPORTED_VERSION_MAJOR; - CEF_CHROMEELF_VERSION_MINOR = 0; - CEF_CHROMEELF_VERSION_RELEASE = 5615; - CEF_CHROMEELF_VERSION_BUILD = 49; + {$I uCEFVersion.inc} {$IFDEF MSWINDOWS} LIBCEF_DLL = 'libcef.dll'; diff --git a/source/uCEFVersion.inc b/source/uCEFVersion.inc new file mode 100644 index 00000000..d3ee6e44 --- /dev/null +++ b/source/uCEFVersion.inc @@ -0,0 +1,9 @@ + CEF_SUPPORTED_VERSION_MAJOR = 112; + CEF_SUPPORTED_VERSION_MINOR = 2; + CEF_SUPPORTED_VERSION_RELEASE = 9; + CEF_SUPPORTED_VERSION_BUILD = 0; + + CEF_CHROMEELF_VERSION_MAJOR = CEF_SUPPORTED_VERSION_MAJOR; + CEF_CHROMEELF_VERSION_MINOR = 0; + CEF_CHROMEELF_VERSION_RELEASE = 5615; + CEF_CHROMEELF_VERSION_BUILD = 87; \ No newline at end of file diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 39d6ee8c..f49e4e27 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 478, + "InternalVersion" : 479, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "112.2.8" + "Version" : "112.2.9" } ], "UpdatePackageData" : {