macos port changes

Author: kdschlosser

.github/workflows/macOS.yml

@@ -21,13 +21,10 @@ jobs:
     - name: Install Dependencies
       run: |
         brew install --force ninja 
+        brew install --force sdl2
         git submodule update --init -- lib/pycparser
         git submodule update --init --jobs 4 -- lib/micropython        
         git submodule update --init --jobs 4 -- lib/lvgl        
-        git submodule update --init --jobs 4 -- lib/SDL
-        cd lib/SDL
-        git checkout release-2.30.2
-        cd ../..
 
     - name: Cached Deps
       id: cache-deps
@@ -69,10 +66,6 @@ jobs:
         format: "YYYY_MM_DD HH_mm_ss_SSS"
 
     - name: Build macOS port
-      env:
-        CC: gcc-14
-        CXX: g++-14
-
       run: python3 make.py macOS DISPLAY=sdl_display INDEV=sdl_pointer
 
     - uses: actions/upload-artifact@v4

builder/macOS.py

@@ -43,34 +43,14 @@ def force_clean(clean_mpy_cross):
 
 
 def build_sdl(addl_commands):
-    dst = f'lib/micropython/ports/unix/build-{unix.variant}/SDL'
-    if not os.path.exists(dst):
-        os.makedirs(dst)
-    elif os.path.exists(os.path.join(dst, 'libSDL2-2.0.0.dylib')):
-        return
-
-    cwd = os.getcwd()
-    os.chdir(dst)
-    cmd_ = [
-        [
-            f'cmake -DSDL_STATIC=ON -DSDL_SHARED=ON '
-            f'-DCMAKE_BUILD_TYPE=Release {addl_commands} {unix.SCRIPT_PATH}/lib/SDL'
-        ],
-        [f'cmake --build . --config Release --parallel {os.cpu_count()}']
-    ]
-
-    res, _ = unix.spawn(cmd_, cmpl=True)
-    if res != 0:
-        sys.exit(res)
-
-    os.chdir(cwd)
+    pass
 
 
 unix.build_sdl = build_sdl
 
 
 def submodules():
-    _submodules()
+    pass
 
 
 def compile(*args):  # NOQA

ext_mod/lcd_bus/micropython.mk

@@ -32,10 +32,6 @@ ifneq (,$(findstring unix, $(LV_PORT)))
 else
     ifneq (,$(findstring macOS, $(LV_PORT)))
         CFLAGS_USERMOD += -DMP_PORT_UNIX=1
-        CFLAGS_USERMOD += -I$(BUILD)/SDL/include/SDL2
-        CFLAGS_USERMOD += -I$(BUILD)/SDL/include-config-release/SDL2
-        LDFLAGS_USERMOD += -L$(BUILD)/SDL
-
         LDFLAGS_USERMOD += -lSDL2-2.0
     endif
 endif