Merge pull request #78 from porschemad911/s922x-flycast-sa

flycast-sa and drastic-sa - update for S922X USE_MALI
This commit is contained in:
r3claimer 2024-04-10 07:21:29 -07:00 committed by GitHub
commit cdf99baadf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions

View file

@ -10,7 +10,7 @@ PKG_DEPENDS_TARGET="toolchain rocknix-hotkey"
PKG_LONGDESC="Install Drastic Launcher script, will dowload bin on first run"
PKG_TOOLCHAIN="make"
if [ "${DEVICE}" = "S922X" ]; then
if [ "${DEVICE}" = "S922X" -a "${USE_MALI}" != "no" ]; then
PKG_DEPENDS_TARGET+=" libegl"
fi
@ -33,7 +33,12 @@ makeinstall_target() {
post_install() {
case ${DEVICE} in
S922X)
LIBEGL="export SDL_VIDEO_GL_DRIVER=\/usr\/lib\/egl\/libGL.so.1 SDL_VIDEO_EGL_DRIVER=\/usr\/lib\/egl\/libEGL.so.1"
if [ "${USE_MALI}" != "no" ]; then
LIBEGL="export SDL_VIDEO_GL_DRIVER=\/usr\/lib\/egl\/libGL.so.1 SDL_VIDEO_EGL_DRIVER=\/usr\/lib\/egl\/libEGL.so.1"
else
LIBEGL=""
fi
HOTKEY=""
;;
RK3588)

View file

@ -12,7 +12,7 @@ PKG_LONGDESC="Flycast is a multiplatform Sega Dreamcast, Naomi and Atomiswave em
PKG_TOOLCHAIN="cmake"
PKG_PATCH_DIRS+="${DEVICE}"
if [[ "${OPENGL_SUPPORT}" = "yes" ]] && [[ ! "${DEVICE}" = "S922X" ]]; then
if [[ "${OPENGL_SUPPORT}" = "yes" && ( ! "${DEVICE}" = "S922X" || ( "${DEVICE}" = "S922X" && "${USE_MALI}" = "no" ) ) ]]; then
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd"
PKG_CMAKE_OPTS_TARGET+=" -USE_OPENGL=ON -DUSE_GLES=OFF"
@ -21,8 +21,7 @@ elif [ "${OPENGLES_SUPPORT}" = yes ]; then
PKG_CMAKE_OPTS_TARGET+=" -DUSE_GLES=ON"
fi
if [ "${VULKAN_SUPPORT}" = "yes" ]
then
if [ "${VULKAN_SUPPORT}" = "yes" ]; then
PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
PKG_CMAKE_OPTS_TARGET+=" -DUSE_VULKAN=ON"
else