drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2026-01-31 23:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Linux build: restore required header packages and improve CMake config

Browse Source 
- Added back libstb-dev, libopus-dev, and libenet-dev for header files
- These are needed because CMake uses MODULE find scripts that look for system headers
- Added CMAKE_FIND_PACKAGE_PREFER_CONFIG=ON to prioritize vcpkg config packages
- This should resolve the missing /usr/include/stb and /usr/include/opus errors
This commit is contained in:
Zephyron
2025-09-18 18:05:36 +10:00
parent 5b95c20f99
commit eab616566b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@@ -67,6 +67,7 @@ build-linux:
- apt-get install -y -qq libpulse-dev libasound2-dev libusb-1.0-0-dev
- apt-get install -y -qq libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev
- apt-get install -y -qq libssl-dev libboost-all-dev libboost-context-dev
- apt-get install -y -qq libstb-dev libopus-dev libenet-dev
- apt-get install -y -qq libvulkan-dev
- apt-get install -y -qq qtbase5-dev qtbase5-private-dev qtwebengine5-dev qtmultimedia5-dev
- apt-get install -y -qq libqt5core5a libqt5gui5 libqt5widgets5 libqt5dbus5
@@ -79,7 +80,7 @@ build-linux:
- apt-get install -y -qq libfuse2 gdb
script:
- git submodule update --init --recursive
- cmake -B build -S . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_QT=ON -DENABLE_SDL2=ON -DENABLE_WEB_SERVICE=ON -DCITRON_USE_BUNDLED_VCPKG=ON -DCITRON_USE_BUNDLED_FFMPEG=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_CXX_FLAGS="-Wno-error=conversion"
- cmake -B build -S . -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_QT=ON -DENABLE_SDL2=ON -DENABLE_WEB_SERVICE=ON -DCITRON_USE_BUNDLED_VCPKG=ON -DCITRON_USE_BUNDLED_FFMPEG=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_CXX_FLAGS="-Wno-error=conversion" -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
- cmake --build build --config $BUILD_TYPE --parallel $CMAKE_BUILD_PARALLEL_LEVEL
- echo "Build completed, checking for executables..."
- ls -la build/bin/ || echo "No build/bin directory found"