m5/MicroPythonOS
0
0
Fork 0
mirror of https://github.com/m5stack/MicroPythonOS.git synced 2026-05-20 11:51:27 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix desktop build

Browse Source
This commit is contained in:
Thomas Farstrike
2025-11-22 11:19:35 +01:00
parent 2fc6331c7b
commit fd4fda0e4a
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal_filesystem/boot.py
+4 -4
View File
@@ -1,9 +1,9 @@
# This file is the only one that can't be overridden (without rebuilding) for development, so keep it minimal.
# This file is the only one that can't be overridden (without rebuilding) for development because it's not in lib/, so keep it minimal.
# Make sure the storage partition's /lib is first in the path, so whatever is placed there overrides frozen libraries
# This allows a "prod[uction]" build to be used for development as well, just by overriding the libraries in /lib
# Make sure the storage partition's lib/ is first in the path, so whatever is placed there overrides frozen libraries.
# This allows any build to be used for development as well, just by overriding the libraries in lib/
import sys
sys.path.insert(0, '/lib')
sys.path.insert(0, 'lib')
print("Passing execution over to MicroPythonOS's main.py")
import mpos.main
scripts/build_mpos.sh
+1 -3
View File
@@ -98,13 +98,11 @@ if [ "$target" == "esp32" ]; then
elif [ "$target" == "unix" -o "$target" == "macOS" ]; then
manifest=$(readlink -f "$codebasedir"/manifests/manifest.py)
frozenmanifest="FROZEN_MANIFEST=$manifest"
# build for desktop
#python3 make.py "$target" DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest"
# LV_CFLAGS are passed to USER_C_MODULES
# STRIP= makes it so that debug symbols are kept
pushd "$codebasedir"/lvgl_micropython/
# USER_C_MODULE doesn't seem to work properly so there are symlinks in lvgl_micropython/extmod/
python3 make.py "$target" LV_CFLAGS="-g -O0 -ggdb -ljpeg" STRIP= DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$manifest"
python3 make.py "$target" LV_CFLAGS="-g -O0 -ggdb -ljpeg" STRIP= DISPLAY=sdl_display INDEV=sdl_pointer INDEV=sdl_keyboard "$frozenmanifest"
popd
else
echo "invalid target $target"
scripts/install.sh
+2 -2
View File
@@ -52,8 +52,8 @@ find apps/ -maxdepth 1 -type l | while read symlink; do
done
echo "Unmounting builtin/ so that it can be customized..." # not sure this is necessary
$mpremote exec "import os ; os.umount('/builtin')"
#echo "Unmounting builtin/ so that it can be customized..." # not sure this is necessary
#$mpremote exec "import os ; os.umount('/builtin')"
$mpremote fs cp -r builtin :/
$mpremote fs cp -r lib :/