diff options
| author | crupest <crupest@outlook.com> | 2022-01-28 22:33:29 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2022-01-28 22:33:29 +0800 |
| commit | fb992c554110ddd28c18b2cbed79eee8e10cd4a9 (patch) | |
| tree | c6636b723326159d791cd610e1429cae0fe5f6e4 /src/win/graphics | |
| parent | 8d4d66d1bc4d5237c7dbac3013c7ecc6d5a36a35 (diff) | |
| parent | 27ef6b29fe9ea6931dd9aef585e8b9467599b5f1 (diff) | |
| download | cru-fb992c554110ddd28c18b2cbed79eee8e10cd4a9.tar.gz cru-fb992c554110ddd28c18b2cbed79eee8e10cd4a9.tar.bz2 cru-fb992c554110ddd28c18b2cbed79eee8e10cd4a9.zip | |
Merge branch 'main' of https://github.com/crupest/cru
Diffstat (limited to 'src/win/graphics')
| -rw-r--r-- | src/win/graphics/direct/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/win/graphics/direct/Font.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/win/graphics/direct/CMakeLists.txt b/src/win/graphics/direct/CMakeLists.txt index ecd72b13..84c2af61 100644 --- a/src/win/graphics/direct/CMakeLists.txt +++ b/src/win/graphics/direct/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(cru_win_graphics_direct STATIC +add_library(cru_win_graphics_direct SHARED Brush.cpp Font.cpp Geometry.cpp @@ -11,3 +11,4 @@ add_library(cru_win_graphics_direct STATIC ) target_link_libraries(cru_win_graphics_direct PUBLIC D3D11 D2d1 DWrite) target_link_libraries(cru_win_graphics_direct PUBLIC cru_win_base cru_platform_graphics) +target_compile_definitions(cru_win_graphics_direct PRIVATE CRU_WIN_GRAPHICS_DIRECT_EXPORT_API) diff --git a/src/win/graphics/direct/Font.cpp b/src/win/graphics/direct/Font.cpp index ffc16214..39ba2d8b 100644 --- a/src/win/graphics/direct/Font.cpp +++ b/src/win/graphics/direct/Font.cpp @@ -16,7 +16,7 @@ DWriteFont::DWriteFont(DirectGraphicsFactory* factory, String font_family, if (!::GetUserDefaultLocaleName(buffer.data(), static_cast<int>(buffer.size()))) throw platform::win::Win32Error( - ::GetLastError(), "Failed to get locale when create dwrite font."); + ::GetLastError(), u"Failed to get locale when create dwrite font."); ThrowIfFailed(factory->GetDWriteFactory()->CreateTextFormat( reinterpret_cast<const wchar_t*>(font_family_.c_str()), nullptr, |