Skip to content

Commit 08d5459

Browse files
committed
[desktop] replace GLEW with glad
1 parent 93d0240 commit 08d5459

44 files changed

Lines changed: 5766 additions & 37710 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ RUN apt-get update \
1717
clang \
1818
lldb \
1919
libsdl2-dev \
20-
libglew-dev \
2120
libgtk-3-dev \
2221
&& rm -rf /var/lib/apt/lists/* \
2322
&& apt-get autoremove -y && apt-get clean -y

.github/workflows/gearboy.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Update OS
3535
run: sudo apt-get update -qq
3636
- name: Install dependencies
37-
run: sudo apt-get install -y libsdl2-dev libglew-dev libgtk-3-dev
37+
run: sudo apt-get install -y libsdl2-dev libgtk-3-dev
3838
- name: Get build number
3939
run: |
4040
echo "BUILD_NUMBER=$(git describe --abbrev=7 --dirty --always --tags)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
6565
- name: Update OS
6666
run: sudo apt-get update -qq
6767
- name: Install dependencies
68-
run: sudo apt-get install -y libsdl2-dev libglew-dev libgtk-3-dev
68+
run: sudo apt-get install -y libsdl2-dev libgtk-3-dev
6969
- name: Get build number
7070
run: |
7171
echo "BUILD_NUMBER=$(git describe --abbrev=7 --dirty --always --tags)" >> $GITHUB_ENV
@@ -197,7 +197,6 @@ jobs:
197197
mkdir -p artifact
198198
cp platforms/README.txt artifact
199199
cp platforms/gamecontrollerdb.txt artifact
200-
cp platforms/windows/dependencies/glew-2.2.0/bin/Release/${{ matrix.architecture }}/glew32.dll artifact
201200
cp platforms/windows/dependencies/SDL2-2.30.6/lib/${{ matrix.architecture }}/SDL2.dll artifact
202201
cp platforms/windows/release/${{ env.NAME_UPPER }}.exe artifact
203202
- name: Archive binary
@@ -224,7 +223,7 @@ jobs:
224223
uses: vmactions/freebsd-vm@v1
225224
with:
226225
usesh: true
227-
prepare: pkg install -y git gmake pkgconf SDL2 glew lang/gcc gtk3
226+
prepare: pkg install -y git gmake pkgconf SDL2 lang/gcc gtk3
228227
run: |
229228
cd platforms/bsd
230229
gmake

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Don't hesitate to report bugs or ask for new features by [opening an issue](http
5252
<td rowspan="2"><strong>Linux</strong></td>
5353
<td>Ubuntu 24.04</td>
5454
<td><a href="https://github.com/drhelius/Gearboy/releases/download/3.7.1/Gearboy-3.7.1-ubuntu-24.04.zip">Gearboy-3.7.1-ubuntu-24.04.zip</a></td>
55-
<td rowspan="2">May need <code>libsdl2</code> and <code>libglew</code></td>
55+
<td rowspan="2">May need <code>libsdl2</code></td>
5656
</tr>
5757
<tr>
5858
<td>Ubuntu 22.04</td>
@@ -141,23 +141,23 @@ make dist
141141
- Ubuntu / Debian / Raspberry Pi (Raspbian):
142142

143143
``` shell
144-
sudo apt install build-essential libsdl2-dev libglew-dev libgtk-3-dev
144+
sudo apt install build-essential libsdl2-dev libgtk-3-dev
145145
cd platforms/linux
146146
make
147147
```
148148

149149
- Fedora:
150150

151151
``` shell
152-
sudo dnf install @development-tools gcc-c++ SDL2-devel glew-devel gtk3-devel
152+
sudo dnf install @development-tools gcc-c++ SDL2-devel gtk3-devel
153153
cd platforms/linux
154154
make
155155
```
156156

157157
- Arch Linux:
158158

159159
``` shell
160-
sudo pacman -S base-devel sdl2 glew gtk3
160+
sudo pacman -S base-devel sdl2 gtk3
161161
cd platforms/linux
162162
make
163163
```
@@ -167,15 +167,15 @@ make
167167
- FreeBSD:
168168

169169
``` shell
170-
su root -c "pkg install -y git gmake pkgconf SDL2 glew lang/gcc gtk3"
170+
su root -c "pkg install -y git gmake pkgconf SDL2 lang/gcc gtk3"
171171
cd platforms/bsd
172172
gmake
173173
```
174174

175175
- NetBSD:
176176

177177
``` shell
178-
su root -c "pkgin install gmake pkgconf SDL2 glew lang/gcc gtk3"
178+
su root -c "pkgin install gmake pkgconf SDL2 lang/gcc gtk3"
179179
cd platforms/bsd
180180
gmake
181181
```

platforms/desktop-shared/Makefile.common

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ endif
5252

5353
ifeq ($(UNAME_S), Linux)
5454
PLATFORM = "Linux"
55-
LDFLAGS += -lGL -lGLEW -ldl `sdl2-config --libs`
55+
LDFLAGS += -lGL -ldl `sdl2-config --static-libs`
5656
CPPFLAGS += `sdl2-config --cflags`
5757
TARGET := $(TARGET_NAME)
5858
else ifeq ($(UNAME_S), Darwin)
@@ -63,11 +63,9 @@ else ifeq ($(UNAME_S), Darwin)
6363
TARGET := $(TARGET_NAME)
6464
else
6565
PLATFORM = "Generic Unix-like/BSD"
66-
LDFLAGS += `sdl2-config --libs` -lSDL2
67-
LDFLAGS += `pkg-config --libs glew` -lGLEW
66+
LDFLAGS += -lGL `sdl2-config --libs`
6867
CXXFLAGS += -std=gnu++11
6968
CPPFLAGS += `sdl2-config --cflags`
70-
CPPFLAGS += `pkg-config --cflags glew`
7169
TARGET := $(TARGET_NAME)
7270
endif
7371

0 commit comments

Comments
 (0)