early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,41 @@
commit b3a77c3f0b7dd2e1405a781ac9a76f648779d7fa
Author: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Tue Nov 9 14:28:14 2021 +0800
Build: Support VS2022 builds
Make these builds distinct from the Visual Studio 2019 builds.
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
index 6933505d..16d57810 100644
--- a/MSVC_NMake/detectenv-msvc.mak
+++ b/MSVC_NMake/detectenv-msvc.mak
@@ -98,9 +98,12 @@ PDBVER = 14
!if $(VCVERSION) > 1909 && $(VCVERSION) < 1920
VSVER_SUFFIX = 1
VSVER = 15
-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930
VSVER_SUFFIX = 2
VSVER = 16
+!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000
+VSVER_SUFFIX = 3
+VSVER = 17
!else
VSVER = $(PDBVER)
!endif
diff --git a/meson.build b/meson.build
index b7c7f77e..a2ee5ef3 100644
--- a/meson.build
+++ b/meson.build
@@ -231,7 +231,9 @@ if is_msvc
add_project_arguments(disabled_warnings, language: 'cpp')
if use_msvc14x_toolset_ver
- if cpp_compiler.version().version_compare('>=19.20')
+ if cpp_compiler.version().version_compare('>=19.30')
+ msvc14x_toolset_ver = '-vc143'
+ elif cpp_compiler.version().version_compare('>=19.20')
msvc14x_toolset_ver = '-vc142'
elif cpp_compiler.version().version_compare('>=19.10')
msvc14x_toolset_ver = '-vc141'

35
externals/vcpkg/ports/glibmm/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,35 @@
# Glib uses winapi functions not available in WindowsStore
vcpkg_download_distfile(ARCHIVE
URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.70/glibmm-2.70.0.tar.xz"
FILENAME "glibmm-2.70.0.tar.xz"
SHA512 059cab7f0b865303cef3cba6c4f3a29ae4e359aba428f5e79cea6fedd3f1e082199f673323cf804902cee14b91739598fbc6ff706ec36f19c4d793d032782518
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
PATCHES
build-support-vs2022-builds.patch
)
vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-Dbuild-examples=false
-Dmsvc14x-parallel-installable=false
)
vcpkg_install_meson()
vcpkg_copy_pdbs()
# intentionally 2.68 - glib does not install glibmm-2.70 files
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/lib/glibmm-2.68/proc"
"${CURRENT_PACKAGES_DIR}/lib/glibmm-2.68/proc"
)
vcpkg_fixup_pkgconfig()
# Handle copyright and readme
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME readme.txt)

22
externals/vcpkg/ports/glibmm/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,22 @@
{
"name": "glibmm",
"version": "2.70.0",
"port-version": 1,
"description": "This is glibmm, a C++ API for parts of glib that are useful for C++.",
"homepage": "https://www.gtkmm.org.",
"license": "LGPL-2.1-or-later",
"supports": "!uwp",
"dependencies": [
"gettext",
"glib",
"libffi",
"libiconv",
"libsigcpp-3",
"pcre",
{
"name": "vcpkg-tool-meson",
"host": true
},
"zlib"
]
}