File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -56,6 +56,8 @@ build_log*.txt
5656# Intermediates
5757* .exp
5858* .lib
59+ ! third_party /webview2 /win-x64 /WebView2LoaderStatic.lib
60+ ! third_party /webview2 /win-arm64 /WebView2LoaderStatic.lib
5961* .iobj
6062* .ipdb
6163
Original file line number Diff line number Diff line change @@ -134,8 +134,14 @@ add_executable(QuickView WIN32 ${QUICKVIEW_SOURCES})
134134set (QUICKVIEW_LINK_FLAGS "/SUBSYSTEM:WINDOWS" )
135135if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64" )
136136 set (QUICKVIEW_LINK_FLAGS "${QUICKVIEW_LINK_FLAGS} /machine:ARM64" )
137+ set (QV_WEBVIEW2_ARCH win-arm64)
137138else ()
138139 set (QUICKVIEW_LINK_FLAGS "${QUICKVIEW_LINK_FLAGS} /machine:x64" )
140+ set (QV_WEBVIEW2_ARCH win-x64)
141+ endif ()
142+ set (QV_WEBVIEW2_LIB "${CMAKE_CURRENT_SOURCE_DIR } /third_party/webview2/${QV_WEBVIEW2_ARCH} /WebView2LoaderStatic.lib" )
143+ if (NOT EXISTS "${QV_WEBVIEW2_LIB} " )
144+ message (FATAL_ERROR "WebView2LoaderStatic.lib missing for ${QV_WEBVIEW2_ARCH} : ${QV_WEBVIEW2_LIB} " )
139145endif ()
140146set_target_properties (QuickView PROPERTIES LINK_FLAGS "${QUICKVIEW_LINK_FLAGS} " )
141147
@@ -364,7 +370,7 @@ target_link_libraries(QuickView PRIVATE
364370 shlwapi.lib
365371 shell32.lib
366372 mscms.lib
367- ${CMAKE_CURRENT_SOURCE_DIR } /third_party/webview2/WebView2LoaderStatic.lib
373+ ${QV_WEBVIEW2_LIB}
368374)
369375
370376# ============================================================================
Original file line number Diff line number Diff line change 1212
1313// Version Information - This sets the display name in Windows
1414 VS_VERSION_INFO VERSIONINFO
15- FILEVERSION 6,36,0,4
16- PRODUCTVERSION 6,36,0,4
15+ FILEVERSION 6,36,0,5
16+ PRODUCTVERSION 6,36,0,5
1717FILEFLAGSMASK 0x3fL
1818FILEFLAGS 0x0L
1919FILEOS 0x40004L
@@ -26,12 +26,12 @@ BEGIN
2626 BEGIN
2727 VALUE "CompanyName", "QuickView"
2828 VALUE "FileDescription", "QuickView"
29- VALUE "FileVersion", "6.36.0.4 "
29+ VALUE "FileVersion", "6.36.0.5 "
3030 VALUE "InternalName", "QuickView.exe"
3131 VALUE "LegalCopyright", "Copyright (C) 2024"
3232 VALUE "OriginalFilename", "QuickView.exe"
3333 VALUE "ProductName", "QuickView"
34- VALUE "ProductVersion", "6.36.0.4 "
34+ VALUE "ProductVersion", "6.36.0.5 "
3535 END
3636 END
3737 BLOCK "VarFileInfo"
You can’t perform that action at this time.
0 commit comments