ci: disable Libretro Ubuntu and Switch builds

The Libretro Switch build uses some kind of libtransistor without which
the build fails.

Disable the Ubuntu Libretro build for now because it uses a linker
script from libretro.

The Libretro people are using GitLab CI anyway, so we will not deal with
this and disable these builds for now.

Also fix a couple of minor issues with the header-only `INTERFACE`
libraries in CMake.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2025-05-04 01:12:56 +00:00
parent 18c3c3bd51
commit 3a1780145c
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
4 changed files with 22 additions and 15 deletions

View File

@ -5,7 +5,8 @@ jobs:
build:
strategy:
matrix:
target_name: [ngc, wii, wiiu, switch]
# target_name: [ngc, wii, wiiu, switch]
target_name: [ngc, wii, wiiu]
build_type: [release, debug]
include:
- libretro_build: 'DEBUG=0'
@ -18,8 +19,8 @@ jobs:
target_name: wii
- devkit_container: 'devkitpro/devkitppc:latest'
target_name: wiiu
- devkit_container: 'devkitpro/devkita64:latest'
target_name: switch
# - devkit_container: 'devkitpro/devkita64:latest'
# target_name: switch
runs-on: ubuntu-latest
container: ${{ matrix.devkit_container }}
steps:

View File

@ -7,7 +7,8 @@ jobs:
matrix:
build_compiler: [gcc, clang]
build_type: [release, debug]
build_options: [default, link_off, translations_only, libretro]
# build_options: [default, link_off, translations_only, libretro]
build_options: [default, link_off, translations_only]
include:
- cmake_compiler: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++'
build_compiler: gcc
@ -21,12 +22,12 @@ jobs:
build_options: link_off
- cmake_options: '-DTRANSLATIONS_ONLY=ON'
build_options: translations_only
- libretro_build: 'DEBUG=0'
build_type: release
build_options: libretro
- libretro_build: 'DEBUG=1'
build_type: debug
build_options: libretro
# - libretro_build: 'DEBUG=0'
# build_type: release
# build_options: libretro
# - libretro_build: 'DEBUG=1'
# build_type: debug
# build_options: libretro
exclude:
# Exclude debug/translations_only build
- build_type: debug
@ -61,9 +62,9 @@ jobs:
run: sudo ninja -C build install
# Libretro build
- if: matrix.build_options == 'libretro'
name: Build libretro core
run: make -C src/libretro ${{ matrix.libretro_build }}
# - if: matrix.build_options == 'libretro'
# name: Build libretro core
# run: make -C src/libretro ${{ matrix.libretro_build }}
# Run tests
- if: matrix.build_options == 'default'

View File

@ -9,5 +9,5 @@ add_library(vbam-core-base-test
notreached.h)
target_link_libraries(vbam-core-base-test
INTERFACE GTest::gtest
PRIVATE nonstd-lib)
INTERFACE GTest::gtest nonstd-lib
)

View File

@ -201,6 +201,9 @@ function(configure_wx_target target)
get_target_property(target_type ${target} TYPE)
if(target_type STREQUAL "EXECUTABLE")
set(target_is_executable TRUE)
elseif(target_type STREQUAL "INTERFACE_LIBRARY")
set(target_is_executable FALSE)
set(target_is_interface_library TRUE)
else()
set(target_is_executable FALSE)
endif()
@ -208,6 +211,8 @@ function(configure_wx_target target)
function(_add_link_libraries)
if(${target_is_executable})
target_link_libraries(${target} ${ARGN})
elseif(${target_is_interface_library})
target_link_libraries(${target} INTERFACE ${ARGN})
else()
target_link_libraries(${target} PUBLIC ${ARGN})
endif()