Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace GLEW with GLAD #1684

Merged
merged 1 commit into from
Jun 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/cibuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
with:
arch: ${{ matrix.platform.arch }}
branch: 'latest-stable'
packages: build-base cmake git mold sdl2-dev glew-dev lzo-dev libjpeg-turbo-dev openal-soft-dev libogg-dev libtheora-dev libvorbis-dev
packages: build-base cmake git mold sdl2-dev lzo-dev libjpeg-turbo-dev openal-soft-dev libogg-dev libtheora-dev libvorbis-dev

- name: Install Ubuntu packages
if: ${{ matrix.platform.name == 'Ubuntu' }}
Expand All @@ -117,7 +117,6 @@ jobs:
sudo apt-get update -qq
sudo apt-get install -qq -y \
libsdl2-dev:${{ matrix.platform.arch }} \
libglew-dev:${{ matrix.platform.arch }} \
liblzo2-dev:${{ matrix.platform.arch }} \
libjpeg-dev:${{ matrix.platform.arch }} \
libopenal-dev:${{ matrix.platform.arch }} \
Expand All @@ -129,11 +128,11 @@ jobs:
if: ${{ matrix.platform.name == 'macOS' }}
run: |
brew update
brew install sdl2 glew lzo libogg libvorbis theora
brew install sdl2 lzo libogg libvorbis theora

- name: Install Fedora packages
if: ${{ matrix.platform.name == 'Fedora' }}
run: dnf install -y git gcc gcc-c++ rpmdevtools cmake SDL2-devel glew-devel lzo-devel libjpeg-turbo-devel openal-devel libogg-devel libtheora-devel libvorbis-devel
run: dnf install -y git gcc gcc-c++ rpmdevtools cmake SDL2-devel lzo-devel libjpeg-turbo-devel openal-devel libogg-devel libtheora-devel libvorbis-devel

- name: Set environment variables
if: ${{ matrix.platform.cc != '' && matrix.platform.cxx != '' }}
Expand Down Expand Up @@ -180,13 +179,13 @@ jobs:
matrix:
platform:
- { name: FreeBSD, os: freebsd, os-version: '14.0', arch: x86_64,
install-cmd: "sudo pkg update && sudo pkg install -y cmake sdl2 glew lzo2 jpeg-turbo openal-soft libogg libtheora libvorbis"
install-cmd: "sudo pkg update && sudo pkg install -y cmake sdl2 lzo2 jpeg-turbo openal-soft libogg libtheora libvorbis"
}
- { name: OpenBSD, os: openbsd, os-version: '7.5', arch: x86_64,
install-cmd: "sudo pkg_add cmake SDL2 glew lzo2 jpeg openal libogg libtheora libvorbis",
install-cmd: "sudo pkg_add cmake SDL2 lzo2 jpeg openal libogg libtheora libvorbis",
}
- { name: NetBSD, os: netbsd, os-version: '10.0', arch: x86_64,
install-cmd: "sudo pkgin -y install cmake SDL2 glew lzo libjpeg-turbo openal-soft libogg libtheora libvorbis",
install-cmd: "sudo pkgin -y install cmake SDL2 lzo libjpeg-turbo openal-soft libogg libtheora libvorbis",
}
configuration: [Debug, Release]

Expand Down
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,6 @@ if (NOT WIN32)
INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
)
endif()
find_package(OpenGL REQUIRED)
find_package(GLEW REQUIRED)
find_package(OpenAL REQUIRED)
find_package(JPEG)
find_package(Ogg REQUIRED)
Expand Down
11,829 changes: 0 additions & 11,829 deletions Externals/gl/include/gl/glext.h

This file was deleted.

840 changes: 0 additions & 840 deletions Externals/gl/include/gl/wglext.h

This file was deleted.

1 change: 0 additions & 1 deletion misc/docker/image/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ apt-get install -y \
gdb \
wget \
autoconf \
libglew-dev \
libjpeg-dev \
libopenal-dev \
libcrypto++-dev \
Expand Down
Loading
Loading