fix(build): always invoke resource compiler on windows, fixes #8164#8168
Merged
fix(build): always invoke resource compiler on windows, fixes #8164#8168
Conversation
Member
Author
|
Also, the actually weird thing here is that the app fails to start because of the missing dialog manifest, so we may have messed something up elsewhere too that now this is always required even without using the dialog plugin. |
amrbashir
approved these changes
Nov 6, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes a simple v1 merge error that caused winres/embed-resource to only be compiled if package.version was set in tauri.conf.json.
While i was at it i also removed the duplicate
if windowscheck.We may want to remove the icon path check to (== check for it only when setting the icon) so that the resource compiler still runs even if no icon is provided - may as well wait for a usecase for that though 🤷
Edit: Changed the
iflocation to only wrap the set_icon call to make that change a tiny bit easier.fixes #8164