Index: enigma-1.21/configure =================================================================== --- enigma-1.21/configure +++ enigma-1.21/configure 2015-03-11 09:03:40.106816835 +0100 @@ -798,8 +798,7 @@ PKG_CONFIG_LIBDIR LIBENET_CFLAGS LIBENET_LIBS' -ac_subdirs_all='lib-src/enet -lib-src/zipios++' +ac_subdirs_all='lib-src/enet' # Initialize some variables set by options. ac_init_help= @@ -11123,8 +11122,6 @@ -subdirs="$subdirs lib-src/zipios++" - ac_config_files="$ac_config_files Makefile m4/Makefile intl/Makefile data/Makefile data/gfx/Makefile data/gfx/flags25x15/Makefile data/gfx16/Makefile data/gfx32/Makefile data/gfx40/Makefile data/gfx48/Makefile data/gfx64/Makefile data/levels/Makefile data/levels/enigma_tutorial/Makefile data/levels/enigma_i/Makefile data/levels/enigma_ii/Makefile data/levels/enigma_iii/Makefile data/levels/enigma_iv/Makefile data/levels/enigma_v/Makefile data/levels/enigma_vi/Makefile data/levels/enigma_vii/Makefile data/levels/enigma_viii/Makefile data/levels/enigma_ix/Makefile data/levels/enigma_x/Makefile data/levels/enigma_cross/Makefile data/levels/enigma_esprit/Makefile data/levels/enigma_oxyd/Makefile data/levels/enigma_peroxyd/Makefile data/levels/enigma_oxydmagnum/Makefile data/levels/enigma_oxydextra/Makefile data/levels/enigma_experimental/Makefile data/levels/enigma_demolevels/Makefile data/levels/enigma_advent_10/Makefile data/levels/pentomino_i/Makefile data/levels/soko/Makefile data/levels/soko/skinner_microban01/Makefile data/levels/soko/skinner_microban02/Makefile data/levels/soko/skinner_microban03/Makefile data/levels/soko/skinner_microban04/Makefile data/levels/soko/skinner_microban05/Makefile data/levels/soko/skinner_sasquatch01/Makefile data/levels/soko/skinner_sasquatch02/Makefile data/levels/soko/skinner_sasquatch03/Makefile data/levels/soko/skinner_sasquatch04/Makefile data/levels/soko/skinner_sasquatch05/Makefile data/levels/soko/skinner_sasquatch06/Makefile data/levels/soko/skinner_sasquatch07/Makefile data/levels/soko/skinner_sasquatch08/Makefile data/levels/soko/skinner_sasquatch09/Makefile data/levels/soko/skinner_sasquatch10/Makefile data/levels/soko/skinner_sasquatch11/Makefile data/levels/soko/skinner_sasquatch12/Makefile data/levels/lib/Makefile data/levels/patches/Makefile data/fonts/Makefile data/music/Makefile data/music/game/Makefile data/music/menu/Makefile data/soundsets/Makefile data/soundsets/enigma/Makefile data/schemas/Makefile doc/Makefile doc/images/Makefile doc/images/flags25x15/Makefile doc/manual/Makefile doc/manual/images/Makefile doc/reference/Makefile doc/reference/images/Makefile etc/Makefile lib-src/Makefile lib-src/oxydlib/Makefile lib-src/lua/Makefile lib-src/enigma-core/Makefile src/Makefile tools/Makefile etc/enigma.spec etc/enigma.nsi etc/Info.plist po/Makefile.in" Index: enigma-1.21/src/Makefile.am =================================================================== --- enigma-1.21/src/Makefile.am +++ enigma-1.21/src/Makefile.am 2015-03-11 09:02:52.004046524 +0100 @@ -13,8 +13,6 @@ -DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \ -DDOCDIR=\"$(docdir)\" \ -DLOCALEDIR=\"$(localedir_enigma)\" \ - -I$(top_srcdir)/lib-src/zipios++ \ - -I$(top_builddir)/lib-src/zipios++ \ -I$(top_srcdir)/lib-src/lua \ -I$(top_srcdir)/lib-src/enigma-core @@ -457,8 +455,7 @@ endif enigma_LDADD += $(top_builddir)/lib-src/oxydlib/liboxyd.a \ - $(top_builddir)/lib-src/zipios++/src/libzipios.a \ - -lz \ + -lzipios \ $(mingw_ldadd) \ @SDL_LIBS@ Index: enigma-1.21/src/Makefile.in =================================================================== --- enigma-1.21/src/Makefile.in +++ enigma-1.21/src/Makefile.in 2015-03-11 09:03:19.213782658 +0100 @@ -155,7 +155,6 @@ enigma_DEPENDENCIES = $(top_builddir)/lib-src/enigma-core/libecl.a \ $(top_builddir)/lib-src/lua/liblua.a $(am__DEPENDENCIES_2) \ $(am__append_4) $(top_builddir)/lib-src/oxydlib/liboxyd.a \ - $(top_builddir)/lib-src/zipios++/src/libzipios.a \ $(am__DEPENDENCIES_3) enigma_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(enigma_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -197,8 +196,7 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ -DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \ -DDOCDIR=\"$(docdir)\" -DLOCALEDIR=\"$(localedir_enigma)\" \ - -I$(top_srcdir)/lib-src/zipios++ \ - -I$(top_builddir)/lib-src/zipios++ -I$(top_srcdir)/lib-src/lua \ + -I$(top_srcdir)/lib-src/lua \ -I$(top_srcdir)/lib-src/enigma-core $(am__append_1) \ $(am__append_2) -I$(top_srcdir)/lib-src -I$(top_builddir)/intl \ @SDL_CFLAGS@ $(am__empty) @@ -742,7 +740,7 @@ enigma_LDADD = @LIBINTL@ $(top_builddir)/lib-src/enigma-core/libecl.a \ $(top_builddir)/lib-src/lua/liblua.a $(am__append_3) \ $(am__append_4) $(top_builddir)/lib-src/oxydlib/liboxyd.a \ - $(top_builddir)/lib-src/zipios++/src/libzipios.a -lz \ + -lzipios \ $(mingw_ldadd) @SDL_LIBS@ #------------------ Packaging rules for Mac OSX ------------------------ Index: enigma-1.21/lib-src/Makefile.am =================================================================== --- enigma-1.21/lib-src/Makefile.am +++ enigma-1.21/lib-src/Makefile.am 2015-03-11 09:02:32.763944520 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = oxydlib lua zipios++ enigma-core +SUBDIRS = oxydlib lua enigma-core if !SYSTEM_ENET SUBDIRS += enet endif Index: enigma-1.21/lib-src/Makefile.in =================================================================== --- enigma-1.21/lib-src/Makefile.in +++ enigma-1.21/lib-src/Makefile.in 2015-03-11 09:02:30.902031616 +0100 @@ -76,7 +76,7 @@ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = oxydlib lua zipios++ enigma-core enet +DIST_SUBDIRS = oxydlib lua enigma-core enet DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -249,7 +249,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = oxydlib lua zipios++ enigma-core $(am__append_1) +SUBDIRS = oxydlib lua enigma-core $(am__append_1) all: all-recursive .SUFFIXES: