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

Remove non-essential Windows x86 deps builds #196

Merged
merged 4 commits into from
Aug 22, 2024

Conversation

PatTheMav
Copy link
Member

Description

Removes x86 slices of most Windows dependencies, with the exception of Detours and Vulkan, which are both needed for capture plugins.

Motivation and Context

Deprecate all traces of standalone x86 OBS Studio versions.

How Has This Been Tested?

Tested on Windows 11 VM.

Types of changes

  • Code cleanup (non-breaking change which makes code smaller or more readable)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@RytoEX RytoEX changed the title Windows x86 deprecation Remove non-essential Windows x86 deps builds Jun 30, 2023
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do the first two commits individually work in the absence of the third commit? It looks like they should, but I wanted to confirm.

Commit message nit:

  • detours -> Detours

@PatTheMav
Copy link
Member Author

Do the first two commits individually work in the absence of the third commit? It looks like they should, but I wanted to confirm.

Commit message nit:

  • detours -> Detours

They should, yeah.

@PatTheMav PatTheMav force-pushed the windows-x86-deprecation branch from ef2e759 to deaa106 Compare July 1, 2023 14:41
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine. The one thing to watch out for is that it will become impossible to do full 32-bit builds in legacy CMake, so it may be helpful (though perhaps not required) to have instructions for a slim 32-bit build with just the win-capture and win-dshow components.

@PatTheMav PatTheMav force-pushed the windows-x86-deprecation branch from deaa106 to 7486d8f Compare July 15, 2023 14:33
@RytoEX
Copy link
Member

RytoEX commented Jul 17, 2023

Per off-thread discussion, we're going to hold off on merging this change because removing the x86 Windows deps would make doing complete Windows legacy CMake builds of obs-studio a bit burdensome. We'll remove the x86 Windows deps once we remove the legacy CMake.

@RytoEX RytoEX marked this pull request as draft July 17, 2023 15:29
@PatTheMav PatTheMav force-pushed the windows-x86-deprecation branch from 7486d8f to 39f6075 Compare July 27, 2023 14:05
@PatTheMav PatTheMav force-pushed the windows-x86-deprecation branch from 39f6075 to 5706bcf Compare September 11, 2023 13:40
@RytoEX RytoEX self-assigned this Aug 21, 2024
@PatTheMav PatTheMav force-pushed the windows-x86-deprecation branch from 5706bcf to c80020d Compare August 21, 2024 11:22
Windows builds with the CMake 3.0 build system only require Detours
and Vulkan libraries for the x86 modules.
@PatTheMav PatTheMav force-pushed the windows-x86-deprecation branch from c80020d to c18f08e Compare August 21, 2024 14:55
@PatTheMav PatTheMav force-pushed the windows-x86-deprecation branch from c18f08e to 8ea352b Compare August 21, 2024 15:01
@PatTheMav PatTheMav marked this pull request as ready for review August 21, 2024 16:36
@RytoEX
Copy link
Member

RytoEX commented Aug 22, 2024

Can this be merged before #190?

@PatTheMav
Copy link
Member Author

Can this be merged before #190?

Yep, I kinda expected it to even.

@RytoEX
Copy link
Member

RytoEX commented Aug 22, 2024

Let's cut down CI's workload then.

@RytoEX RytoEX merged commit 6dd3e92 into obsproject:master Aug 22, 2024
17 checks passed
@PatTheMav PatTheMav deleted the windows-x86-deprecation branch September 12, 2024 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants