Skip to content

Conversation

@sbx320
Copy link
Member

@sbx320 sbx320 commented Apr 18, 2019

Note: Not quite done yet, requires premake update for Linux (and Mac? @qaisjp) as well as some update to the internal build pipeline and most likely CI as well

Update premake5 (windows only)
Fix invalid SAFESEH:NO specifiers
Fix C++17-related compile errors
@sbx320 sbx320 added the enhancement New feature or request label Apr 18, 2019
@sbx320 sbx320 self-assigned this Apr 18, 2019
@qaisjp
Copy link
Contributor

qaisjp commented Apr 24, 2019

(and Mac? @qaisjp)

Nope, Mac doesn't work yet.

@qaisjp
Copy link
Contributor

qaisjp commented Apr 25, 2019

accidental rebased master pull from upstream?

@sbx320
Copy link
Member Author

sbx320 commented Apr 25, 2019

I have no idea what actually happened.

@qaisjp
Copy link
Contributor

qaisjp commented Apr 26, 2019

I have no idea what actually happened.

those commits from master aren't the actual commits (different hashes), so if you do git rebase -i 08c0267 and then replace each pick in pick sha1hashofoldcommit with d (drop), then do a git push --force, you can get rid of those commits

@sbx320
Copy link
Member Author

sbx320 commented Apr 27, 2019

The entire rebase was very weird, with git telling me I haven't resolved all conflicts (despite git status not showing anything. I'll most likely just squash everything together anyway.

@sbx320 sbx320 marked this pull request as ready for review April 27, 2019 05:03
@sbx320 sbx320 merged commit 93d0103 into master Apr 27, 2019
@patrikjuvonen patrikjuvonen added this to the 1.5.7 milestone Apr 27, 2019
@jushar jushar deleted the feature/c++17 branch May 4, 2019 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants