Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

Re-applying patches with Android workaround #1303

Merged
merged 2 commits into from Aug 21, 2018
Merged

Re-applying patches with Android workaround #1303

merged 2 commits into from Aug 21, 2018

Conversation

AbandonedCart
Copy link
Contributor

No description provided.

@CLAassistant
Copy link

CLAassistant commented Aug 20, 2018 •
edited

CLA assistant check
All committers have signed the CLA.

@skmp
Copy link
Owner

skmp commented Aug 20, 2018

This pull request fixes 1 alert when merging ec077f9 into 223cd74 - view on LGTM.com

fixed alerts:

  • 1 for Too few arguments to formatting function

Comment posted by LGTM.com

@skmp
Copy link
Owner

skmp commented Aug 20, 2018

This pull request fixes 1 alert when merging 65d44c6 into 223cd74 - view on LGTM.com

fixed alerts:

  • 1 for Too few arguments to formatting function

Comment posted by LGTM.com

@skmp
Copy link
Owner

skmp commented Aug 20, 2018

This pull request fixes 1 alert when merging 68ce118 into 223cd74 - view on LGTM.com

fixed alerts:

  • 1 for Too few arguments to formatting function

Comment posted by LGTM.com

@AbandonedCart
Copy link
Contributor Author

@skmp AppVeyor is broken

C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.Cpp.Platform.targets(57,5): error MSB8020: The build tools for v141 (Platform Toolset = 'v141') cannot be found. To build using the v141 build tools, please install v141 build tools. Alternatively, you may upgrade to the current Visual Studio tools by selecting the Project menu or right-click the solution, and then selecting "Retarget solution". [C:\projects\reicast-emulator\shell\reicast.vcxproj]

@baka0815
Copy link
Contributor

v141 is VS 2017, we use 2013 AFAIK?

@AbandonedCart
Copy link
Contributor Author

3579c9a

2015

@AbandonedCart
Copy link
Contributor Author

...might as well also fix the Android formatting while I'm in there.

@skmp
Copy link
Owner

skmp commented Aug 20, 2018

This pull request fixes 1 alert when merging ca510c1 into 223cd74 - view on LGTM.com

fixed alerts:

  • 1 for Too few arguments to formatting function

Comment posted by LGTM.com

@AbandonedCart
Copy link
Contributor Author

@dmiller423 https://cla-assistant.io/reicast/reicast-emulator?pullRequest=1303

dmiller423 and others added 2 commits August 20, 2018 23:49
@dmiller423 @AbandonedCart
ngen_mainloop for x86 updated to use PC value from context, CDI warning
1a4f597 
and removed redundant header causing build failure on libwebsockets (VS)
@AbandonedCart
Android: Improve msgbox, printf cdi workaround
8f82e92 
This partially reverts commit 405909bf91304db275dde4d163befa8fc654874f.
@AbandonedCart AbandonedCart merged commit c5a9577 into master Aug 21, 2018
@AbandonedCart AbandonedCart deleted the msgbox branch August 21, 2018 04:06
@skmp
Copy link
Owner

skmp commented Aug 21, 2018

This pull request fixes 1 alert when merging 8f82e92 into 7ff9d0e - view on LGTM.com

fixed alerts:

  • 1 for Too few arguments to formatting function

Comment posted by LGTM.com

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@AbandonedCart @CLAassistant @skmp @baka0815 @dmiller423