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

Fix Windows cross build #2897

Merged
merged 2 commits into from
Aug 10, 2022
Merged

Fix Windows cross build #2897

merged 2 commits into from
Aug 10, 2022

Conversation

GustavoLCR
Copy link
Contributor

Your checklist for this pull request

  • I've read the guidelines for contributing to this repository
  • I made sure to follow the project's coding style
  • I've documented or updated the documentation of every function and struct this PR changes. If not so I've explained why.
  • I've added tests that prove my fix is effective or that my feature works (if possible)
  • I've updated the rizin book with the relevant information (if needed)

Detailed description

Building for Windows ARM64 broke, this fixes it.

Test plan

Tested manually

Closing issues

None

* Fixes `rz_util/rz_version.h`->`rz_types.h`->`rz_userconf.h`->`rz_util/rz_version.h`
@@ -513,7 +513,7 @@ if packager_version != ''
endif
rz_version_h = configure_file(
input: 'librz/include/rz_version.h.in',
output: 'rz_version.h',
output: 'rz_build_version.h',
Copy link
Member

Choose a reason for hiding this comment

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

The build should work even if there are 2 different rz_version.h files because they are in different folders (one is in include/ and one is in include/rz_util/), but I'm fine with renaming one of them.

@XVilka XVilka merged commit c40744e into rizinorg:dev Aug 10, 2022
@GustavoLCR GustavoLCR deleted the fix-cross-build branch August 15, 2022 02:29
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.

4 participants