WIP: externals: Improve bundled libraries support and update to Qt6 #5

Draft

Lui798 wants to merge 20 commits from qt6-build-overhaul into main

pull from: qt6-build-overhaul

merge into: Lui798:main

Lui798:main

Lui798:upstream-fork/qt6-build-overhaul

Lui798:upstream/master

Lui798:feat/area-scaling

Lui798:feat/firmware-avatar-selector

Conversation 0 Commits 20 Files changed 40 +732 -740

Lui798 commented 2024-10-09 00:51:42 -05:00

Owner

Copy link

Porting Citra's improvements to the CMake/build process and updates for Qt6.

These commits and more...
git.leuen.casa/citra-emu/citra@71a9981430
git.leuen.casa/citra-emu/citra@ea649263b7
git.leuen.casa/citra-emu/citra@2273df4d70
git.leuen.casa/citra-emu/citra@2d6aca4563
git.leuen.casa/citra-emu/citra@9d4609e29a
git.leuen.casa/citra-emu/citra@9e898bca06

Porting Citra's improvements to the CMake/build process and updates for Qt6. These commits and more... https://git.leuen.casa/citra-emu/citra/commit/71a9981430447cc76dc7d7555d3db677b4e0bdf4 https://git.leuen.casa/citra-emu/citra/commit/ea649263b752f9b73f1627ef9784ced19fe245bb https://git.leuen.casa/citra-emu/citra/commit/2273df4d70e2745853e661dcf676373518fb04fb https://git.leuen.casa/citra-emu/citra/commit/2d6aca45635ffcafd28cf6ccf26018edf85c4651 https://git.leuen.casa/citra-emu/citra/commit/9d4609e29aeb0924b2503a61583471c67ccd5702 https://git.leuen.casa/citra-emu/citra/commit/9e898bca06f87cb4a9fa3e70144ca378885e40bd

Lui798 added 10 commits 2024-10-09 00:51:42 -05:00

externals: statically link sdl2 4d1d5d61c7

cmake: remove compiler optimization options for now as they're broken af51839bb5

build: use aqt to download bundled qt a47ef23d18

add support for macos aqt binary b291071b50

qt6 upgrade part 1 673d080aab

qt6 upgrade part 2 34778f8c69

bump moltenvk to 1.2.10-rc2 55a8b699d0

qt: let high dpi rounding policy always default to PassThrough ... 09301fa1e9

It works good on Windows with Qt6, and was always PassThrough on other platforms already.

qt: make 'reset window size' options use real pixel size 57834d40b7

remove cross-compile workaround to simplify things 013e85be9b

Lui798 added 1 commit 2024-10-09 01:19:31 -05:00

replace usage of windows_copy_files with a post-build cmake copy b73d804537

Lui798 added 1 commit 2024-10-09 17:58:37 -05:00

externals: improve bundling logic for ffmpeg eee0276e25

Lui798 added 2 commits 2024-10-09 23:11:55 -05:00

qt: update cmake translation targets ab6bc9aeb9

externals: update fmt to 11.0.2 aa0b746611

Lui798 force-pushed qt6-build-overhaul from aa0b746611 to bc01c1287b 2024-10-10 02:15:57 -05:00 Compare

Lui798 added 2 commits 2024-10-13 11:42:29 -05:00

cmake: add qtserialport module to aqt download 6ac49cd08c

Revert "qt: update cmake translation targets" ... 3d66568055

This reverts commit 189e83107a.

Lui798 force-pushed qt6-build-overhaul from 3d66568055 to d78a4d49b0 2024-10-13 11:42:52 -05:00 Compare

Lui798 added 2 commits 2024-10-16 14:43:38 -05:00

cmake: add back compiler optimization flags for msvc 910ddfb62d

externals: update catch2 to 3.7.1 71943a5964

Lui798 added 2 commits 2024-10-16 22:48:22 -05:00

cmake: enable SDL_LIBC for msvc to fix compiling with LTO c5465f3251

qt: update cmake translation targets 94c1e8e30d

Lui798 added 1 commit 2024-10-17 15:24:58 -05:00

qt: add support for Qt6 versions lower than 6.7 a894a8c21d

Lui798 added 1 commit 2024-10-17 15:36:52 -05:00

qt: add support for Qt6 versions lower than 6.5 c06e4452f5

Lui798 force-pushed qt6-build-overhaul from c06e4452f5 to 8f8adac06e 2024-10-17 15:45:11 -05:00 Compare

This pull request is marked as a work in progress.

This branch is out-of-date with the base branch

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin qt6-build-overhaul:qt6-build-overhaul

git switch qt6-build-overhaul

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff qt6-build-overhaul

git switch qt6-build-overhaul

git rebase main

git switch main

git merge --ff-only qt6-build-overhaul

git switch qt6-build-overhaul

git rebase main

git switch main

git merge --no-ff qt6-build-overhaul

git switch main

git merge --squash qt6-build-overhaul

git switch main

git merge --ff-only qt6-build-overhaul

git switch main

git merge qt6-build-overhaul

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

Lui798/torzu!5

No description provided.