lpnf/lovr
1
0
Fork 0
mirror of https://github.com/bjornbytes/lovr.git synced 2024-07-05 13:53:38 +00:00
Code Issues Projects Releases Wiki Activity

More build fixes;

Browse source
This commit is contained in:
bjorn 2023-07-08 01:05:57 -07:00
parent 929c1e850d
commit a0806928a4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/build.yml vendored
View file

@ -36,7 +36,8 @@ jobs:
- name: Update Packages
run: sudo apt update
- name: Install Packages
run: sudo apt install -y xorg-dev libxcb-glx0-dev libxkbcommon-dev libxcb-xkb-dev libfuse2 libcurl4-openssl-dev libssl-dev
run: >
sudo apt install -y xorg-dev libxcb-glx0-dev libxkbcommon-dev libxkbcommon-x11-dev libxcb-xkb-dev libfuse2 libcurl4-openssl-dev libssl-dev
- name: Checkout
uses: actions/checkout@v3
with:

4
CMakeLists.txt
View file

@ -88,7 +88,7 @@ if(NOT ANDROID AND LOVR_BUILD_SHARED)
endif()
# GLFW
if(LOVR_USE_GLFW AND NOT (EMSCRIPTEN OR ANDROID))
if(LOVR_USE_GLFW AND NOT (EMSCRIPTEN OR ANDROID OR (UNIX AND NOT APPLE)))
if(LOVR_SYSTEM_GLFW)
pkg_search_module(GLFW REQUIRED glfw3)
include_directories(${GLFW_INCLUDE_DIRS})
@ -882,7 +882,7 @@ elseif(ANDROID)
endif()
elseif(UNIX)
target_sources(lovr PRIVATE src/core/os_linux.c)
target_link_libraries(lovr X11 xcb X11-xcb)
target_link_libraries(lovr xcb xcb-xkb xkbcommon xkbcommon-x11)
set_target_properties(lovr PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
BUILD_WITH_INSTALL_RPATH TRUE