Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

android: build c++ native libraries #4450

Merged
merged 3 commits into from Nov 20, 2018

Conversation

Projects
None yet
4 participants
@BreadFish64
Copy link
Contributor

BreadFish64 commented Nov 19, 2018

This change is Reviewable

SachinVin and others added some commits Oct 19, 2018

core: undef PAGE_SIZE and PAGE_MASK
these are defined a system header which causes complications when building for android

@wwylele wwylele force-pushed the BreadFish64:android3 branch from b6447d2 to f4472a1 Nov 20, 2018

@wwylele wwylele merged commit aa168b4 into citra-emu:master Nov 20, 2018

2 of 3 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
ci/bitrise/4ccd8e5720f0d13b/pr Passed - citra
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@lioncash

This comment has been minimized.

Copy link
Member

lioncash commented Nov 21, 2018

fwiw, a more proper fix for the undefing situation would be to just rename or lowercase the constants instead of undefing the preprocessor tokens.

@wwylele

This comment has been minimized.

Copy link
Member

wwylele commented Nov 21, 2018

Yes, it was my idea to temporarily use the #undef method to avoid conflicting with my current work on Memory.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.