Skip to content

Commit d1528d7

Browse files
committed
update linux builds to link x11 as seemingly now required by glfw
1 parent eb73c92 commit d1528d7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: runner.os == 'Linux'
4444
run: |
4545
sudo apt update
46-
sudo apt install libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev mesa-common-dev libicu-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libbz2-dev
46+
sudo apt install libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev mesa-common-dev libicu-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libbz2-dev libx11-dev
4747
- name: Set up MSVC for Windows
4848
if: runner.os == 'Windows'
4949
uses: ilammy/msvc-dev-cmd@v1

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,8 @@ target_include_directories(booldozer PUBLIC include lib/bStream lib/libflipper/i
4141

4242
find_package(ICU 61.0 COMPONENTS uc i18n REQUIRED)
4343
find_package(BZip2 REQUIRED)
44-
target_link_libraries(booldozer PUBLIC X11 glfw imgui gctools++ ICU::uc ICU::i18n BZip2::BZip2 j3dultra TriStripper)
44+
if(WIN32)
45+
target_link_libraries(booldozer PUBLIC imgui gctools++ ICU::uc ICU::i18n BZip2::BZip2 j3dultra TriStripper)
46+
else()
47+
target_link_libraries(booldozer PUBLIC X11 glfw imgui gctools++ ICU::uc ICU::i18n BZip2::BZip2 j3dultra TriStripper)
48+
endif()

0 commit comments

Comments
 (0)