Skip to content

Commit 7187e3f

Browse files
committed
Add glm library dependency
1 parent 0f79b69 commit 7187e3f

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

.github/workflows/main.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ jobs:
9191
libglib2.0-dev \
9292
libraqm-dev \
9393
libglew-dev \
94-
libcurl4-openssl-dev
94+
libcurl4-openssl-dev \
95+
libglm-dev
9596
- name: Install 32-bit linux dependencies
9697
if: ${{ matrix.os == 'ubuntu-latest' && matrix.arch == 32 }}
9798
run: |
@@ -118,15 +119,16 @@ jobs:
118119
libfreetype6-dev:i386 \
119120
libcurl4-openssl-dev:i386 \
120121
libharfbuzz-dev:i386 \
121-
libfribidi-dev:i386
122+
libfribidi-dev:i386 \
123+
libglm-dev
122124
# Nethier GLEW nor glbinding exist in 32-bit for Ubuntu 20.04, so snatch the debs from 16.04 instead
123125
wget archive.ubuntu.com/ubuntu/pool/main/g/glew/libglew1.13_1.13.0-2_i386.deb && sudo dpkg -i libglew1.13_1.13.0-2_i386.deb
124126
wget archive.ubuntu.com/ubuntu/pool/main/g/glew/libglew-dev_1.13.0-2_i386.deb && sudo dpkg -i libglew-dev_1.13.0-2_i386.deb
125127
- name: Install macos dependencies
126128
if: ${{ matrix.os == 'macos-latest' }}
127129
run: |
128130
brew install cmake googletest bash libogg libvorbis glew openal-soft sdl2 sdl2_image sdl2_ttf \
129-
freetype harfbuzz fribidi glib gtk-doc glbinding libraqm
131+
freetype harfbuzz fribidi glib gtk-doc glbinding libraqm glm
130132
# Something funky happens with freetype if mono is left
131133
sudo mv /Library/Frameworks/Mono.framework /Library/Frameworks/Mono.framework-disabled
132134
- name: Set compiler (gcc)
@@ -276,6 +278,7 @@ jobs:
276278
vcpkg install openal-soft:$Env:ARCH-windows
277279
vcpkg install sdl2:$Env:ARCH-windows
278280
vcpkg install sdl2-image[libjpeg-turbo]:$Env:ARCH-windows
281+
vcpkg install glm:$Env:ARCH-windows
279282
- name: Configure bulid
280283
env:
281284
BUILD_TYPE: ${{ matrix.build_type }}

.github/workflows/other.yml

+2
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ jobs:
6868
pkg install -y libvorbis
6969
pkg install -y freetype
7070
pkg install -y libraqm
71+
pkg install -y glm
7172
run: |
7273
mkdir build && cd build
7374
cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWARNINGS=ON -DWERROR=ON -DBUILD_TESTS=ON -DCMAKE_INSTALL_MESSAGE=NEVER -DCMAKE_INSTALL_PREFIX=/usr -DINSTALL_SUBDIR_BIN=bin -DINSTALL_SUBDIR_SHARE=share/supertux2
@@ -162,6 +163,7 @@ jobs:
162163
./vcpkg/vcpkg install libpng:wasm32-emscripten
163164
./vcpkg/vcpkg install libogg:wasm32-emscripten
164165
./vcpkg/vcpkg install libvorbis:wasm32-emscripten
166+
./vcpkg/vcpkg install glm:wasm32-emscripten
165167
- name: Patch SDL_ttf
166168
working-directory: external/SDL_ttf
167169
run: git apply ../../mk/emscripten/SDL_ttf.patch

CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ find_package(Boost REQUIRED COMPONENTS filesystem system date_time locale)
174174
include_directories(SYSTEM ${Boost_INCLUDE_DIR})
175175
link_directories(${Boost_LIBRARY_DIRS})
176176

177+
find_package(glm REQUIRED)
177178
find_package(PNG REQUIRED)
178179

179180
if(WIN32)
@@ -875,6 +876,7 @@ else()
875876
add_executable(supertux2 src/main.cpp)
876877
endif(WIN32)
877878
target_link_libraries(supertux2 supertux2_lib Boost::filesystem Boost::locale)
879+
target_link_libraries(supertux2 glm::glm)
878880
set_target_properties(supertux2_lib PROPERTIES OUTPUT_NAME supertux2_lib)
879881
set_target_properties(supertux2_lib PROPERTIES COMPILE_FLAGS "${SUPERTUX2_EXTRA_WARNING_FLAGS}")
880882
if(EMSCRIPTEN)

guix.scm

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
(gnu packages gcc)
3131
(gnu packages gl)
3232
(gnu packages gtk)
33+
(gnu packages maths)
3334
(gnu packages pkg-config)
3435
(gnu packages python)
3536
(gnu packages sdl)
@@ -82,7 +83,8 @@
8283
("libraqm" ,libraqm)
8384
("fribidi" ,fribidi)
8485
("harfbuzz" ,harfbuzz)
85-
("squirrel" ,squirrel)))
86+
("squirrel" ,squirrel)
87+
("glm", glm)))
8688
(synopsis (synopsis-from-source %source-dir))
8789
(description (description-from-source %source-dir))
8890
(home-page (homepage-from-source %source-dir))

mk/ubports/clickable.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"libcurl4-openssl-dev",
1717
"libglew-dev",
1818
"libharfbuzz-dev",
19-
"libfribidi-dev"
19+
"libfribidi-dev",
20+
"libglm-dev"
2021
],
2122
"install_lib": [
2223
"/usr/lib/${ARCH_TRIPLET}/libogg.so*",

0 commit comments

Comments
 (0)