made configure to activate zipios++ support when the lib is found
This commit is contained in:
parent
3113d60a45
commit
26d745afcc
6 changed files with 25 additions and 1 deletions
|
@ -21,6 +21,7 @@ CVS HEAD:
|
|||
* Death Knight
|
||||
* Lord
|
||||
* Master Bowman
|
||||
* take advantage of libzipios++ if available, to read cfg files, maps, images, and sound effects from zip files
|
||||
* fixed missing Deathblade in multiplayer
|
||||
* downloaded campaigns no longer require a restart to be able to play them
|
||||
* multiplayer game settings (map name, gold per village, ...) are saved now
|
||||
|
|
19
configure.ac
19
configure.ac
|
@ -492,6 +492,25 @@ fi
|
|||
|
||||
AC_SUBST([FREETYPE_LIBS])
|
||||
|
||||
AC_LANG(C++)
|
||||
AC_MSG_CHECKING([for libzipios++])
|
||||
OLD_LIBS="$LIBS"
|
||||
LIBS="$LIBS -lzipios"
|
||||
LIBZIPIOS=
|
||||
AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||
#include <zipios++/dircoll.h>
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
zipios::DirectoryCollection z("src");
|
||||
}
|
||||
])],
|
||||
[AC_MSG_RESULT(yes)
|
||||
LIBZIPIOS=-lzipios
|
||||
AC_DEFINE([USE_ZIPIOS],[1],[Make use of the zipios++ library to read data in zip files])],
|
||||
[AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN([*** libzipios++ not found - support for ZIP files is disabled])])
|
||||
LIBS="$OLD_LIBS"
|
||||
AC_SUBST([LIBZIPIOS])
|
||||
|
||||
#######################################################################
|
||||
# Checks for header files. #
|
||||
|
|
|
@ -356,7 +356,7 @@ CXXLD = $(LDPREFIX) $(CXX)
|
|||
|
||||
|
||||
LIBS = $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \
|
||||
$(SDL_TTF_LIBS) $(SDL_LIBS) $(FREETYPE_LIBS) $(LIBINTL)
|
||||
$(SDL_TTF_LIBS) $(SDL_LIBS) $(LIBZIPIOS) $(FREETYPE_LIBS) $(LIBINTL)
|
||||
|
||||
if STATIC
|
||||
LDFLAGS += -all-static
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include "team.hpp"
|
||||
#include "util.hpp"
|
||||
#include "wassert.hpp"
|
||||
#include "wesconfig.h"
|
||||
|
||||
#include "SDL_image.h"
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include "game_config.hpp"
|
||||
#include "log.hpp"
|
||||
#include "sound.hpp"
|
||||
#include "wesconfig.h"
|
||||
|
||||
#include "SDL_mixer.h"
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "wesconfig.h"
|
||||
|
||||
#ifdef USE_ZIPIOS
|
||||
|
||||
#include <vector>
|
||||
|
|
Loading…
Add table
Reference in a new issue