Add initial support for Windows ARM64#227
Add initial support for Windows ARM64#227anthony-linaro wants to merge 2 commits intoglikely:mainfrom
Conversation
|
Not entirely sure what's going on with macOS there, and I don't have a machine set up for it. It appears an empty list is being passed to |
|
I found the problem. Cmake option ENABLE_UI was renamed to ENABLE_FRONTEND in upstream obs-studio obsproject/obs-studio@7db4a75, meaning that the frontend isn't getting disabled in the deps build. That seems to be fine on Windows and Linux, but it appears to break the macos build. I suspect macos is broken with ENABLE_FRONTEND=TRUE and ENABLE_PLUGINS=FALSE. Here is the fix: |
e5f14bd to
3fb5320
Compare
|
I have reworked the commits and added your patch - hopefully the CI passes now! |
|
Thanks Anthony. I’ll take a look at the changes tomorrow. You can squash the ENABLE_FRONTEND patch into the dependencies update patch. If it is kept separate then the series won’t build cleanly when bisecting |
glikely
left a comment
There was a problem hiding this comment.
Looks good. There are a few small comments I've made, all pretty minor.
I won't be able to merge this into mainline yet because of the uprev to qt 6.8. Doing so will break running the plugin with OBS Studio 31.0.x because it is on qt 6.6 and the qtserialport dll will fail to load. If you send me a separate PR with just the first commit, then I can merge that into mainline and any further updates to this PR will automatically build instead of waiting for my approval each time.
3fb5320 to
cbb5421
Compare
These versions align with the current main branch of OBS Signed-off-by: Anthony Roberts <anthony.roberts@linaro.org>
As x64 dependencies are currently also required for these builds due to Qt being cross-compiled, an extra check is added, to ensure that an x64 configure has been done prior to trying to configure/build for ARM64. As such, the deps folder in Windows now has the arch appended to it, so that both can be present in the same folder. `qtserialport` is disabled for this platform, as it had issues being compiled. It is possible to work around it (it is also related to setting QT_HOST_PATH), but needs a closer look at a later date. Signed-off-by: Anthony Roberts <anthony.roberts@linaro.org>
cbb5421 to
ba96bc8
Compare
This PR adds support for building the plugin natively for Windows ARM64.
Had to switch buildspec to use my own fork, as the cmake in the main OBS tree blocks newer python. I suspect this is an oversight by OBS, as they have removed the limit elsewhere. For continuity, I would recommend pushing my changes to your own fork so that your code is not dependent on mine.
No CI as of yet, the scripts need a little bit of tweaking for the new GHA runners (lots of assumptions of Windows == x64).
Steps to test this is working:
cmake --preset windows-x64cmake --preset windows-arm64cmake --build --preset windows-arm64cmake --install build_arm64 --prefix ./install --config RelWithDebInfo