mirror of https://github.com/microsoft/vcpkg.git
[wxWidgets] Fix build with clang-cl (#28744)
* [wxWidgets] change include for clang-cl * v db
This commit is contained in:
parent
96f43232a6
commit
b1fbc2e525
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h
|
||||
index 8c57520e1..54ffb27d2 100644
|
||||
--- a/src/stc/scintilla/include/Scintilla.h
|
||||
+++ b/src/stc/scintilla/include/Scintilla.h
|
||||
@@ -27,7 +27,7 @@ int Scintilla_LinkLexers(void);
|
||||
#endif
|
||||
|
||||
// Include header that defines basic numeric types.
|
||||
-#if defined(_MSC_VER)
|
||||
+#if defined(_MSC_VER) && !defined(__clang__)
|
||||
// Older releases of MSVC did not have stdint.h.
|
||||
#include <stddef.h>
|
||||
#elif defined( __VMS )
|
||||
|
|
@ -12,6 +12,7 @@ vcpkg_from_github(
|
|||
fix-pcre2.patch
|
||||
gtk3-link-libraries.patch
|
||||
sdl2.patch
|
||||
fix_include.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "wxwidgets",
|
||||
"version": "3.2.1",
|
||||
"port-version": 3,
|
||||
"port-version": 4,
|
||||
"description": [
|
||||
"Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ",
|
||||
"Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.",
|
||||
|
|
|
|||
|
|
@ -8158,7 +8158,7 @@
|
|||
},
|
||||
"wxwidgets": {
|
||||
"baseline": "3.2.1",
|
||||
"port-version": 3
|
||||
"port-version": 4
|
||||
},
|
||||
"wyhash": {
|
||||
"baseline": "2022-10-12",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "12b6474f28b37b6ebb29b391fb6ebffd7fc70450",
|
||||
"version": "3.2.1",
|
||||
"port-version": 4
|
||||
},
|
||||
{
|
||||
"git-tree": "1ed5520b0a093e9c55310732eda81ae0a569a00a",
|
||||
"version": "3.2.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue