From 8206894fc162010dc51a3f88415e54d91a464601 Mon Sep 17 00:00:00 2001 From: 1zuna Date: Tue, 12 Mar 2024 05:55:06 +0100 Subject: [PATCH] cinemamod mistake --- CMakeLists.txt | 11 ++--------- cmake/DownloadCEF.cmake | 12 ++++++------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c55149bd..8efab352 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,8 +117,6 @@ cmake_minimum_required(VERSION 3.19) # Only generate Debug and Release configuration types. set(CMAKE_CONFIGURATION_TYPES Debug Release) -set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded") - # Project name. project(jcef) @@ -130,14 +128,9 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON) # CEF configuration. # -# Specify the CEF branch -if(NOT DEFINED CEF_BRANCH) - set(CEF_BRANCH "6167") -endif() - # Specify the CEF distribution version. if(NOT DEFINED CEF_VERSION) - set(CEF_VERSION "121.3.9+g1e0a38f+chromium-121.0.6167.184") + set(CEF_VERSION "122.1.10+gc902316+chromium-122.0.6261.112") endif() # Determine the platform. @@ -172,7 +165,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # Download and extract the CEF binary distribution (executes DownloadCEF.cmake). include(DownloadCEF) -DownloadCEF("${CEF_PLATFORM}" "${CEF_BRANCH}" "${CEF_VERSION}" "${CMAKE_SOURCE_DIR}/third_party/cef") +DownloadCEF("${CEF_PLATFORM}" "${CEF_VERSION}" "${CMAKE_SOURCE_DIR}/third_party/cef") # Add the CEF binary distribution's cmake/ directory to the module path. set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CEF_ROOT}/cmake") diff --git a/cmake/DownloadCEF.cmake b/cmake/DownloadCEF.cmake index b2d11930..a64592bc 100644 --- a/cmake/DownloadCEF.cmake +++ b/cmake/DownloadCEF.cmake @@ -8,7 +8,7 @@ # Visit https://cef-builds.spotifycdn.com/index.html for the list of # supported platforms and versions. -function(DownloadCEF platform branch version download_dir) +function(DownloadCEF platform version download_dir) # Specify the binary distribution type and download directory. set(CEF_DISTRIBUTION "cef_binary_${version}_${platform}") set(CEF_DOWNLOAD_DIR "${download_dir}") @@ -21,19 +21,19 @@ function(DownloadCEF platform branch version download_dir) set(CEF_DOWNLOAD_FILENAME "${CEF_DISTRIBUTION}.tar.bz2") set(CEF_DOWNLOAD_PATH "${CEF_DOWNLOAD_DIR}/${CEF_DOWNLOAD_FILENAME}") if(NOT EXISTS "${CEF_DOWNLOAD_PATH}") - set(CEF_DOWNLOAD_URL "https://mcef-download.cinemamod.com/cef-builds/${branch}/${CEF_DOWNLOAD_FILENAME}") + set(CEF_DOWNLOAD_URL "https://cef-builds.spotifycdn.com/${CEF_DOWNLOAD_FILENAME}") string(REPLACE "+" "%2B" CEF_DOWNLOAD_URL_ESCAPED ${CEF_DOWNLOAD_URL}) # Download the SHA1 hash for the binary distribution. - # message(STATUS "Downloading ${CEF_DOWNLOAD_PATH}.sha1 from ${CEF_DOWNLOAD_URL_ESCAPED}...") - # file(DOWNLOAD "${CEF_DOWNLOAD_URL_ESCAPED}.sha1" "${CEF_DOWNLOAD_PATH}.sha1") - # file(READ "${CEF_DOWNLOAD_PATH}.sha1" CEF_SHA1) + message(STATUS "Downloading ${CEF_DOWNLOAD_PATH}.sha1 from ${CEF_DOWNLOAD_URL_ESCAPED}...") + file(DOWNLOAD "${CEF_DOWNLOAD_URL_ESCAPED}.sha1" "${CEF_DOWNLOAD_PATH}.sha1") + file(READ "${CEF_DOWNLOAD_PATH}.sha1" CEF_SHA1) # Download the binary distribution and verify the hash. message(STATUS "Downloading ${CEF_DOWNLOAD_PATH}...") file( DOWNLOAD "${CEF_DOWNLOAD_URL_ESCAPED}" "${CEF_DOWNLOAD_PATH}" - # EXPECTED_HASH SHA1=${CEF_SHA1} + EXPECTED_HASH SHA1=${CEF_SHA1} SHOW_PROGRESS ) endif()