diff options
author | WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> | 2021-01-26 13:19:32 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-26 13:19:32 +0000 |
commit | ab222ab135a76c559ef63768e8f90eca99973881 (patch) | |
tree | 038f1d53be3b4c5efaf592f04c0003397b9071b4 /.github/workflows | |
parent | 54b1a752d4e76330692fbe3af12745b5fe377eef (diff) |
Use libepoxy to load in OpenGL functions (#960)
* Use libepoxy to load in OpenGL functions
Prevents having to load them in manually
* Install libepoxy in the CI
* Do not link OpenGL libraries, libepoxy opens them itself
* Add libepoxy to build instructions
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/build-macos.yml | 2 | ||||
-rw-r--r-- | .github/workflows/build-ubuntu-aarch64.yml | 2 | ||||
-rw-r--r-- | .github/workflows/build-ubuntu.yml | 2 | ||||
-rw-r--r-- | .github/workflows/build-windows.yml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 2174e7e..e390722 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -23,7 +23,7 @@ jobs: run: | rm -rf /usr/local/bin/2to3 # Temporary workaround suggested here - https://github.com/actions/virtual-environments/issues/2322#issuecomment-749211076 brew update - brew install sdl2 qt@5 libslirp libarchive + brew install sdl2 qt@5 libslirp libarchive libepoxy - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index 6ea78ea..9186263 100644 --- a/.github/workflows/build-ubuntu-aarch64.yml +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -36,7 +36,7 @@ jobs: sudo mv /etc/apt/sources.list{.new,} sudo apt update sudo apt install aptitude - sudo aptitude install -y {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 libslirp-dev:arm64 libarchive-dev:arm64 + sudo aptitude install -y {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 libslirp-dev:arm64 libarchive-dev:arm64 libepoxy-dev:arm64 - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index d2070d8..1c67475 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -19,7 +19,7 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list sudo apt update - sudo apt install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp0 libslirp-dev libarchive-dev --allow-downgrades + sudo apt install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp0 libslirp-dev libarchive-dev libepoxy-dev --allow-downgrades - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index ed302a8..bcac832 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -24,7 +24,7 @@ jobs: choco install msys2 C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Syuq --noconfirm" - name: Install dependencies - run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,libslirp,libarchive,toolchain}" + run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,libslirp,libarchive,libepoxy,toolchain}" - name: Create build environment run: | New-Item -ItemType directory -Path ${{runner.workspace}}\melonDS\build |