Skip to content

Commit 86f9da9

Browse files
committed
Added support for loading Unicode paths on Windows.
Use manifest to set the codepage to UTF-8, allowing for Unicode paths to be used. Updated GLM and rapidjson to the latest versions.
1 parent c297ac3 commit 86f9da9

File tree

5 files changed

+17
-3
lines changed

5 files changed

+17
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ endif()
6868

6969
set(VFC_MAJOR_VERSION 2)
7070
set(VFC_MINOR_VERSION 1)
71-
set(VFC_PATCH_VERSION 5)
71+
set(VFC_PATCH_VERSION 6)
7272
set(VFC_VERSION ${VFC_MAJOR_VERSION}.${VFC_MINOR_VERSION}.${VFC_PATCH_VERSION})
7373

7474
set(VFC_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

lib/glm

Submodule glm updated 977 files

tool/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
file(GLOB sources *.cpp *.h)
22
add_executable(vfc ${sources})
33

4+
if (WIN32)
5+
configure_file(vfc.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/vfc.manifest @ONLY)
6+
target_sources(vfc PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/vfc.manifest)
7+
endif()
8+
49
target_link_libraries(vfc PRIVATE VFC::lib)
510
target_include_directories(vfc PRIVATE rapidjson/include)
611

tool/vfc.manifest.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3+
<assemblyIdentity type="win32" name="vfc" version="@[email protected]"/>
4+
<application>
5+
<windowsSettings>
6+
<activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
7+
</windowsSettings>
8+
</application>
9+
</assembly>

0 commit comments

Comments
 (0)