Merge branch 'llvm-clang-msw' of https://github.com/MaartenBent/wxWidgets
Fix llvm clang issues on Windows. See #23468.
This commit is contained in:
commit
b4a29beecd
3 changed files with 15 additions and 15 deletions
|
|
@ -5,13 +5,13 @@
|
|||
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" />
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
<asmv2:trustInfo xmlns:asmv2="urn:schemas-microsoft-com:asm.v2">
|
||||
<asmv2:security>
|
||||
<asmv2:requestedPrivileges>
|
||||
<asmv2:requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||
</asmv2:requestedPrivileges>
|
||||
</asmv2:security>
|
||||
</asmv2:trustInfo>
|
||||
<asmv3:application>
|
||||
<asmv3:windowsSettings>
|
||||
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" />
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
<asmv2:trustInfo xmlns:asmv2="urn:schemas-microsoft-com:asm.v2">
|
||||
<asmv2:security>
|
||||
<asmv2:requestedPrivileges>
|
||||
<asmv2:requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||
</asmv2:requestedPrivileges>
|
||||
</asmv2:security>
|
||||
</asmv2:trustInfo>
|
||||
<asmv3:application>
|
||||
<asmv3:windowsSettings>
|
||||
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, system</dpiAwareness>
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ BEGIN
|
|||
VALUE "FileDescription", "wxWidgets " WXLIBDESC " library\0"
|
||||
VALUE "FileVersion", wxVERSION_NUM_DOT_STRING "\0"
|
||||
VALUE "InternalName", wxSTRINGIZE(WXDLLNAME) "\0"
|
||||
VALUE "LegalCopyright", "Copyright © 1992-2023 wxWidgets development team\0"
|
||||
VALUE "LegalCopyright", L"Copyright \xa9 1992-2023 wxWidgets development team\0"
|
||||
VALUE "OriginalFilename", wxSTRINGIZE(WXDLLNAME) ".dll\0"
|
||||
VALUE "ProductName", "wxWidgets\0"
|
||||
VALUE "ProductVersion", wxVERSION_NUM_DOT_STRING "\0"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue