macos

Author: kdschlosser

.github/workflows/macOS.yml

@@ -45,14 +45,6 @@ jobs:
         export "IDF_PATH=${GITHUB_WORKSPACE}/lib/esp-idf"
         ./lib/esp-idf/install.sh all
 
-    - name: Setup ESP-IDF
-      run: |
-        export "IDF_PATH=${GITHUB_WORKSPACE}/lib/esp-idf"
-        . ./lib/esp-idf/export.sh
-
-    - name: Build ESP32 port
-      run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911
-
     # - name: Build STM32 port
     #   run: python3 make.py stm32 submodules clean mpy_cross BOARD=STM32H7B3I_DK DISPLAY=rgb_display INDEV=gt911
 
@@ -68,6 +60,15 @@ jobs:
     - name: Build macOS port
       run: python3 make.py macOS DISPLAY=sdl_display INDEV=sdl_pointer
 
+    - name: Setup ESP-IDF
+      run: |
+        export "IDF_PATH=${GITHUB_WORKSPACE}/lib/esp-idf"
+        . ./lib/esp-idf/export.sh
+
+    - name: Build ESP32 port
+      run: python3 make.py esp32 BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911
+    
+
     - uses: actions/upload-artifact@v4
       with:
         name: lvgl_micropy_macos-${{ steps.datetime.outputs.month }}.${{ steps.datetime.outputs.day }}.${{ steps.datetime.outputs.year }}-${{ steps.datetime.outputs.hours }}_${{ steps.datetime.outputs.minutes }}_${{ steps.datetime.outputs.seconds }}

ext_mod/lcd_bus/micropython.mk

@@ -28,11 +28,12 @@ ifneq (,$(findstring unix, $(LV_PORT)))
     LDFLAGS_USERMOD += -L$(BUILD)/SDL
 
     LDFLAGS_USERMOD += -lSDL2
-
 else
     ifneq (,$(findstring macOS, $(LV_PORT)))
+        # -F/Library/Frameworks -framework SDL2
         CFLAGS_USERMOD += -DMP_PORT_UNIX=1
-    	LDFLAGS_USERMOD  :=$(shell sdl2-config --libs)
-		CFLAGS_USERMOD :=$(shell sdl2-config --cflags)
+        CFLAGS_USERMOD += -I/Library/Frameworks/SDL2.framework/Headers/SDL2
+        CFLAGS_USERMOD += $(shell sdl2-config --cflags)
+    	LDFLAGS_USERMOD += $(shell sdl2-config --libs)
     endif
 endif