Merge pull request #12867 from AdmiralCurtiss/uicommon-dependency
CMake dependency fixes
This commit is contained in:
commit
5728ebf7ad
|
@ -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()
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue