PolitikerNEU jpg and png support! ( currently linux only ? )

Some little changes where I forgot to integrate the playername
Mousescroll is not longer super fast
This commit is contained in:
Titus Tscharntke
2010-03-23 23:32:25 +00:00
parent f18c73d371
commit ecc39ea911
24 changed files with 1454 additions and 100 deletions

View File

@@ -26,7 +26,7 @@ for i in $(LIB_DIRS) {
}
Library glestlib : $(LIB_SOURCES) ;
ExternalLibs glestlib : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL LUA ;
ExternalLibs glestlib : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL LUA JPEG PNG ;
IncludeDir glestlib : $(LIB_INCLUDE_DIRS) ;
#### Game ####
@@ -55,7 +55,7 @@ for i in $(GLEST_DIRS) {
Application glest.bin : $(GLEST_SOURCES) ;
LinkWith glest.bin : glestlib ;
ExternalLibs glest.bin : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL LUA ;
ExternalLibs glest.bin : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL LUA JPEG PNG ;
IncludeDir glest.bin : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_DIRS) ;
#### Editor ####

View File

@@ -103,6 +103,25 @@ NP_FINDLIB([OPENAL], [OpenAL], [OpenAL],
[AC_MSG_ERROR([Please intall OpenAL])],
[], [])
NP_FINDLIB([JPEG], [LibJPEG], [LibJPEG],
NP_LANG_PROGRAM([
#include <stdio.h>
#include <sys/types.h>
#include <jpeglib.h>],
[jpeg_create_decompress(0);]),
[], [-ljpeg],
[],
[AC_MSG_ERROR([Please intall libjpeg])],
[], [])
NP_FINDLIB([PNG], [LibPng], [LibPNG],
NP_LANG_PROGRAM([#include <png.h>],
[png_sig_cmp(0, 0, 8);]),
[], [-lpng],
[],
[AC_MSG_ERROR([Please intall libpng])],
[], [])
CHECK_LUA([], [AC_MSG_ERROR([Please install lua 5.1])])
AX_CHECK_GL