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

Undefine wxHAS_XLOCALE_SUPPORT #5974

Merged
merged 1 commit into from Aug 28, 2017
Merged

Undefine wxHAS_XLOCALE_SUPPORT #5974

merged 1 commit into from Aug 28, 2017

Conversation

orbea
Copy link
Contributor

@orbea orbea commented Aug 24, 2017

After some system upgrades (glibc-2.26?) dolphin-emu will no longer build.

In file included from /tmp/SBo/dolphin-emu/Externals/wxWidgets3/src/common/string.cpp:39:0:
/tmp/SBo/dolphin-emu/Externals/wxWidgets3/include/wx/xlocale.h:44:18: fatal error: xlocale.h: No such file or directory
         #include <xlocale.h>
                  ^~~~~~~~~~~
compilation terminated.
make[2]: *** [Externals/wxWidgets3/CMakeFiles/wx.dir/build.make:4623: Externals/wxWidgets3/CMakeFiles/wx.dir/src/common/string.cpp.o] Error 1

I am informed this part of wxWidgets is not used by dolphin and so rather than fixing the issue, its easier to just disable it here. I am not sure this is the ideal way of doing it, but it now builds again.

#else
#undef wxHAS_XLOCALE_SUPPORT
#endif
/* This define is unused by dolphin. */

This comment was marked as off-topic.

@orbea
Copy link
Contributor Author

orbea commented Aug 24, 2017

Thanks for the suggestion, it works for me and I have implemented it.

@orbea
Copy link
Contributor Author

orbea commented Aug 24, 2017

As I don't use windows I am not sure what to do about the windows build fail?

@@ -465,7 +465,7 @@
//
// Recommended setting: 1 but may be disabled if you are writing programs
// running only in C locale anyhow
#define wxUSE_XLOCALE 1

This comment was marked as off-topic.

@orbea
Copy link
Contributor Author

orbea commented Aug 24, 2017

Changing it for windows is not really needed to work around a glibc issue in linux and as it does seem needed there so I changed it back. Maybe that will make the buildbot happy?

@leoetlino leoetlino merged commit 297c0c8 into dolphin-emu:master Aug 28, 2017
@orbea orbea deleted the wx branch August 28, 2017 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants