Merge pull request #12867 from AdmiralCurtiss/uicommon-dependency

CMake dependency fixes
This commit is contained in:
Admiral H. Curtiss 2024-06-21 20:01:44 +02:00 committed by GitHub
commit 5728ebf7ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 4 deletions

View File

@ -779,7 +779,7 @@ if(MSVC)
endif() endif()
if(USE_RETRO_ACHIEVEMENTS) if(USE_RETRO_ACHIEVEMENTS)
target_link_libraries(core PRIVATE rcheevos) target_link_libraries(core PUBLIC rcheevos)
target_compile_definitions(core PRIVATE -DUSE_RETRO_ACHIEVEMENTS) target_compile_definitions(core PUBLIC -DUSE_RETRO_ACHIEVEMENTS)
target_compile_definitions(core PRIVATE -DRC_CLIENT_SUPPORTS_HASH) target_compile_definitions(core PUBLIC -DRC_CLIENT_SUPPORTS_HASH)
endif() endif()

View File

@ -28,6 +28,7 @@ add_library(uicommon
target_link_libraries(uicommon target_link_libraries(uicommon
PUBLIC PUBLIC
common common
core
cpp-optparse cpp-optparse
minizip::minizip minizip::minizip
pugixml pugixml

View File

@ -393,7 +393,7 @@ void OnScreenUI::DrawChallengesAndLeaderboards()
ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing)) ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoFocusOnAppearing))
{ {
for (const auto& value : leaderboard_progress) for (const auto& value : leaderboard_progress)
ImGui::Text(value.data()); ImGui::TextUnformatted(value.c_str());
} }
ImGui::End(); ImGui::End();
} }