mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-05-09 08:25:44 +02:00
[PR #114] [MERGED] Fix web simulator and binpack build #265
Labels
No labels
bug
duplicate
easy
enhancement
enhancement
fixed
fixed
good first issue
hard
invalid
pull-request
wontfix
wontfix
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/Upsilon#265
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/UpsilonNumworks/Upsilon/pull/114
Author: @Yaya-Cout
Created: 12/28/2021
Status: ✅ Merged
Merged: 12/28/2021
Merged by: @Lauryy06
Base:
upsilon-dev← Head:upsilon-dev-ci-fix📝 Commits (10+)
9935fbcTry to fix web simulator build5cc3db3Change emscriptem versionbb0ec16Change emscripten version150f8b5Update emscripten version91e7d62Fix micropython on emscriptenfc5c413Fix a bug in micropython on web simulatore945bd2Fix a warningb4767eeUpdate emscripten version0d1ea0cFix emscripten versiond2445deFix emscripten version📊 Changes
7 files changed (+9 additions, -52 deletions)
View changed files
📝
.github/workflows/ci-workflow.yml(+1 -1)📝
build/toolchain.emscripten.mak(+1 -1)📝
ion/src/device/n0110/flash.ld(+1 -1)📝
ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenevents.c(+1 -12)📝
ion/src/simulator/external/sdl/src/video/emscripten/SDL_emscriptenvideo.c(+4 -30)📝
python/port/mpconfigport.h(+1 -3)📝
python/port/port.cpp(+0 -4)📄 Description
This pull request fixes binpack building with a custom theme (I fixed it badly in #102) and the web simulator build (Thanks to @lolocomotive). I am sorry for the commits' name : I tested it on GitHub actions…
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.