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

install icons to /usr/share and load them from there #4078

Merged
merged 3 commits into from Jan 19, 2018

Conversation

@hcorion
Copy link
Member

@hcorion hcorion commented Jan 18, 2018

This also installs GuiConfigs but we don't load them from /usr/share yet.
This fixes Vulkan freezing at start on linux, and makes the icons show up in the new rsx overlay.
Font loading has yet to be fixed on arch-based distros.

char result[ PATH_MAX ];
ssize_t count = readlink( "/proc/self/rpcs3", result, PATH_MAX );
auto executablePath = std::string( result, (count > 0) ? count : 0 );
info = std::make_unique<image_info>((executablePath + "../share/Icons/ui/" + res).c_str());
Copy link
Contributor

@unrelentingtech unrelentingtech Jan 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see a dirname call… doesn't this result in something like /usr/local/bin/rpcs3../share/Icons/ui/something?

if (info->data == nullptr)
{
char result[ PATH_MAX ];
ssize_t count = readlink( "/proc/self/rpcs3", result, PATH_MAX );
Copy link
Contributor

@unrelentingtech unrelentingtech Jan 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is /proc/self/rpcs3 a thing? o_0 Just looked at /proc/self on an Arch VM, the only symlink there is exe.

So should be something like:

#ifdef __linux__
"/proc/self/exe"
#elif __FreeBSD__
"/proc/curproc/file"
#endif

Copy link
Member Author

@hcorion hcorion Jan 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

derp, thanks. Will the FreeBSD ifdef be the only BSD one I need?

Copy link
Contributor

@unrelentingtech unrelentingtech Jan 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if any others are running RPCS3, but I guess you can make that just else.

@hcorion hcorion force-pushed the load-icons-from-usr-share branch 2 times, most recently from a3cb92a to b2a9284 Jan 18, 2018
@kd-11 kd-11 merged commit 49e64b9 into RPCS3:master Jan 19, 2018
2 checks passed
@micaelis72
Copy link

@micaelis72 micaelis72 commented Jan 19, 2018

Folks, I found a little bug. When installing Atellier Escha & Logy, using the native interface, the instalation starts before finding a controller, breaking the installation giving an error in the dialog -3. If it's needed, I can provide logs of this! Let me know if it's necessary.

@AniLeo
Copy link
Member

@AniLeo AniLeo commented Jan 19, 2018

Discuss on #4072 , not here

@micaelis72
Copy link

@micaelis72 micaelis72 commented Jan 19, 2018

Sorry @AniLeo , I'll paste this information there

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants