Skip to content
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.

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

fix: move trophy pngs to src/images #2519

Merged
merged 2 commits into from
Feb 24, 2025

Conversation

jardon
Copy link
Contributor

@jardon jardon commented Feb 23, 2025

move trophy pngs out of the resource directory and put them in src/images with the other image files

if these need to be in the resources folder for some reason, comment below.

@rainmakerv3
Copy link
Contributor

rainmakerv3 commented Feb 24, 2025

include(CMakeRC)
cmrc_add_resource_library(embedded-resources
ALIAS res::embedded
NAMESPACE res
${RESOURCEFOLDER})
target_link_libraries(shadps4 PRIVATE res::embedded)

This part would also have to be changed (as well as the path call to the icons if the trophy viewer icon PR gets merged). Otherwise it should work I think, but I would prefer waiting until if the PR is merged, and then I can properly ensure it won't break anything else

and you can also remove the second reference to ${RESOURCEFOLDER} if this is done

if (ENABLE_QT_GUI)
qt_add_executable(shadps4
${AUDIO_CORE}
@@ -971,7 +965,6 @@ if (ENABLE_QT_GUI)
${SHADER_RECOMPILER}
${VIDEO_CORE}
${EMULATOR}
${RESOURCEFOLDER}
src/images/shadPS4.icns
)
else()
add_executable(shadps4
${AUDIO_CORE}
${IMGUI}
${INPUT}
${COMMON}
${CORE}
${SHADER_RECOMPILER}
${VIDEO_CORE}
${EMULATOR}
${RESOURCEFOLDER}
src/main.cpp
src/emulator.cpp
src/emulator.h
src/sdl_window.h
src/sdl_window.cpp

@jardon
Copy link
Contributor Author

jardon commented Feb 24, 2025

sure.

we can either wait until your PR is merged or you can rebase on my branch. im okay with either

@jardon
Copy link
Contributor Author

jardon commented Feb 24, 2025

And if you really wanna nest them in a folder, I think src/images/trophies is more appropriate. Only being used in one place doesn't justify storing them in an arbitrary, non-descriptive folder in the root of the project.

But that's just my perspective. I'm open to other opinions

@rainmakerv3
Copy link
Contributor

And if you really wanna nest them in a folder, I think src/images/trophies is more appropriate. Only being used in one place doesn't justify storing them in an arbitrary, non-descriptive folder in the root of the project.

But that's just my perspective. I'm open to other opinions

Yes, I'm inclined to agree. Maybe let's wait until the PR is merged, and then I'll help out with this if it is

@rainmakerv3
Copy link
Contributor

hi @jardon , can your rebase now that the new fixed trophy icon PR is merged? after that I can PR my changes to your branch

@jardon jardon force-pushed the fix/move-trophy-pngs branch from f7fb099 to ba9d57b Compare February 24, 2025 13:01
@jardon jardon marked this pull request as draft February 24, 2025 13:01
@jardon
Copy link
Contributor Author

jardon commented Feb 24, 2025

@rainmakerv3 feel free to send in a PR to my branch

@jardon jardon marked this pull request as ready for review February 24, 2025 14:20
@georgemoralis georgemoralis merged commit 15d10e4 into shadps4-emu:main Feb 24, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants