Skip to content

Commit 8623f5f

Browse files
authored
Replace GLEW with GLAD (#1684)
1 parent 3195c33 commit 8623f5f

35 files changed

+31504
-45533
lines changed

.github/workflows/cibuild.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
with:
110110
arch: ${{ matrix.platform.arch }}
111111
branch: 'latest-stable'
112-
packages: build-base cmake git mold sdl2-dev glew-dev lzo-dev libjpeg-turbo-dev openal-soft-dev libogg-dev libtheora-dev libvorbis-dev
112+
packages: build-base cmake git mold sdl2-dev lzo-dev libjpeg-turbo-dev openal-soft-dev libogg-dev libtheora-dev libvorbis-dev
113113

114114
- name: Install Ubuntu packages
115115
if: ${{ matrix.platform.name == 'Ubuntu' }}
@@ -118,7 +118,6 @@ jobs:
118118
sudo apt-get update -qq
119119
sudo apt-get install -qq -y \
120120
libsdl2-dev:${{ matrix.platform.arch }} \
121-
libglew-dev:${{ matrix.platform.arch }} \
122121
liblzo2-dev:${{ matrix.platform.arch }} \
123122
libjpeg-dev:${{ matrix.platform.arch }} \
124123
libopenal-dev:${{ matrix.platform.arch }} \
@@ -130,11 +129,11 @@ jobs:
130129
if: ${{ matrix.platform.name == 'macOS' }}
131130
run: |
132131
brew update
133-
brew install sdl2 glew lzo libogg libvorbis theora
132+
brew install sdl2 lzo libogg libvorbis theora
134133
135134
- name: Install Fedora packages
136135
if: ${{ matrix.platform.name == 'Fedora' }}
137-
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
136+
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
138137

139138
- name: Set environment variables
140139
if: ${{ matrix.platform.cc != '' && matrix.platform.cxx != '' }}
@@ -181,13 +180,13 @@ jobs:
181180
matrix:
182181
platform:
183182
- { name: FreeBSD, os: freebsd, os-version: '14.0', arch: x86_64,
184-
install-cmd: "sudo pkg update && sudo pkg install -y cmake sdl2 glew lzo2 jpeg-turbo openal-soft libogg libtheora libvorbis"
183+
install-cmd: "sudo pkg update && sudo pkg install -y cmake sdl2 lzo2 jpeg-turbo openal-soft libogg libtheora libvorbis"
185184
}
186185
- { name: OpenBSD, os: openbsd, os-version: '7.5', arch: x86_64,
187-
install-cmd: "sudo pkg_add cmake SDL2 glew lzo2 jpeg openal libogg libtheora libvorbis",
186+
install-cmd: "sudo pkg_add cmake SDL2 lzo2 jpeg openal libogg libtheora libvorbis",
188187
}
189188
- { name: NetBSD, os: netbsd, os-version: '10.0', arch: x86_64,
190-
install-cmd: "sudo pkgin -y install cmake SDL2 glew lzo libjpeg-turbo openal-soft libogg libtheora libvorbis",
189+
install-cmd: "sudo pkgin -y install cmake SDL2 lzo libjpeg-turbo openal-soft libogg libtheora libvorbis",
191190
}
192191
configuration: [Debug, Release]
193192

CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,6 @@ if (NOT WIN32)
241241
INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
242242
)
243243
endif()
244-
find_package(OpenGL REQUIRED)
245-
find_package(GLEW REQUIRED)
246244
find_package(OpenAL REQUIRED)
247245
find_package(JPEG)
248246
find_package(Ogg REQUIRED)

Externals/gl/include/gl/glext.h

-11,829
This file was deleted.

Externals/gl/include/gl/wglext.h

-840
This file was deleted.

misc/docker/image/install_deps.sh

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ apt-get install -y \
3030
gdb \
3131
wget \
3232
autoconf \
33-
libglew-dev \
3433
libjpeg-dev \
3534
libopenal-dev \
3635
libcrypto++-dev \

0 commit comments

Comments
 (0)