Commit 4fd806b 1 parent 432da75 commit 4fd806b Copy full SHA for 4fd806b
File tree 5 files changed +25
-1
lines changed
5 files changed +25
-1
lines changed Original file line number Diff line number Diff line change @@ -35,6 +35,7 @@ Aditya Patadia <adityapatadia@users.noreply.github.com>
35
35
Ahmad Amsyar Asyadiq Bin Syaiful Bahri <27284123+Ahmad-Amsyar@users.noreply.github.com>
36
36
Alex Xu (Hello71) <alex_y_xu@yahoo.ca>
37
37
Alexander Sago <cagelight@gmail.com>
38
+ Alifian Caesar Khalid <alifiancaesar@gmail.com>
38
39
Alistair Barrow
39
40
Andrius Lukas Narbutas <andrius4669@gmail.com>
40
41
Aous Naman <aous@unsw.edu.au>
Original file line number Diff line number Diff line change @@ -330,7 +330,7 @@ else ()
330
330
if (NOT JPEGXL_ENABLE_SIZELESS_VECTORS)
331
331
set (HWY_DISABLED_TARGETS "${HWY_DISABLED_TARGETS} |HWY_SVE|HWY_SVE2|HWY_SVE_256|HWY_SVE2_128|HWY_RVV" )
332
332
endif ()
333
- add_definitions ( -DHWY_DISABLED_TARGETS=\(${HWY_DISABLED_TARGETS} \))
333
+ add_compile_options ($<$< NOT :$<COMPILE_LANGUAGE:RC>>: -DHWY_DISABLED_TARGETS=\(${HWY_DISABLED_TARGETS} \)> )
334
334
endif ()
335
335
336
336
# Machine flags.
Original file line number Diff line number Diff line change @@ -336,6 +336,18 @@ foreach(BINARY IN LISTS TOOL_BINARIES)
336
336
endif ()
337
337
set_target_properties (${BINARY} PROPERTIES LINK_FLAGS "${JXL_WASM_TOOLS_LINK_FLAGS} " )
338
338
endif ()
339
+
340
+ # Attach manifest that tells Windows to use UTF-8 for eg. fopen
341
+ if (WIN32 )
342
+ # Accommodate cl, clang-cl and clang with GNU-like command
343
+ if (NOT MINGW)
344
+ target_sources (${BINARY} PRIVATE utf8.manifest)
345
+ # Since CMake in MINGW doesn't support linking
346
+ # .manifest file, do it with .rc file
347
+ elseif (MINGW)
348
+ target_sources (${BINARY} PRIVATE utf8.rc)
349
+ endif ()
350
+ endif ()
339
351
endforeach ()
340
352
341
353
install (TARGETS ${TOOL_BINARIES} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR} " )
Original file line number Diff line number Diff line change
1
+ <?xml version =" 1.0" encoding =" UTF-8" standalone =" yes" ?>
2
+ <assembly manifestVersion =" 1.0" xmlns =" urn:schemas-microsoft-com:asm.v1" >
3
+ <application >
4
+ <windowsSettings >
5
+ <activeCodePage xmlns =" http://schemas.microsoft.com/SMI/2019/WindowsSettings" >UTF-8</activeCodePage >
6
+ </windowsSettings >
7
+ </application >
8
+ </assembly >
Original file line number Diff line number Diff line change
1
+ #include <winuser.h>
2
+
3
+ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "utf8.manifest"
You can’t perform that action at this time.
0 commit comments