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

feat(build): Use embed-resource for windows resource compilation #6760

Closed
wants to merge 1 commit into from

Conversation

Guiguiprim
Copy link

@Guiguiprim Guiguiprim commented Apr 20, 2023

First draft for resolving #6746

embed-resource has a better compiler detection that winres, this improves the cross compilation support.

Also remove the need for winres fork for the cross-compilation support.

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Docs
  • New Binding issue #___
  • Code style update
  • Refactor
  • Build-related changes
  • Other, please describe:

Does this PR introduce a breaking change?

  • Yes, and the changes were approved in issue #___
  • No

But it could by removing tauri_build::WindowsAttributes::sdk_dir() if integrated in 2.0.0, as is I only deprecated the API.

Checklist

  • When resolving issues, they are referenced in the PR's title (e.g fix: remove a typo, closes #___, #___)
  • A change file is added if any packages will require a version bump due to this PR per the instructions in the readme.
  • I have added a convincing reason for adding this feature, if necessary

Other information

@Guiguiprim Guiguiprim requested a review from a team as a code owner April 20, 2023 14:41
@Guiguiprim
Copy link
Author

This is the minimal approach to this fix, by keeping winres to generate the windows resource file.

@FabianLars suggested that we might want to change how this file is generated, maybe by mimicking the template mechanism used for WiX file. I'm open to explore this path if needed.

`embed-resource` has a better compiler detection that `winres`, this
improves the cross compilation support.

Also remove the need for `winres` fork for the cross-compilation support.
@Guiguiprim
Copy link
Author

This as been done elsewhere according to tauri-apps/winres#8 (comment) (And my initial bug is fixed in the last alpha)

@Guiguiprim Guiguiprim closed this May 24, 2023
@FabianLars
Copy link
Member

Yeah sorry for doing that behind your back! I wanted to fix cross-compilation for 1.3 at the last minute so i took a more drastic approach 😅

@Guiguiprim Guiguiprim deleted the gv/use-embed-resource branch June 15, 2023 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants