forked from osmocom/wireshark
Logwolf: Fix building on Windows.
Add a couple of missing resource files. Fix a couple of paths.
This commit is contained in:
Gerald Combs
parent
545553e203
commit
c5da4f661a
|
|
@ -1738,6 +1738,7 @@ set(CFG_OUT_FILES
|
|||
resources/libwireshark.rc
|
||||
resources/libwiretap.rc
|
||||
resources/libwsutil.rc
|
||||
resources/logwolf.exe.manifest
|
||||
resources/wireshark.exe.manifest
|
||||
resources/wireshark.rc
|
||||
wireshark.pc
|
||||
|
|
|
|||
|
|
@ -0,0 +1,69 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<assemblyIdentity
|
||||
version="@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_MICRO@.0"
|
||||
processorArchitecture="@WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE@"
|
||||
name="WiresharkDevelopmentTeam.Logwolf"
|
||||
type="win32"
|
||||
/>
|
||||
<description>A wonderful log analyzer</description>
|
||||
<dependency>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity
|
||||
type="win32"
|
||||
name="Microsoft.Windows.Common-Controls"
|
||||
version="6.0.0.0"
|
||||
processorArchitecture="@WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE@"
|
||||
publicKeyToken="6595b64144ccf1df"
|
||||
language="*"
|
||||
/>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel
|
||||
level="asInvoker"
|
||||
uiAccess="false"
|
||||
/>
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<!-- This should match the following:
|
||||
- The NTDDI_VERSION and _WIN32_WINNT parts of cmakeconfig.h.in
|
||||
- The GetWindowsVersion parts of packaging\nsis\wireshark.nsi
|
||||
- The VersionNT parts of packaging\wix\Prerequisites.wxi
|
||||
-->
|
||||
<!-- Windows 7 -->
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
|
||||
<!-- Windows 8 -->
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
||||
<!-- Windows 8.1 -->
|
||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
|
||||
<!-- Windows 10 & 11 -->
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
|
||||
</application>
|
||||
<!-- Set our process code page to UTF-8
|
||||
https://docs.microsoft.com/en-us/windows/apps/design/globalizing/use-utf8-code-page
|
||||
https://nullprogram.com/blog/2021/12/30/
|
||||
-->
|
||||
<windowsSettings>
|
||||
<activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
|
||||
</windowsSettings>
|
||||
</compatibility>
|
||||
<!--
|
||||
MSDN recommends setting our DPI awareness to PerMonitorV2 instead
|
||||
of PerMonitor. Unfortunately that causes layout issues with Qt
|
||||
5.6 and 5.9. For now enable PerMonitor DPI awareness by enabling
|
||||
Qt::AA_EnableHighDpiScaling in ui/qt/main.cpp.
|
||||
-->
|
||||
<!--
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<windowsSettings>
|
||||
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
|
||||
</windowsSettings>
|
||||
</application>
|
||||
-->
|
||||
</assembly>
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
#include "winver.h"
|
||||
#pragma code_page(65001)
|
||||
|
||||
LOGWOLF_ICON1 ICON "@ICON_PATH@wireshark.ico"
|
||||
LOGWOLF_ICON2 ICON "@ICON_PATH@wiresharkdoc.ico"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION @RC_VERSION@
|
||||
PRODUCTVERSION @RC_VERSION@
|
||||
FILEFLAGSMASK 0x0L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS VS_FF_DEBUG
|
||||
#else
|
||||
FILEFLAGS 0x0L
|
||||
#endif
|
||||
FILEOS VOS_NT_WINDOWS32
|
||||
FILETYPE VFT_APP
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "The Wireshark developer community, https://www.wireshark.org/\0"
|
||||
VALUE "FileDescription", "Logwolf\0"
|
||||
VALUE "FileVersion", "@VERSION@\0"
|
||||
VALUE "InternalName", "Logwolf @VERSION@\0"
|
||||
VALUE "LegalCopyright", "Copyright © 2022 Loris Degioanni <loris@sysdig.com>, Gerald Combs <gerald@wireshark.org> and others\0"
|
||||
VALUE "OriginalFilename", "Logwolf.exe\0"
|
||||
VALUE "ProductName", "Logwolf\0"
|
||||
VALUE "ProductVersion", "@VERSION@\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
|
||||
#define MANIFEST_RESOURCE_ID 1
|
||||
#define RT_MANIFEST 24
|
||||
|
||||
MANIFEST_RESOURCE_ID RT_MANIFEST "logwolf.exe.manifest"
|
||||
|
|
@ -554,8 +554,8 @@ set(WIRESHARK_QT_UI
|
|||
|
||||
if(HAVE_PCAP_REMOTE)
|
||||
list(APPEND WIRESHARK_QT_UI
|
||||
remote_capture_dialog.ui
|
||||
remote_settings_dialog.ui
|
||||
../qt/remote_capture_dialog.ui
|
||||
../qt/remote_settings_dialog.ui
|
||||
)
|
||||
endif()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue