提交 27c5a0fc 编写于 作者: yanghye's avatar yanghye

upgrade: build-2.2.4 cef-1.107.1.12

上级 1933f5b8
//----------------------------------------
//
// Copyright © yanghy. All Rights Reserved.
//
// Licensed under GNU General Public License v3.0
//
//----------------------------------------
package cef
import (
"github.com/energye/energy/common"
"github.com/energye/golcl/lcl/api"
)
var (
cef_version string
lib_build_version string
)
//cef version
func CEFVersion() string {
if cef_version == "" {
r1, _, _ := common.Proc(internale_CEFVersion).Call()
cef_version = api.GoStr(r1)
}
return cef_version
}
//lib build version
func LibBuildVersion() string {
if lib_build_version == "" {
r1, _, _ := common.Proc(internale_LibBuildVersion).Call()
lib_build_version = api.GoStr(r1)
}
return lib_build_version
}
...@@ -14,6 +14,8 @@ func init() { ...@@ -14,6 +14,8 @@ func init() {
var energyImportDefs = []*dllimports.ImportTable{ var energyImportDefs = []*dllimports.ImportTable{
//null nil //null nil
dllimports.NewEnergyImport("", 0), dllimports.NewEnergyImport("", 0),
dllimports.NewEnergyImport("CEFVersion", 0),
dllimports.NewEnergyImport("LibBuildVersion", 0),
//ApplicationQueueAsyncCallFunc //ApplicationQueueAsyncCallFunc
dllimports.NewEnergyImport("SetApplicationQueueAsyncCallFunc", 0), dllimports.NewEnergyImport("SetApplicationQueueAsyncCallFunc", 0),
dllimports.NewEnergyImport("CEFApplication_QueueAsyncCall", 0), dllimports.NewEnergyImport("CEFApplication_QueueAsyncCall", 0),
...@@ -344,6 +346,8 @@ func init() { ...@@ -344,6 +346,8 @@ func init() {
const ( const (
//null nil //null nil
internale_null_nil = iota internale_null_nil = iota
internale_CEFVersion
internale_LibBuildVersion
//ApplicationQueueAsyncCallFunc //ApplicationQueueAsyncCallFunc
internale_SetApplicationQueueAsyncCallFunc internale_SetApplicationQueueAsyncCallFunc
internale_CEFApplication_QueueAsyncCall internale_CEFApplication_QueueAsyncCall
......
...@@ -23,6 +23,7 @@ func main() { ...@@ -23,6 +23,7 @@ func main() {
//环境变量 ENERGY_HOME="/app/cefframework" 配置框架所在目录 //环境变量 ENERGY_HOME="/app/cefframework" 配置框架所在目录
//全局初始化 //全局初始化
cef.GlobalCEFInit(&libs, &resources) cef.GlobalCEFInit(&libs, &resources)
fmt.Println("CEFVersion:", cef.CEFVersion(), "LibBuildVersion:", cef.LibBuildVersion())
//Render 子进程一些初始化配置 //Render 子进程一些初始化配置
cefApp := src.AppRenderInit() cefApp := src.AppRenderInit()
//Browser 主进程一些初始配置 //Browser 主进程一些初始配置
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册