Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FTGL required + Manjaro wx package corrected to wxgtk-common 

Fixes bugs found in iss #206. Building without FTGL fails and the error
is confusing. So we'll fail at the cmake stage (suggested by andy5995).
People who don't want it can disable this at their own peril! ;-)
This commit is contained in:
Jammyjamjamman 2021-07-14 22:28:06 +01:00
parent 0e5d3a2d49
commit 680c868aa9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/linux/setupBuildDeps.sh
View File

@ -240,7 +240,7 @@ case $distribution in
if [ "$architecture" = "x86_64" ]; then lib=""; else lib="lib32-"; fi
case $release in
*)
installcommand="pacman $PACMAN_OPTIONS -S --needed gcc-multilib cmake ${lib}libcurl-gnutls ${lib}sdl2 ${lib}openal lua ${lib}libjpeg-turbo ${lib}libpng ${lib}freetype2 ${lib}wxgtk cppunit fribidi ftgl ${lib}glew ${lib}libogg ${lib}libvorbis miniupnpc libircclient vlc ${lib}libxml2 ${lib}libx11 ${lib}mesa ${lib}glu"
installcommand="pacman $PACMAN_OPTIONS -S --needed gcc-multilib cmake ${lib}libcurl-gnutls ${lib}sdl2 ${lib}openal lua ${lib}libjpeg-turbo ${lib}libpng ${lib}freetype2 ${lib}wxgtk-common cppunit fribidi ftgl ${lib}glew ${lib}libogg ${lib}libvorbis miniupnpc libircclient vlc ${lib}libxml2 ${lib}libx11 ${lib}mesa ${lib}glu"
unsupported_currently_this_OS="release"
esac
;;

2
source/shared_lib/CMakeLists.txt
View File

@ -166,7 +166,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
OPTION(WANT_USE_FTGL "Use libFTGL for on-screen fonts (found on your system)" ON)
find_package( Freetype REQUIRED)
include_directories( ${FREETYPE_INCLUDE_DIRS} )
FIND_PACKAGE(FTGL)
FIND_PACKAGE(FTGL REQUIRED)
IF(WANT_USE_FTGL)
if (FTGL_FOUND)
MESSAGE(STATUS "**NOTE: FTGL font support was detected and enabled.")