From 1cf7baa317e341a3fbca77454aa21a13440470ed Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Sat, 9 Mar 2024 04:42:26 +1100 Subject: [PATCH] Update CMakeLists.txt --- .github/workflows/build_linux.yml | 8 +------- source/CMakeLists.txt | 5 ++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 6147950..ca51455 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -21,13 +21,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y pkg-config ninja-build \ - libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev \ - pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \ - libaudio-dev libjack-dev libsndio-dev libusb-1.0-0-dev libx11-dev libxext-dev \ - libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libwayland-dev \ - libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \ - libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev \ - libpipewire-0.3-dev libdecor-0-dev + libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libsdl2-dev - uses: actions/checkout@v4 with: diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index e307e78..770c82e 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -465,7 +465,10 @@ if(STAR_BUILD_GUI) find_package(GLEW REQUIRED) include_directories(SYSTEM ${GLEW_INCLUDE_DIR}) - set(STAR_EXT_GUI_LIBS ${STAR_EXT_GUI_LIBS} ${OPENGL_LIBRARY} ${GLEW_LIBRARY}) + set(STAR_EXT_GUI_LIBS ${STAR_EXT_GUI_LIBS} + ${OPENGL_LIBRARY} + GLEW::glew_s + ) if(STAR_SYSTEM_MACOS) set(STAR_EXT_GUI_LIBS ${STAR_EXT_GUI_LIBS} "-framework CoreAudio")