Skip to content

Make ENABLE_IM_FONT_ATLAS_SNAPSHOT CMake option & Avoid Linking FreeType #1043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Make ENABLE_IM_FONT_ATLAS_SNAPSHOT CMake option & Avoid Linking FreeType #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3a85cd
Make ENABLE_IM_FONT_ATLAS_SNAPSHOT CMake option
IsaacMarovitz Mar 5, 2025
7f051eb
Address review
IsaacMarovitz Mar 6, 2025
cae03f1
Review
IsaacMarovitz Mar 7, 2025
9f4f3f9
Correct typo
IsaacMarovitz Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion UnleashedRecomp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
option(UNLEASHED_RECOMP_FLATPAK "Configure the build for Flatpak compatibility." OFF)
endif()

# Undefine this to generate a font atlas file in working directory.
# You also need to do this if you are testing localization, as only
# characters in the locale get added to the atlas.
option(UNLEASHED_RECOMP_ENABLE_IM_FONT_ATLAS_SNAPSHOT "Use font atlas snapshot instead of generating one." ON)

function(BIN2C)
cmake_parse_arguments(BIN2C_ARGS "" "TARGET_OBJ;SOURCE_FILE;DEST_FILE;ARRAY_NAME;COMPRESSION_TYPE" "" ${ARGN})

Expand Down Expand Up @@ -317,6 +322,10 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
target_compile_definitions(UnleashedRecomp PRIVATE SDL_VULKAN_ENABLED)
endif()

if (UNLEASHED_RECOMP_ENABLE_IM_FONT_ATLAS_SNAPSHOT)
target_compile_definitions(UnleashedRecomp PRIVATE -DENABLE_IM_FONT_ATLAS_SNAPSHOT)
endif()

find_package(directx-dxc REQUIRED)
find_package(CURL REQUIRED)

Expand Down Expand Up @@ -357,7 +366,6 @@ endif()
target_link_libraries(UnleashedRecomp PRIVATE
fmt::fmt
libzstd_static
msdf-atlas-gen::msdf-atlas-gen
nfd::nfd
o1heap
XenonUtils
Expand All @@ -369,6 +377,12 @@ target_link_libraries(UnleashedRecomp PRIVATE
CURL::libcurl
)

if (NOT UNLEASHED_RECOMP_ENABLE_IM_FONT_ATLAS_SNAPSHOT)
target_link_libraries(UnleashedRecomp PRIVATE
msdf-atlas-gen::msdf-atlas-gen
)
endif()

target_include_directories(UnleashedRecomp PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
"${CMAKE_CURRENT_SOURCE_DIR}/api"
Expand Down
4 changes: 4 additions & 0 deletions UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "imgui_font_builder.h"

#ifndef ENABLE_IM_FONT_ATLAS_SNAPSHOT

#include <msdf-atlas-gen/msdf-atlas-gen.h>

// Taken directly from msdf-atlas-gen, modified to support custom rectangles.
Expand Down Expand Up @@ -321,3 +323,5 @@ static bool FontBuilder_Build(ImFontAtlas* atlas)
}

ImFontBuilderIO g_fontBuilderIO = { FontBuilder_Build };

#endif
5 changes: 0 additions & 5 deletions UnleashedRecomp/gpu/imgui/imgui_snapshot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#pragma once

// Undefine this to generate a font atlas file in working directory.
// You also need to do this if you are testing localization, as only
// characters in the locale get added to the atlas.
#define ENABLE_IM_FONT_ATLAS_SNAPSHOT

struct ImFontAtlasSnapshot
{
std::vector<uint8_t> data;
Expand Down
Loading