gh-1: add openal deps on linux

EgorOrachyov · May 1, 2023 · b7f2813 · b7f2813
1 parent 9a35fba
commit b7f2813
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ env:
 jobs:
 
   windows:
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
         with:
@@ -52,7 +52,7 @@ jobs:
         run: cmake --build ${{ env.build_dir }}
 
   ubuntu:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
@@ -61,6 +61,11 @@ jobs:
 
       - uses: seanmiddleditch/gha-setup-ninja@master
 
+      - name: update apt
+        shell: bash
+        run: |
+          sudo apt update
+
       - name: install glfw dependencies
         shell: bash
         run: |
@@ -73,6 +78,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/[email protected]
         with:
@@ -90,7 +100,7 @@ jobs:
         run: cmake --build ${{ env.build_dir }}
 
   macos:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/deps/zlib/gzguts.h b/deps/zlib/gzguts.h
@@ -31,6 +31,10 @@
 #endif
 #include <fcntl.h>
 
+#ifdef __APPLE__
+#include <unistd.h>
+#endif
+
 #ifdef _WIN32
 #  include <stddef.h>
 #endif

diff --git a/engine/core/log.hpp b/engine/core/log.hpp
@@ -30,6 +30,7 @@
 
 #include <cstddef>
 #include <fstream>
+#include <memory>
 #include <mutex>
 #include <sstream>
 #include <string>

diff --git 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})
diff --git 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})