Skip to content

Commit c2a309e

Browse files
committed
Fix headlessness and use fixed SDL tag
1 parent d3f8a57 commit c2a309e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

lib/SDL

Submodule SDL updated 1238 files

util/minetester/build_minetest.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,18 @@ cd build/headless
77

88

99
SDL2_DIR=${ROOT}/lib/SDL/build/lib/cmake/SDL2/
10-
IRRLICHTMT_DIR=${ROOT}/lib/irrlichtmt
1110

1211
echo ${SDL2_DIR}
1312

14-
cmake ../.. -DRUN_IN_PLACE=TRUE -DBUILD_HEADLESS=1 -DSDL2_DIR=${SDL2_DIR} -DIRRLICHTMT_BUILD_DIR=${IRRLICHTMT_DIR}
13+
cmake ../.. -DRUN_IN_PLACE=TRUE -DBUILD_HEADLESS=1 -DSDL2_DIR=${SDL2_DIR}
1514
make -j$(( $(nproc) > 1 ? $(nproc) - 1 : 1 )) #use max(nproc - 1,1) threads
1615

1716
cd ../..
1817

1918
mv bin/minetest bin/minetest_headless
2019

2120
cd build/normal
22-
cmake ../.. -DRUN_IN_PLACE=TRUE -DBUILD_HEADLESS=0 -DSDL2_DIR= -DIRRLICHTMT_BUILD_DIR=${IRRLICHTMT_DIR}
21+
cmake ../.. -DRUN_IN_PLACE=TRUE -DBUILD_HEADLESS=0 -DSDL2_DIR=
2322
make -j$(( $(nproc) > 1 ? $(nproc) - 1 : 1 )) #use max(nproc - 1,1) threads
2423

2524
cd ../..

0 commit comments

Comments
 (0)