Re: Revert all recent wxUSE_DPI_AWARE_MANIFEST-related changes (PR #23814)
VZ
@MaartenBent Sorry, I give up, MSVC makefiles still don't work and Qt/CMake build on appveyor fails too for some reason, so I'm just going to undo all these changes for now. Sorry for easting your time.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
This reverts 5d630ca (Make it enough to predefine only
wxUSE_DPI_AWARE_MANIFEST, 2023-08-23) and all the commits which tried to
fix the breakage caused by it.
While the original change had merit, it seems to be too difficult to fix
all our build systems to avoid embedding manifest when defining this in
the code, like samples/sample.rc does, so revert this change for now.
Maybe it can be reintroduced in the future after switching to some other
build system.
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/23814
Commit Summary
- d69ddb8 Revert all recent wxUSE_DPI_AWARE_MANIFEST-related changes
File Changes
(7 files)
- M build/cmake/functions.cmake (7)
- M docs/doxygen/mainpages/const_wxusedef.h (5)
- M include/wx/msw/wx.rc (10)
- M samples/minimal/CMakeLists.txt (7)
- M samples/minimal/minimal.vcxproj (40)
- M tests/test.vcxproj (42)
- M tests/test_gui.vcxproj (42)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/23814.patch
- https://github.com/wxWidgets/wxWidgets/pull/23814.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
I'd like to merge this soon to allow the other CI builds to pass, please let me know if you have any objections.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Maarten
The Qt/CMake build can be fixed my moving /MANIFEST:NO outside if (DEFINED wxUSE_DPI_AWARE_MANIFEST_VALUE) (which is only defined for WXMSW). I didn't look at the other error.
I'm fine with merging this PR.
Maybe you can create a new PR with the desired wxUSE_DPI_AWARE_MANIFEST changes, and we can fix the remaining issues there.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
Merged #23814 into master.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
I'm fine with merging this PR. Maybe you can create a new PR with the desired
wxUSE_DPI_AWARE_MANIFESTchanges, and we can fix the remaining issues there.
Yes, I should have done this from the beginning but I had totally failed to realize that this change was so disruptive.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.