From 6167ed201f66ed3423b7dd2a6a7f3ff1915522f4 Mon Sep 17 00:00:00 2001 From: Egor Orachev Date: Mon, 1 May 2023 15:55:12 +0300 Subject: [PATCH] gh-1: add openal deps on linux --- .github/workflows/build.yml | 5 +++++ games/flappyowl/CMakeLists.txt | 7 +------ template/CMakeLists.txt | 8 +------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3104a7cf..55b8b4e22 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,6 +73,11 @@ jobs: sudo apt-get install -y libxmu-dev libxi-dev libgl-dev libglx-dev sudo apt-get install -y libx11-dev + - name: install openal dependencies + shell: bash + run: | + sudo apt-get install -y libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev + - name: install Vulkan SDK uses: humbletim/setup-vulkan-sdk@v1.2.0 with: diff --git a/games/flappyowl/CMakeLists.txt b/games/flappyowl/CMakeLists.txt index 6a0b252b2..1470ba9e7 100644 --- a/games/flappyowl/CMakeLists.txt +++ b/games/flappyowl/CMakeLists.txt @@ -1,7 +1,2 @@ -set(FLAPPYOWL_APP_ICON_RESOURCE) - -if (TARGET_WINDOWS) - set(FLAPPYOWL_APP_ICON_RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/owl.rc") -endif () - +set(FLAPPYOWL_APP_ICON_RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/owl.rc") wmoge_game(flappyowl main.cpp ${FLAPPYOWL_APP_ICON_RESOURCE}) \ No newline at end of file diff --git a/template/CMakeLists.txt b/template/CMakeLists.txt index 95d5c055d..93d7b0a32 100644 --- a/template/CMakeLists.txt +++ b/template/CMakeLists.txt @@ -1,9 +1,3 @@ set(GAME_NAME template) - -set(GAME_APP_ICON_RESOURCE) - -if (TARGET_WINDOWS) - set(GAME_APP_ICON_RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/wmoge.rc") -endif () - +set(GAME_APP_ICON_RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/wmoge.rc") wmoge_game(${GAME_NAME} main.cpp ${GAME_APP_ICON_RESOURCE}) \ No newline at end of file