diff --git a/CMakeLists.txt b/CMakeLists.txt index ce4c9bf93..0437c0ebb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -977,7 +977,6 @@ else() ${SHADER_RECOMPILER} ${VIDEO_CORE} ${EMULATOR} - ${RESOURCEFOLDER} src/main.cpp src/emulator.cpp src/emulator.h @@ -1110,7 +1109,10 @@ include(CMakeRC) cmrc_add_resource_library(embedded-resources ALIAS res::embedded NAMESPACE res - ${RESOURCEFOLDER}) + src/images/bronze.png + src/images/gold.png + src/images/platinum.png + src/images/silver.png) target_link_libraries(shadps4 PRIVATE res::embedded) diff --git a/src/core/libraries/np_trophy/trophy_ui.cpp b/src/core/libraries/np_trophy/trophy_ui.cpp index 2b909e5cf..efa02e9c4 100644 --- a/src/core/libraries/np_trophy/trophy_ui.cpp +++ b/src/core/libraries/np_trophy/trophy_ui.cpp @@ -33,13 +33,13 @@ TrophyUI::TrophyUI(const std::filesystem::path& trophyIconPath, const std::strin std::string pathString; if (trophy_type == "P") { - pathString = "Resources/platinum.png"; + pathString = "src/images/platinum.png"; } else if (trophy_type == "G") { - pathString = "Resources/gold.png"; + pathString = "src/images/gold.png"; } else if (trophy_type == "S") { - pathString = "Resources/silver.png"; + pathString = "src/images/silver.png"; } else if (trophy_type == "B") { - pathString = "Resources/bronze.png"; + pathString = "src/images/bronze.png"; } auto resource = cmrc::res::get_filesystem(); diff --git a/src/qt_gui/trophy_viewer.cpp b/src/qt_gui/trophy_viewer.cpp index 9a0f33eed..63e9f04dd 100644 --- a/src/qt_gui/trophy_viewer.cpp +++ b/src/qt_gui/trophy_viewer.cpp @@ -123,7 +123,7 @@ void TrophyViewer::PopulateTrophyWidget(QString title) { QTableWidgetItem* typeitem = new QTableWidgetItem(); auto resource = cmrc::res::get_filesystem(); - std::string resourceString = "Resources/" + filename; + std::string resourceString = "src/images/" + filename; auto file = resource.open(resourceString); std::vector imgdata(file.begin(), file.end()); QImage type_icon = QImage::fromData(imgdata).scaled(QSize(64, 64), Qt::KeepAspectRatio,