Skip to content

fix: guard ARM-specific code behind NORNS_DESKTOP for x86 desktop builds#1876

Open
renderorange wants to merge 1 commit intomonome:mainfrom
renderorange:fix-desktop-build
Open

fix: guard ARM-specific code behind NORNS_DESKTOP for x86 desktop builds#1876
renderorange wants to merge 1 commit intomonome:mainfrom
renderorange:fix-desktop-build

Conversation

@renderorange
Copy link

The --desktop build mode was incomplete: ssd1322.c (NEON intrinsics), gpio.c, and -mfpu=neon were always compiled, breaking x86_64 builds. Properly exclude ARM hardware drivers and flags when building for desktop.

The --desktop build mode was incomplete: ssd1322.c (NEON intrinsics),
gpio.c, and -mfpu=neon were always compiled, breaking x86_64 builds.
Properly exclude ARM hardware drivers and flags when building for desktop.
Copy link
Member

@tehn tehn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for looking into this.

Would it not be simpler and cleaner to instead put all of the defines inside of ssd1322.c? So all the includes could stay, functions could get called but they'd just be returned.

Have you had success running the desktop build?

@renderorange
Copy link
Author

Thanks for looking into this.

Would it not be simpler and cleaner to instead put all of the defines inside of ssd1322.c? So all the includes could stay, functions could get called but they'd just be returned.

yeah, happy to work on those changes. I'll try to get into it over this coming weekend.

Have you had success running the desktop build?

yup, it seems to have built fine.

I'm not entirely sure my hacky attempt at enabling the keyboard controls were correct, so didn't get to test it out extensively. I got the interface to load and could move around, minimally. as for manipulating input sound, I didn't get that far.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants