File tree 5 files changed +15
-5
lines changed
5 files changed +15
-5
lines changed Original file line number Diff line number Diff line change 91
91
libglib2.0-dev \
92
92
libraqm-dev \
93
93
libglew-dev \
94
- libcurl4-openssl-dev
94
+ libcurl4-openssl-dev \
95
+ libglm-dev
95
96
- name : Install 32-bit linux dependencies
96
97
if : ${{ matrix.os == 'ubuntu-latest' && matrix.arch == 32 }}
97
98
run : |
@@ -118,15 +119,16 @@ jobs:
118
119
libfreetype6-dev:i386 \
119
120
libcurl4-openssl-dev:i386 \
120
121
libharfbuzz-dev:i386 \
121
- libfribidi-dev:i386
122
+ libfribidi-dev:i386 \
123
+ libglm-dev
122
124
# Nethier GLEW nor glbinding exist in 32-bit for Ubuntu 20.04, so snatch the debs from 16.04 instead
123
125
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
124
126
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
125
127
- name : Install macos dependencies
126
128
if : ${{ matrix.os == 'macos-latest' }}
127
129
run : |
128
130
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
130
132
# Something funky happens with freetype if mono is left
131
133
sudo mv /Library/Frameworks/Mono.framework /Library/Frameworks/Mono.framework-disabled
132
134
- name : Set compiler (gcc)
@@ -276,6 +278,7 @@ jobs:
276
278
vcpkg install openal-soft:$Env:ARCH-windows
277
279
vcpkg install sdl2:$Env:ARCH-windows
278
280
vcpkg install sdl2-image[libjpeg-turbo]:$Env:ARCH-windows
281
+ vcpkg install glm:$Env:ARCH-windows
279
282
- name : Configure bulid
280
283
env :
281
284
BUILD_TYPE : ${{ matrix.build_type }}
Original file line number Diff line number Diff line change 68
68
pkg install -y libvorbis
69
69
pkg install -y freetype
70
70
pkg install -y libraqm
71
+ pkg install -y glm
71
72
run : |
72
73
mkdir build && cd build
73
74
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:
162
163
./vcpkg/vcpkg install libpng:wasm32-emscripten
163
164
./vcpkg/vcpkg install libogg:wasm32-emscripten
164
165
./vcpkg/vcpkg install libvorbis:wasm32-emscripten
166
+ ./vcpkg/vcpkg install glm:wasm32-emscripten
165
167
- name : Patch SDL_ttf
166
168
working-directory : external/SDL_ttf
167
169
run : git apply ../../mk/emscripten/SDL_ttf.patch
Original file line number Diff line number Diff line change @@ -174,6 +174,7 @@ find_package(Boost REQUIRED COMPONENTS filesystem system date_time locale)
174
174
include_directories (SYSTEM ${Boost_INCLUDE_DIR} )
175
175
link_directories (${Boost_LIBRARY_DIRS} )
176
176
177
+ find_package (glm REQUIRED)
177
178
find_package (PNG REQUIRED)
178
179
179
180
if (WIN32 )
@@ -875,6 +876,7 @@ else()
875
876
add_executable (supertux2 src/main.cpp)
876
877
endif (WIN32 )
877
878
target_link_libraries (supertux2 supertux2_lib Boost::filesystem Boost::locale)
879
+ target_link_libraries (supertux2 glm::glm)
878
880
set_target_properties (supertux2_lib PROPERTIES OUTPUT_NAME supertux2_lib)
879
881
set_target_properties (supertux2_lib PROPERTIES COMPILE_FLAGS "${SUPERTUX2_EXTRA_WARNING_FLAGS} " )
880
882
if (EMSCRIPTEN)
Original file line number Diff line number Diff line change 30
30
(gnu packages gcc)
31
31
(gnu packages gl)
32
32
(gnu packages gtk)
33
+ (gnu packages maths)
33
34
(gnu packages pkg-config)
34
35
(gnu packages python)
35
36
(gnu packages sdl)
82
83
(" libraqm" ,libraqm)
83
84
(" fribidi" ,fribidi)
84
85
(" harfbuzz" ,harfbuzz)
85
- (" squirrel" ,squirrel)))
86
+ (" squirrel" ,squirrel)
87
+ (" glm" , glm)))
86
88
(synopsis (synopsis-from-source %source-dir))
87
89
(description (description-from-source %source-dir))
88
90
(home-page (homepage-from-source %source-dir))
Original file line number Diff line number Diff line change 16
16
" libcurl4-openssl-dev" ,
17
17
" libglew-dev" ,
18
18
" libharfbuzz-dev" ,
19
- " libfribidi-dev"
19
+ " libfribidi-dev" ,
20
+ " libglm-dev"
20
21
],
21
22
"install_lib" : [
22
23
" /usr/lib/${ARCH_TRIPLET}/libogg.so*" ,
You can’t perform that action at this time.
0 commit comments