ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

this should work. I hope...

This commit is contained in:
Nadia Holmquist Pedersen 2024-08-10 23:09:25 +02:00
parent 9ec84ce449
commit 074413e024
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-ubuntu.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
run: | run: |
sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list
sudo apt update sudo apt update
sudo apt install --allow-downgrades cmake ninja-build extra-cmake-modules libpcap0.8-dev libsdl2-dev \ sudo apt install --allow-downgrades cmake ninja-build extra-cmake-modules libpcap0.8-dev libsdl2-dev libenet-dev \
qt6-{base,base-private,multimedia}-dev libarchive-dev libzstd-dev libfuse2 qt6-{base,base-private,multimedia}-dev libarchive-dev libzstd-dev libfuse2
- name: Configure - name: Configure
run: cmake -B build -G Ninja -DUSE_QT6=ON -DCMAKE_INSTALL_PREFIX=/usr run: cmake -B build -G Ninja -DUSE_QT6=ON -DCMAKE_INSTALL_PREFIX=/usr

10
src/net/CMakeLists.txt
View File

@ -25,5 +25,11 @@ else()
target_link_libraries(net-utils PUBLIC slirp) target_link_libraries(net-utils PUBLIC slirp)
endif() endif()
find_package(ENet REQUIRED) if (USE_VCPKG)
target_link_libraries(net-utils PUBLIC enet) find_package(unofficial-enet CONFIG REQUIRED)
target_link_libraries(net-utils PRIVATE unofficial::enet::enet)
else()
pkg_check_modules(ENet REQUIRED IMPORTED_TARGET libenet)
fix_interface_includes(PkgConfig::ENet)
target_link_libraries(net-utils PUBLIC PkgConfig::ENet)
endif()