WIP: Adding premake4.lua, minor adjustments #588

Draft

assarbad wants to merge 1 commit from assarbad/premake4-vs-project-generation into develop

assarbad commented

2022-03-16 18:38:47 -05:00

(Migrated from github.com)

The premake4.lua was superficially tested for now
Spelling fix in tomcrypt_cfg.h
Using my changes to libtommath as template to fix up rng_get_bytes.c

This is just a draft at this point, I'll further hone this. But this way people can see and use it in its preliminary state.

NB: companion issue to this one: libtommath#525

- The premake4.lua was superficially tested for now - Spelling fix in tomcrypt_cfg.h - Using my changes to libtommath as template to fix up rng_get_bytes.c This is just a draft at this point, I'll further hone this. But this way people can see and use it in its preliminary state. **NB:** companion issue to [this one: libtommath#525](https://github.com/libtom/libtommath/pull/525)

This pull request has changes conflicting with the target branch.

.gitignore

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'WIP: Adding premake4.lua, minor adjustments' (#588) from assarbad/premake4-vs-project-generation into develop

Merge commit body

Reviewed-on: https://git.richey.dev/gh-libtom/libtomcrypt/pulls/588

Merge pull request 'WIP: Adding premake4.lua, minor adjustments' (#588) from assarbad/premake4-vs-project-generation into develop

Reviewed-on: https://git.richey.dev/gh-libtom/libtomcrypt/pulls/588

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 'assarbad/premake4-vs-project-generation:assarbad/premake4-vs-project-generation'

git switch 'assarbad/premake4-vs-project-generation'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'develop'

git merge --no-ff 'assarbad/premake4-vs-project-generation'

git switch 'assarbad/premake4-vs-project-generation'

git rebase 'develop'

git switch 'develop'

git merge --ff-only 'assarbad/premake4-vs-project-generation'

git switch 'assarbad/premake4-vs-project-generation'

git rebase 'develop'

git switch 'develop'

git merge --no-ff 'assarbad/premake4-vs-project-generation'

git switch 'develop'

git merge --squash 'assarbad/premake4-vs-project-generation'