fixed platform-specific stuff

Author: mkalkbrenner

.github/workflows/libsdldmd.yml

@@ -84,6 +84,9 @@ jobs:
             libxss-dev libxtst-dev libxinerama-dev libxxf86vm-dev libwayland-dev libxkbcommon-dev \
             libdrm-dev libgbm-dev libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev \
             libdbus-1-dev libudev-dev libibus-1.0-dev
+      - if: (matrix.platform == 'linux' && matrix.arch == 'aarch64')
+        run: |
+          sudo apt-get install -y libgpiod-dev
       - if: (matrix.platform == 'win')
         name: Build (win)
         run: |

CMakeLists.txt

@@ -10,6 +10,21 @@ message(STATUS "ARCH: ${ARCH}")
 message(STATUS "BUILD_SHARED: ${BUILD_SHARED}")
 message(STATUS "BUILD_STATIC: ${BUILD_STATIC}")
 
+if(PLATFORM STREQUAL "ios" OR PLATFORM STREQUAL "ios-simulator")
+   set(CMAKE_SYSTEM_NAME iOS)
+   if(PLATFORM STREQUAL "ios-simulator")
+      set(CMAKE_OSX_SYSROOT iphonesimulator)
+   endif()
+   set(CMAKE_OSX_DEPLOYMENT_TARGET 17.0)
+elseif(PLATFORM STREQUAL "tvos")
+   set(CMAKE_SYSTEM_NAME tvOS)
+   set(CMAKE_OSX_DEPLOYMENT_TARGET 17.0)
+elseif(PLATFORM STREQUAL "android")
+   set(CMAKE_SYSTEM_NAME Android)
+   set(CMAKE_SYSTEM_VERSION 30)
+   set(CMAKE_ANDROID_ARCH_ABI arm64-v8a)
+endif()
+
 file(READ include/SDLDMD/SDLDMD.h version)
 string(REGEX MATCH "#[ \t]*define[ \t]+SDLDMD_VERSION_MAJOR[ \t]+([0-9]+)" _tmp "${version}")
 if("${CMAKE_MATCH_1}" STREQUAL "")
@@ -43,24 +58,11 @@ elseif(PLATFORM STREQUAL "macos")
    endif()
    set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
    set(CMAKE_INSTALL_RPATH "@executable_path")
-elseif(PLATFORM STREQUAL "ios" OR PLATFORM STREQUAL "ios-simulator")
-   set(CMAKE_SYSTEM_NAME iOS)
-   if(PLATFORM STREQUAL "ios-simulator")
-      set(CMAKE_OSX_SYSROOT iphonesimulator)
-   endif()
-   set(CMAKE_OSX_DEPLOYMENT_TARGET 17.0)
-   set(CMAKE_OSX_ARCHITECTURES arm64)
-elseif(PLATFORM STREQUAL "tvos")
-   set(CMAKE_SYSTEM_NAME tvOS)
-   set(CMAKE_OSX_DEPLOYMENT_TARGET 17.0)
+elseif(PLATFORM STREQUAL "ios" OR PLATFORM STREQUAL "ios-simulator" OR PLATFORM STREQUAL "tvos")
    set(CMAKE_OSX_ARCHITECTURES arm64)
 elseif(PLATFORM STREQUAL "linux")
    set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
    set(CMAKE_INSTALL_RPATH "$ORIGIN")
-elseif(PLATFORM STREQUAL "android")
-   set(CMAKE_SYSTEM_NAME Android)
-   set(CMAKE_SYSTEM_VERSION 30)
-   set(CMAKE_ANDROID_ARCH_ABI arm64-v8a)
 endif()
 
 set(CMAKE_CXX_STANDARD 20)

platforms/android/arm64-v8a/external.sh

@@ -28,6 +28,9 @@ cd libdmdutil
 BUILD_TYPE=${BUILD_TYPE} platforms/android/arm64-v8a/external.sh
 cmake \
    -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_LATEST_HOME}/build/cmake/android.toolchain.cmake" \
+   -DCMAKE_SYSTEM_NAME=Android \
+   -DCMAKE_SYSTEM_VERSION=30 \
+   -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \
    -DPLATFORM=android \
    -DARCH=arm64-v8a \
    -DBUILD_SHARED=ON \

platforms/win-mingw/x64/external.sh

@@ -47,7 +47,7 @@ cmake \
 cmake --build build -- -j${NUM_PROCS}
 cd ..
 
-cp SDL/build/SDL364.dll.a ../third-party/build-libs/win-mingw/x64/
+cp SDL/build/libSDL364.dll.a ../third-party/build-libs/win-mingw/x64/
 cp SDL/build/SDL364.dll ../third-party/runtime-libs/win-mingw/x64/
 cp -r SDL/include/SDL3 ../third-party/include/