unix build works

ThomasFarstrike · ThomasFarstrike · commit 899319c27eea · 2025-10-24T17:02:20.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,13 @@
+[submodule "freezeFS"]
+	path = freezeFS
+	url = https://github.com/MicroPythonOS/freezeFS
+[submodule "secp256k1-embedded-ecdh"]
+	path = secp256k1-embedded-ecdh
+	url = https://github.com/MicroPythonOS/secp256k1-embedded-ecdh
+	branch = micropython_1.25.0
+[submodule "lvgl_micropython"]
+	path = lvgl_micropython
+	url = https://github.com/MicroPythonOS/lvgl_micropython
+[submodule "micropython-camera-API"]
+	path = micropython-camera-API
+	url = https://github.com/cnadler86/micropython-camera-API
diff --git a/freezeFS b/freezeFS
@@ -0,0 +1 @@
+Subproject commit 92f12eb1aec68cc9730ef479e655804ce7dbb9ac
diff --git a/lvgl_micropython b/lvgl_micropython
@@ -0,0 +1 @@
+Subproject commit bcfd8a96c744b2b1e595aa1ab8d9c1995c158c64
diff --git a/micropython-camera-API b/micropython-camera-API
@@ -0,0 +1 @@
+Subproject commit 2dd97117359d00729d50448df19404d18f67ac30
diff --git a/scripts/build_lvgl_micropython.sh b/scripts/build_lvgl_micropython.sh
@@ -55,8 +55,8 @@ if [ "$target" == "esp32" ]; then
 	# CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y
 	# CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
 	[ ! -z "$manifest" ] && frozenmanifest="FROZEN_MANIFEST="$(readlink -f "$manifest")
-	pushd "$twoup"/lvgl_micropython
-	python3 make.py --ota --partition-size=4194304 --flash-size=16 esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=st7789 INDEV=cst816s USER_C_MODULE="$twoup"/micropython-camera-API/src/micropython.cmake USER_C_MODULE="$twoup"/secp256k1-embedded-ecdh/micropython.cmake USER_C_MODULE="$oneup"/c_mpos/micropython.cmake CONFIG_FREERTOS_USE_TRACE_FACILITY=y CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y "$frozenmanifest"
+	pushd lvgl_micropython
+	python3 make.py --ota --partition-size=4194304 --flash-size=16 esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=st7789 INDEV=cst816s USER_C_MODULE="$mydir"/micropython-camera-API/src/micropython.cmake USER_C_MODULE="$mydir"/secp256k1-embedded-ecdh/micropython.cmake USER_C_MODULE="$mydir"/c_mpos/micropython.cmake CONFIG_FREERTOS_USE_TRACE_FACILITY=y CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y "$frozenmanifest"
 	popd
 elif [ "$target" == "unix" -o "$target" == "macOS" ]; then
 	if [ "$buildtype" == "prod" ]; then
@@ -67,7 +67,7 @@ elif [ "$target" == "unix" -o "$target" == "macOS" ]; then
 	# LV_CFLAGS are passed to USER_C_MODULES
 	# STRIP= makes it so that debug symbols are kept
 	[ ! -z "$manifest" ] && frozenmanifest="FROZEN_MANIFEST="$(readlink -f "$manifest")
-	pushd "$twoup"/lvgl_micropython
+	pushd 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"
 	popd
diff --git a/scripts/run_desktop.sh b/scripts/run_desktop.sh
@@ -1,3 +1,6 @@
+#!/bin/bash
+scriptdir=$(readlink -f "$0")
+scriptdir=$(dirname "$mydir")
 script="$1"
 if [ -f "$script" ]; then
 	script=$(readlink -f "$script")
@@ -40,13 +43,13 @@ export HEAPSIZE=128M # for 1280x720 images in the image viewer
 
 # print os and set binary
 os_name=$(uname -s)
-if [ "$os_name" == "Darwin" ]; then
+if [ "$os_name" = "Darwin" ]; then
 	echo "Running on macOS"
-	binary=../lvgl_micropython/build/lvgl_micropy_macOS
+	binary="$scriptdir"/../lvgl_micropython/build/lvgl_micropy_macOS
 else
 	# other cases can be added here
 	echo "Running on $os_name"
-	binary=../lvgl_micropython/build/lvgl_micropy_unix
+	binary="$scriptdir"/../lvgl_micropython/build/lvgl_micropy_unix
 fi
 
 binary=$(readlink -f "$binary")
diff --git a/secp256k1-embedded-ecdh b/secp256k1-embedded-ecdh
@@ -0,0 +1 @@
+Subproject commit 34a3ea189c5c89ff79c81db7fa9f60c43a9cf85b
