Cairo: Add support for Cygwin DLL (PR #26207)
Carlo Bramini
This patch just adds the right name of the Cairo shared library on CYGWIN.
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/26207
Commit Summary
- 9c037ec Cairo: Add support for Cygwin DLL
File Changes
(1 file)
- M src/common/cairo.cpp (2)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/26207.patch
- https://github.com/wxWidgets/wxWidgets/pull/26207.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
> @@ -330,6 +330,8 @@ wxCairo::wxCairo()
#ifdef __WXMSW__
wxString cairoDllStr("libcairo-2.dll");
+#elif defined(__CYGWIN__)
Hmm, isn't __WXMSW__ defined for Cygwin too? I.e. shouldn't this be before the test for __WXMSW__?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
I can cherry pick this commit to 3.2, no problem.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Carlo Bramini
@carlo-bramini commented on this pull request.
> @@ -330,6 +330,8 @@ wxCairo::wxCairo()
#ifdef __WXMSW__
wxString cairoDllStr("libcairo-2.dll");
+#elif defined(__CYGWIN__)
Hmm, isn't
__WXMSW__defined for Cygwin too? I.e. shouldn't this be before the test for__WXMSW__?
I'm not expert of wxWidgets internal code, but probably __WXMSW__ is not.
Actually, I built both 3.2.9 and 3.3.1 with Gtk+3 and Qt5.
I have seen that __WXGTK20__ / __WXGTK__ and __WXQT__ exist in the code, so I suspect that __WXMSW__ won't be declared in those cases, is it correct?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
> @@ -330,6 +330,8 @@ wxCairo::wxCairo()
#ifdef __WXMSW__
wxString cairoDllStr("libcairo-2.dll");
+#elif defined(__CYGWIN__)
Yes, if you build wxGTK or wxQT, __WXMSW__ won't be defined. But if you build wxMSW with Cygwin, it would be. But I don't actually know which DLL we want to use for Cygwin build of wxMSW...
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Carlo Bramini
@carlo-bramini commented on this pull request.
> @@ -330,6 +330,8 @@ wxCairo::wxCairo()
#ifdef __WXMSW__
wxString cairoDllStr("libcairo-2.dll");
+#elif defined(__CYGWIN__)
Thank you very much, I updated the patch according to your request.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.