diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-12 16:08:50 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-12 17:47:53 +0100 |
| commit | eea6fad65d5c9fecfb47c4a1c516c253cee85fd2 (patch) | |
| tree | b7f5ec67e0b27ce0bc5cc4274d93c4fb7fed38ef | |
| parent | ef75de200a53029d788b7b95d5548b59e3f991c3 (diff) | |
test: fix non-win32 build
| -rw-r--r-- | .github/workflows/cmake.yml | 4 | ||||
| -rw-r--r-- | test/app.hpp | 4 | ||||
| -rw-r--r-- | test/main.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index a0425ffa..69d266ce 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -39,8 +39,8 @@ jobs: - name: Install Linux Dependencies run: | set -e - apt update - apt install libopencv-dev libgl-dev g++-12 ninja-build + sudo apt update + sudo apt install libopencv-dev libgl-dev g++-12 ninja-build if: matrix.os == 'ubuntu-22.04' - name: Configure diff --git a/test/app.hpp b/test/app.hpp index c9bcfcee..26a0e41a 100644 --- a/test/app.hpp +++ b/test/app.hpp @@ -1,12 +1,14 @@ #pragma once #include <Magnum/Magnum.h> -#include <Magnum/Platform/WindowlessWglApplication.h> #ifdef __APPLE__ +#include <Magnum/Platform/WindowlessCglApplication.h> #define FM_APPLICATION Platform::WindowlessCglApplication #elif defined _WIN32 +#include <Magnum/Platform/WindowlessWglApplication.h> #define FM_APPLICATION Platform::WindowlessWglApplication #else +#include <Magnum/Platform/WindowlessGlxApplication.h> #define FM_APPLICATION Platform::WindowlessGlxApplication #endif diff --git a/test/main.cpp b/test/main.cpp index d20d5d26..1dc91e9e 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -4,7 +4,7 @@ namespace floormat { floormat::floormat(const Arguments& arguments): - Platform::WindowlessWglApplication{ + FM_APPLICATION { arguments, Configuration{} } |