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

added support for building on fedora 13

This commit is contained in:
Mark Vejvoda 2010-06-07 07:08:29 +00:00
parent 1c4a5489b7
commit 10202792a3
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/linux/Jamfile
View File

@ -79,7 +79,7 @@ for i in $(GLEST_DIRS) {
Application glest.bin : $(GLEST_SOURCES) ;
LinkWith glest.bin : glestlib strefloplib ;
ExternalLibs glest.bin : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL LUA JPEG PNG CURL ;
ExternalLibs glest.bin : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL LUA JPEG PNG CURL X11 ;
IncludeDir glest.bin : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_DIRS) ;
#### Editor ####
@ -112,7 +112,7 @@ if $(WX_AVAILABLE) = "yes" {
Application glest_g3dviewer : $(GLEST_VIEWER_SOURCES) ../glest_game/graphics/unit_particle_type.cpp ;
LinkWith glest_g3dviewer : glestlib strefloplib ;
ExternalLibs glest_g3dviewer : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL LUA JPEG PNG CURL WX ;
ExternalLibs glest_g3dviewer : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL LUA JPEG PNG CURL WX X11 ;
IncludeDir glest_g3dviewer : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_VIEWER_DIRS) ../glest_game/graphics ../glest_game/global ../glest_game/sound ../glest_game/game ;
}

8
mk/linux/configure.ac
View File

@ -138,6 +138,14 @@ NP_FINDLIB([CURL], [LibCurl], [LibCurl],
[AC_MSG_ERROR([Please intall libcurl])],
[], [])
NP_FINDLIB([X11], [LibX11], [LibX11],
NP_LANG_PROGRAM([],
[]),
[], [-lX11],
[],
[AC_MSG_ERROR([Please intall libX11])],
[], [])
CHECK_LUA([], [AC_MSG_ERROR([Please install lua 5.1])])
AX_CHECK_GL

2
mk/linux/setupBuildDeps.sh
View File

@ -14,7 +14,7 @@ fi
if [ -f /etc/fedora-release ]; then
echo "=====> Using build deps for fedora 13..."
sudo yum install SDL-devel xerces-c-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel
sudo yum install SDL-devel xerces-c-devel mesa-libGL-devel mesa-libGLU-devel libvorbis-devel wxBase wxGTK-devel lua-devel libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libX11-devel
elif [ "`uname -r`" = $ubuntu804_32 ]; then
echo "=====> Using build deps for old Ubuntu 8.04..."