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

tweak(client): remove non-ASLR game executables #2368

Merged
merged 1 commit into from
Mar 27, 2024

Conversation

blattersturm
Copy link
Contributor

Since b6cc153 blocks the client from running on Windows 7 or 8, these builds aren't needed anymore, as they served as a workaround for Windows before 8.1 not supporting high-entropy virtual addresses, leading to the logic in hook::get_unadjusted not working.

When merging this PR, keep in mind:

  1. The change in sticky should be mirrored in adhesive in fivem-private as well.
  2. If incremental builds do not remove old binary artifacts, the non-ASLR binaries should be removed manually.

Goal of this PR

Clean up the build output and remove unneeded executables.

How is this PR achieving the goal

Dropping the unneeded non-ASLR builds.

This PR applies to the following area(s)

FiveM, RedM

Successfully tested on

Game builds: 3095
Platforms: Windows

Checklist

  • Code compiles and has been tested successfully.
  • Code explains itself well and/or is documented.
  • My commit message explains what the changes do and what they are for.
  • No extra compilation warnings are added by these changes.

Fixes issues

N/A

Since b6cc153 blocks the client from
running on Windows 7 or 8, these builds aren't needed anymore.
@thorium-cfx thorium-cfx added the triage Needs a preliminary assessment to determine the urgency and required action label Feb 12, 2024
@gottfriedleibniz gottfriedleibniz added ready-to-merge This PR is enqueued for merging and removed triage Needs a preliminary assessment to determine the urgency and required action labels Mar 22, 2024
@gottfriedleibniz
Copy link
Contributor

launcherpersonality_inner could be renamed to launcherpersonality since the indirection is not required anymore. That can be done at another time.

@thorium-cfx thorium-cfx added the has-dependencies Blocked by or requires another change, read PR description. label Mar 27, 2024
@thorium-cfx thorium-cfx merged commit b5ed6d6 into citizenfx:master Mar 27, 2024
1 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
has-dependencies Blocked by or requires another change, read PR description. ready-to-merge This PR is enqueued for merging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants