Corrected handling of YASM binary. Defined ASM_NASM environment variable.#13
Merged
Sibras merged 2 commits intoShiftMediaProject:masterfrom Jan 12, 2024
Merged
Corrected handling of YASM binary. Defined ASM_NASM environment variable.#13Sibras merged 2 commits intoShiftMediaProject:masterfrom
Sibras merged 2 commits intoShiftMediaProject:masterfrom
Conversation
…which may be read-only. Minor corrections.
Sibras
reviewed
Jan 10, 2024
Comment on lines
+344
to
+348
| :Finalize | ||
| REM Define ASM_NASM for usage with CMake unless already defined | ||
| if "%ASM_NASM%"=="" ( | ||
| powershell.exe -Command "[Environment]::SetEnvironmentVariable('ASM_NASM', '%VCINSTALLDIR%\yasm.exe', 'Machine')" | ||
| ) |
Member
There was a problem hiding this comment.
This probably shouldnt be here. For one there is a seperate installer for nasm so we shouldnt be setting a nasm vriable in a yasm install script
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.
Don't delete a bundled YASM binary.
Don't write to the script folder which may be read-only.
Minor corrections.
Define ASM_NASM environment variable for usage with CMake unless already defined.
Defining ASM_NASM is needed in our environment, but I don't know whether it is appropriate in general. So, I put this feature into a separate commit.