Add Autotools as alternative build system.

Also unbundle zlib completely
2024-06-02 19:38:20 -04:00 · 2017-01-21 18:48:43 +01:00 · 2017-01-21 18:48:43 +01:00 · e50a50b8c0
parent 59fb0313eb
commit e50a50b8c0
17 changed files with 1124 additions and 2364 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,3 +10,32 @@
 *.js
 *.bc
 .npmignore
+
+# Autotools cruft
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+missing
+source/core/.deps/
+source/core/.dirstamp
+source/core/api/.deps/
+source/core/api/.dirstamp
+source/core/board/.deps/
+source/core/board/.dirstamp
+source/core/input/.deps/
+source/core/input/.dirstamp
+source/core/vssystem/.deps/
+source/core/vssystem/.dirstamp
+source/unix/.deps/
+source/unix/.dirstamp
+source/unix/gtkui/.deps/
+source/unix/gtkui/.dirstamp
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -410,18 +410,18 @@ endif()
 # Installation #
 ################
 # program-specific files
-install( TARGETS nestopia                         DESTINATION ${CMAKE_INSTALL_BINDIR} )
-install( FILES NstDatabase.xml                    DESTINATION ${CMAKE_INSTALL_DATADIR}/nestopia )
+install( TARGETS nestopia                          DESTINATION ${CMAKE_INSTALL_BINDIR} )
+install( FILES NstDatabase.xml                     DESTINATION ${CMAKE_INSTALL_DATADIR}/nestopia )

 # freedesktop.org-specific files
-install( FILES source/unix/icons/nestopia.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications )
-install( FILES source/unix/icons/nestopia32.png   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps RENAME nestopia.png )
-install( FILES source/unix/icons/nestopia48.png   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps RENAME nestopia.png )
-install( FILES source/unix/icons/nestopia64.png   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps RENAME nestopia.png )
-install( FILES source/unix/icons/nestopia96.png   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/96x96/apps RENAME nestopia.png )
-install( FILES source/unix/icons/nestopia128.png  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps RENAME nestopia.png )
-install( FILES source/unix/icons/nestopia.svg     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps )
-install( FILES source/unix/icons/nespad.svg       DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps )
+install( FILES source/unix/icons/nestopia.desktop  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications )
+install( FILES source/unix/icons/32/nestopia.png   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps )
+install( FILES source/unix/icons/48/nestopia.png   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps )
+install( FILES source/unix/icons/64/nestopia.png   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps )
+install( FILES source/unix/icons/96/nestopia.png   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/96x96/apps )
+install( FILES source/unix/icons/128/nestopia.png  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps )
+install( FILES source/unix/icons/svg/nestopia.svg  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps )
+install( FILES source/unix/icons/svg/nespad.svg    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps )

 # documentation
 install( FILES AUTHORS ChangeLog README.md README.unix DESTINATION ${CMAKE_INSTALL_DOCDIR} )
--- a/Makefile.am
+++ b/Makefile.am
@ -0,0 +1,955 @@
+###############
+# Definitions #
+###############
+bin_PROGRAMS = nestopia
+nestopia_SOURCES = source/unix/main.cpp
+
+EXTRA_DIST = doc
+
+nestopia_CPPFLAGS = \
+	-I$(top_srcdir)/source \
+	-DDATADIR=\"$(datadir)/nestopia\" \
+	-DDATAROOTDIR=\"$(datarootdir)\" \
+	-DNST_PRAGMA_ONCE \
+	$(ZLIB_CFLAGS) \
+	$(LIBARCHIVE_CFLAGS) \
+	$(LIBAO_CFLAGS) \
+	$(SDL2_CFLAGS) \
+	$(LIBEPOXY_CFLAGS)
+nestopia_LDADD = \
+	$(ZLIB_LIBS) \
+	$(LIBARCHIVE_LIBS) \
+	$(LIBAO_LIBS) \
+	$(SDL2_LIBS) \
+	$(LIBEPOXY_LIBS)
+
+if ENABLE_GUI
+nestopia_CPPFLAGS += -D_GTK $(GTK3_CFLAGS)
+nestopia_LDADD += $(GTK3_LIBS)
+endif
+
+################
+# Installation #
+################
+# program-specific files
+databasedir = $(datadir)/nestopia
+dist_database_DATA = NstDatabase.xml
+
+# freedesktop.org-specific files
+desktopdir = $(datarootdir)/applications
+dist_desktop_DATA = source/unix/icons/nestopia.desktop
+
+icon32dir = $(datarootdir)/icons/hicolor/32x32/apps
+dist_icon32_DATA = source/unix/icons/32/nestopia.png
+
+icon48dir = $(datarootdir)/icons/hicolor/48x48/apps
+dist_icon48_DATA = source/unix/icons/48/nestopia.png
+
+icon64dir = $(datarootdir)/icons/hicolor/64x64/apps
+dist_icon64_DATA = source/unix/icons/64/nestopia.png
+
+icon96dir = $(datarootdir)/icons/hicolor/96x96/apps
+dist_icon96_DATA = source/unix/icons/96/nestopia.png
+
+icon128dir = $(datarootdir)/icons/hicolor/128x128/apps
+dist_icon128_DATA = source/unix/icons/128/nestopia.png
+
+iconsvgdir = $(datarootdir)/icons/hicolor/scalable/apps
+dist_iconsvg_DATA = source/unix/icons/svg/nestopia.svg source/unix/icons/svg/nespad.svg
+
+# documentation
+dist_doc_DATA = AUTHORS ChangeLog README.md README.unix
+dist_html_DATA = readme.html
+
+#####################
+# Source code files #
+#####################
+EXTRA_DIST += \
+	source/core/NstVideoFilterHq3x.inl \
+	source/core/NstVideoFilterHq4x.inl \
+	source/core/NstVideoFilterHq2x.inl \
+	source/core/NstSoundRenderer.inl \
+	source/nes_ntsc/nes_ntsc.inl
+
+nestopia_SOURCES += \
+	source/core/NstTrackerMovie.hpp \
+	source/core/NstFile.hpp \
+	source/core/NstAssert.cpp \
+	source/core/NstIoLine.hpp \
+	source/core/NstCartridgeInes.cpp \
+	source/core/NstSoundRenderer.hpp \
+	source/core/NstMachine.hpp \
+	source/core/NstFile.cpp \
+	source/core/NstVideoFilterxBR.cpp \
+	source/core/NstChecksum.hpp \
+	source/core/NstVideoFilterNone.cpp \
+	source/core/NstPatcherUps.cpp \
+	source/core/NstCartridgeRomset.hpp \
+	source/core/input/NstInpBarcodeWorld.hpp \
+	source/core/input/NstInpKonamiHyperShot.hpp \
+	source/core/input/NstInpPowerGlove.hpp \
+	source/core/input/NstInpTopRider.cpp \
+	source/core/input/NstInpMouse.hpp \
+	source/core/input/NstInpCrazyClimber.cpp \
+	source/core/input/NstInpSuborKeyboard.hpp \
+	source/core/input/NstInpPowerPad.hpp \
+	source/core/input/NstInpPowerGlove.cpp \
+	source/core/input/NstInpOekaKidsTablet.cpp \
+	source/core/input/NstInpMouse.cpp \
+	source/core/input/NstInpAdapter.hpp \
+	source/core/input/NstInpPartyTap.hpp \
+	source/core/input/NstInpFamilyTrainer.cpp \
+	source/core/input/NstInpExcitingBoxing.hpp \
+	source/core/input/NstInpPartyTap.cpp \
+	source/core/input/NstInpPaddle.hpp \
+	source/core/input/NstInpMahjong.cpp \
+	source/core/input/NstInpDevice.hpp \
+	source/core/input/NstInpTurboFile.cpp \
+	source/core/input/NstInpBarcodeWorld.cpp \
+	source/core/input/NstInpRob.hpp \
+	source/core/input/NstInpPad.hpp \
+	source/core/input/NstInpPad.cpp \
+	source/core/input/NstInpZapper.hpp \
+	source/core/input/NstInpFamilyKeyboard.cpp \
+	source/core/input/NstInpMahjong.hpp \
+	source/core/input/NstInpPachinko.hpp \
+	source/core/input/NstInpAdapter.cpp \
+	source/core/input/NstInpRob.cpp \
+	source/core/input/NstInpDoremikkoKeyboard.cpp \
+	source/core/input/NstInpPachinko.cpp \
+	source/core/input/NstInpOekaKidsTablet.hpp \
+	source/core/input/NstInpKonamiHyperShot.cpp \
+	source/core/input/NstInpFamilyTrainer.hpp \
+	source/core/input/NstInpZapper.cpp \
+	source/core/input/NstInpTopRider.hpp \
+	source/core/input/NstInpHoriTrack.cpp \
+	source/core/input/NstInpPokkunMoguraa.hpp \
+	source/core/input/NstInpBandaiHyperShot.hpp \
+	source/core/input/NstInpCrazyClimber.hpp \
+	source/core/input/NstInpTurboFile.hpp \
+	source/core/input/NstInpFamilyKeyboard.hpp \
+	source/core/input/NstInpExcitingBoxing.cpp \
+	source/core/input/NstInpPowerPad.cpp \
+	source/core/input/NstInpDoremikkoKeyboard.hpp \
+	source/core/input/NstInpSuborKeyboard.cpp \
+	source/core/input/NstInpPokkunMoguraa.cpp \
+	source/core/input/NstInpBandaiHyperShot.cpp \
+	source/core/input/NstInpPaddle.cpp \
+	source/core/input/NstInpHoriTrack.hpp \
+	source/core/NstCartridge.hpp \
+	source/core/NstStream.cpp \
+	source/core/NstCheats.hpp \
+	source/core/vssystem/NstVsSystem.hpp \
+	source/core/vssystem/NstVsRbiBaseball.hpp \
+	source/core/vssystem/NstVsSuperXevious.cpp \
+	source/core/vssystem/NstVsRbiBaseball.cpp \
+	source/core/vssystem/NstVsSuperXevious.hpp \
+	source/core/vssystem/NstVsTkoBoxing.cpp \
+	source/core/vssystem/NstVsSystem.cpp \
+	source/core/vssystem/NstVsTkoBoxing.hpp \
+	source/core/NstTracker.cpp \
+	source/core/NstChips.hpp \
+	source/core/NstIoMap.hpp \
+	source/core/NstVideoFilterxBR.hpp \
+	source/core/NstXml.cpp \
+	source/core/NstProperties.cpp \
+	source/core/NstCpu.cpp \
+	source/core/NstXml.hpp \
+	source/core/NstVideoFilterHqX.hpp \
+	source/core/NstVideoRenderer.cpp \
+	source/core/NstPatcherIps.cpp \
+	source/core/NstVideoFilterScaleX.hpp \
+	source/core/NstImageDatabase.hpp \
+	source/core/NstVideoRenderer.hpp \
+	source/core/NstImage.hpp \
+	source/core/NstTrackerRewinder.cpp \
+	source/core/NstVector.cpp \
+	source/core/NstLog.cpp \
+	source/core/NstSoundPlayer.cpp \
+	source/core/NstSoundRenderer.cpp \
+	source/core/NstCartridge.cpp \
+	source/core/NstIoAccessor.hpp \
+	source/core/NstDipSwitches.hpp \
+	source/core/NstFds.hpp \
+	source/core/NstChips.cpp \
+	source/core/NstApu.cpp \
+	source/core/NstState.hpp \
+	source/core/NstSha1.hpp \
+	source/core/NstVideoFilter2xSaI.hpp \
+	source/core/NstVideoFilterHqX.cpp \
+	source/core/NstPatcherUps.hpp \
+	source/core/NstCore.hpp \
+	source/core/NstSha1.cpp \
+	source/core/NstVideoScreen.hpp \
+	source/core/NstTracker.hpp \
+	source/core/NstRam.cpp \
+	source/core/NstTimer.hpp \
+	source/core/NstState.cpp \
+	source/core/api/NstApiEmulator.hpp \
+	source/core/api/NstApiVideo.cpp \
+	source/core/api/NstApiCheats.cpp \
+	source/core/api/NstApiMovie.hpp \
+	source/core/api/NstApiCartridge.cpp \
+	source/core/api/NstApi.hpp \
+	source/core/api/NstApiMachine.hpp \
+	source/core/api/NstApiRewinder.hpp \
+	source/core/api/NstApiMovie.cpp \
+	source/core/api/NstApiTapeRecorder.cpp \
+	source/core/api/NstApiEmulator.cpp \
+	source/core/api/NstApiRewinder.cpp \
+	source/core/api/NstApiNsf.cpp \
+	source/core/api/NstApiFds.cpp \
+	source/core/api/NstApiNsf.hpp \
+	source/core/api/NstApiMachine.cpp \
+	source/core/api/NstApiDipSwitches.cpp \
+	source/core/api/NstApiUser.hpp \
+	source/core/api/NstApiUser.cpp \
+	source/core/api/NstApiTapeRecorder.hpp \
+	source/core/api/NstApiBarcodeReader.hpp \
+	source/core/api/NstApiConfig.hpp \
+	source/core/api/NstApiFds.hpp \
+	source/core/api/NstApiVideo.hpp \
+	source/core/api/NstApiCheats.hpp \
+	source/core/api/NstApiBarcodeReader.cpp \
+	source/core/api/NstApiInput.hpp \
+	source/core/api/NstApiInput.cpp \
+	source/core/api/NstApiSound.cpp \
+	source/core/api/NstApiSound.hpp \
+	source/core/api/NstApiDipSwitches.hpp \
+	source/core/api/NstApiCartridge.hpp \
+	source/core/NstCartridgeUnif.hpp \
+	source/core/NstProperties.hpp \
+	source/core/NstVideoScreen.cpp \
+	source/core/NstFpuPrecision.hpp \
+	source/core/NstRam.hpp \
+	source/core/NstCheats.cpp \
+	source/core/NstZlib.cpp \
+	source/core/NstStream.hpp \
+	source/core/NstBase.hpp \
+	source/core/NstCartridgeUnif.cpp \
+	source/core/NstCore.cpp \
+	source/core/NstImage.cpp \
+	source/core/NstPatcherIps.hpp \
+	source/core/NstLog.hpp \
+	source/core/NstVideoFilter2xSaI.cpp \
+	source/core/NstMemory.cpp \
+	source/core/NstImageDatabase.cpp \
+	source/core/NstMachine.cpp \
+	source/core/NstAssert.hpp \
+	source/core/NstPins.cpp \
+	source/core/NstApu.hpp \
+	source/core/NstIoPort.hpp \
+	source/core/NstPpu.cpp \
+	source/core/NstTrackerMovie.cpp \
+	source/core/NstPatcher.cpp \
+	source/core/NstPpu.hpp \
+	source/core/NstMemory.hpp \
+	source/core/NstVideoFilterNone.hpp \
+	source/core/board/NstBoardBmcHero.hpp \
+	source/core/board/NstBoardVsSystem.cpp \
+	source/core/board/NstBoardBmcSuperVision16in1.hpp \
+	source/core/board/NstBoardBmc72in1.cpp \
+	source/core/board/NstBoardBandaiDatach.hpp \
+	source/core/board/NstBoardSunsoft3.hpp \
+	source/core/board/NstBoardUnlTf1201.cpp \
+	source/core/board/NstBoardMmc4.hpp \
+	source/core/board/NstBoardNRom.hpp \
+	source/core/board/NstBoardBmcResetBased4in1.cpp \
+	source/core/board/NstBoardKay.hpp \
+	source/core/board/NstBoardBmcSuper22Games.hpp \
+	source/core/board/NstBoardBmc20in1.cpp \
+	source/core/board/NstBoardBtlShuiGuanPipe.hpp \
+	source/core/board/NstBoardSuperGameBoogerman.hpp \
+	source/core/board/NstBoardKonamiVrc6.cpp \
+	source/core/board/NstBoardKonamiVrc2.cpp \
+	source/core/board/NstBoardSachenS8259.cpp \
+	source/core/board/NstBoardCneDecathlon.hpp \
+	source/core/board/NstBoardJalecoJf17.cpp \
+	source/core/board/NstBoardBmcVrc4.cpp \
+	source/core/board/NstBoardIremLrog017.hpp \
+	source/core/board/NstBoardWaixingSgzlz.cpp \
+	source/core/board/NstBoardUnlA9746.cpp \
+	source/core/board/NstBoardNtdec.hpp \
+	source/core/board/NstBoardJalecoJf17.hpp \
+	source/core/board/NstBoardNamcot175.cpp \
+	source/core/board/NstBoardCamerica.cpp \
+	source/core/board/NstBoardGouder.hpp \
+	source/core/board/NstBoardJalecoJf16.cpp \
+	source/core/board/NstBoardBmc31in1.hpp \
+	source/core/board/NstBoardBmcA65as.hpp \
+	source/core/board/NstBoardTxc.cpp \
+	source/core/board/NstBoardCamerica.hpp \
+	source/core/board/NstBoardKonamiVsSystem.hpp \
+	source/core/board/NstBoardFxRom.hpp \
+	source/core/board/NstBoardBmcSuperGun20in1.hpp \
+	source/core/board/NstBoardDiscrete.cpp \
+	source/core/board/NstBoardBmcY2k64in1.hpp \
+	source/core/board/NstBoardAveD1012.cpp \
+	source/core/board/NstBoardSachenSa0036.hpp \
+	source/core/board/NstBoardTxcTw.hpp \
+	source/core/board/NstBoard.cpp \
+	source/core/board/NstBoardBmcPowerjoy84in1.cpp \
+	source/core/board/NstBoardBtlSmb2a.hpp \
+	source/core/board/NstBoardTaitoX1005.cpp \
+	source/core/board/NstBoardBandaiLz93d50ex.hpp \
+	source/core/board/NstBoardBmc64in1.hpp \
+	source/core/board/NstBoardEvent.hpp \
+	source/core/board/NstBoardBtlMarioBaby.cpp \
+	source/core/board/NstBoardDxRom.hpp \
+	source/core/board/NstBoardMmc3.cpp \
+	source/core/board/NstBoardWaixingZs.cpp \
+	source/core/board/NstBoardJxRom.hpp \
+	source/core/board/NstBoardBmc36in1.cpp \
+	source/core/board/NstBoardWaixingSecurity.cpp \
+	source/core/board/NstBoardBmcGoldenGame260in1.cpp \
+	source/core/board/NstBoardBandaiLz93d50.hpp \
+	source/core/board/NstBoardAve.hpp \
+	source/core/board/NstBoardBtl6035052.cpp \
+	source/core/board/NstBoardNitra.cpp \
+	source/core/board/NstBoardWaixingPs2.hpp \
+	source/core/board/NstBoardHosenkan.cpp \
+	source/core/board/NstBoardUnlSuperFighter3.cpp \
+	source/core/board/NstBoardWaixingSh2.hpp \
+	source/core/board/NstBoardBtlT230.hpp \
+	source/core/board/NstBoardKonamiVrc7.hpp \
+	source/core/board/NstBoardSuperGamePocahontas2.hpp \
+	source/core/board/NstBoardUxRom.hpp \
+	source/core/board/NstBoardRcm.hpp \
+	source/core/board/NstBoardBmcSuperGun20in1.cpp \
+	source/core/board/NstBoardCne.hpp \
+	source/core/board/NstBoardNanjing.hpp \
+	source/core/board/NstBoardBmcVrc4.hpp \
+	source/core/board/NstBoardKonamiVrc6.hpp \
+	source/core/board/NstBoardBmc9999999in1.cpp \
+	source/core/board/NstBoardFfe.cpp \
+	source/core/board/NstBoardBmcA65as.cpp \
+	source/core/board/NstBoardMmc5.cpp \
+	source/core/board/NstBoardTaitoTc0190fmcPal16r4.hpp \
+	source/core/board/NstBoardRexSoft.hpp \
+	source/core/board/NstBoardKonamiVrc2.hpp \
+	source/core/board/NstBoardMmc2.cpp \
+	source/core/board/NstBoardIremHolyDiver.cpp \
+	source/core/board/NstBoardJaleco.hpp \
+	source/core/board/NstBoardHenggedianzi.hpp \
+	source/core/board/NstBoardRexSoftSl1632.hpp \
+	source/core/board/NstBoardNamcot175.hpp \
+	source/core/board/NstBoardBmcSuper700in1.hpp \
+	source/core/board/NstBoardBmc21in1.cpp \
+	source/core/board/NstBoardBmc8157.cpp \
+	source/core/board/NstBoardSxRom.hpp \
+	source/core/board/NstBoardGouder.cpp \
+	source/core/board/NstBoardBmcGolden190in1.hpp \
+	source/core/board/NstBoardBmcGoldenGame260in1.hpp \
+	source/core/board/NstBoardMmc3.hpp \
+	source/core/board/NstBoardSuperGame.hpp \
+	source/core/board/NstBoardBtlPikachuY2k.cpp \
+	source/core/board/NstBoardSunsoftDcs.hpp \
+	source/core/board/NstBoardCaltron.cpp \
+	source/core/board/NstBoardSachenSa0037.hpp \
+	source/core/board/NstBoardBmcGamestarB.hpp \
+	source/core/board/NstBoardUnlKingOfFighters97.cpp \
+	source/core/board/NstBoardFfe.hpp \
+	source/core/board/NstBoardBmcNovelDiamond.cpp \
+	source/core/board/NstBoardBtlPikachuY2k.hpp \
+	source/core/board/NstBoardSunsoftDcs.cpp \
+	source/core/board/NstBoardTxRom.cpp \
+	source/core/board/NstBoardBmcY2k64in1.cpp \
+	source/core/board/NstBoardTxcTw.cpp \
+	source/core/board/NstBoardTengen.cpp \
+	source/core/board/NstBoardUnlCc21.cpp \
+	source/core/board/NstBoardBxRom.cpp \
+	source/core/board/NstBoardJalecoJf19.hpp \
+	source/core/board/NstBoardBmcNovelDiamond.hpp \
+	source/core/board/NstBoardBandaiOekaKids.cpp \
+	source/core/board/NstBoardSunsoft5b.hpp \
+	source/core/board/NstBoardNamcot163.hpp \
+	source/core/board/NstBoardKonami.hpp \
+	source/core/board/NstBoardCneShlz.hpp \
+	source/core/board/NstBoardOpenCorp.cpp \
+	source/core/board/NstBoardMmc4.cpp \
+	source/core/board/NstBoardJalecoJf16.hpp \
+	source/core/board/NstBoardSachenSa72008.cpp \
+	source/core/board/NstBoardUnlWorldHero.hpp \
+	source/core/board/NstBoardKonamiVrc1.cpp \
+	source/core/board/NstBoardDreamtech.cpp \
+	source/core/board/NstBoardBandaiAerobicsStudio.cpp \
+	source/core/board/NstBoardCxRom.cpp \
+	source/core/board/NstBoardHosenkan.hpp \
+	source/core/board/NstBoardBmc64in1.cpp \
+	source/core/board/NstBoardJalecoJf11.cpp \
+	source/core/board/NstBoardBtlGeniusMerioBros.cpp \
+	source/core/board/NstBoardBtlSmb2c.hpp \
+	source/core/board/NstBoardBmcSuperHiK300in1.hpp \
+	source/core/board/NstBoardSubor.cpp \
+	source/core/board/NstBoardBtlSuperBros11.hpp \
+	source/core/board/NstBoardUnlKingOfFighters97.hpp \
+	source/core/board/NstBoardHxRom.hpp \
+	source/core/board/NstBoardIremG101.cpp \
+	source/core/board/NstBoardFutureMedia.hpp \
+	source/core/board/NstBoardBtlTobidaseDaisakusen.hpp \
+	source/core/board/NstBoardIremKaiketsu.cpp \
+	source/core/board/NstBoardWaixingPs2.cpp \
+	source/core/board/NstBoardBmcSuper700in1.cpp \
+	source/core/board/NstBoardSunsoft5b.cpp \
+	source/core/board/NstBoardNtdec.cpp \
+	source/core/board/NstBoardBmcSuperHiK300in1.cpp \
+	source/core/board/NstBoardBmcHero.cpp \
+	source/core/board/NstBoardWaixingSgz.cpp \
+	source/core/board/NstBoardBmc35in1.cpp \
+	source/core/board/NstBoardBmcVt5201.hpp \
+	source/core/board/NstBoardBtlSmb2b.cpp \
+	source/core/board/NstBoardSachenTca01.hpp \
+	source/core/board/NstBoardSunsoft1.cpp \
+	source/core/board/NstBoardMmc6.hpp \
+	source/core/board/NstBoardIremKaiketsu.hpp \
+	source/core/board/NstBoardUxRom.cpp \
+	source/core/board/NstBoardBenshengBs5.cpp \
+	source/core/board/NstBoardMmc1.hpp \
+	source/core/board/NstBoardFujiya.cpp \
+	source/core/board/NstBoardTaitoX1005.hpp \
+	source/core/board/NstBoardBandai24c0x.cpp \
+	source/core/board/NstBoardSachen74x374.cpp \
+	source/core/board/NstBoardWaixingSgz.hpp \
+	source/core/board/NstBoardBenshengBs5.hpp \
+	source/core/board/NstBoardWaixingZs.hpp \
+	source/core/board/NstBoardAe.hpp \
+	source/core/board/NstBoardWaixingSh2.cpp \
+	source/core/board/NstBoardBmc76in1.cpp \
+	source/core/board/NstBoardBmcSuper24in1.cpp \
+	source/core/board/NstBoardAcclaim.hpp \
+	source/core/board/NstBoardJalecoSs88006.cpp \
+	source/core/board/NstBoardIremLrog017.cpp \
+	source/core/board/NstBoardSuperGameLionKing.cpp \
+	source/core/board/NstBoardBmcMarioParty7in1.hpp \
+	source/core/board/NstBoardBmc800in1.cpp \
+	source/core/board/NstBoardUnlEdu2000.cpp \
+	source/core/board/NstBoardBtlAx5705.hpp \
+	source/core/board/NstBoardAcclaimMcAcc.cpp \
+	source/core/board/NstBoardRexSoftDb5z.hpp \
+	source/core/board/NstBoardBtl6035052.hpp \
+	source/core/board/NstBoardUnlA9746.hpp \
+	source/core/board/NstBoardTxcMxmdhtwo.cpp \
+	source/core/board/NstBoardBmcFamily4646B.hpp \
+	source/core/board/NstBoardBmcCtc65.cpp \
+	source/core/board/NstBoardBmc36in1.hpp \
+	source/core/board/NstBoardBmcBallgames11in1.hpp \
+	source/core/board/NstBoardSuperGameBoogerman.cpp \
+	source/core/board/NstBoardBtlSmb2a.cpp \
+	source/core/board/NstBoardSachenStreetHeroes.hpp \
+	source/core/board/NstBoardKaiser.cpp \
+	source/core/board/NstBoardBmcT262.cpp \
+	source/core/board/NstBoardAveNina.hpp \
+	source/core/board/NstBoardFb.hpp \
+	source/core/board/NstBoardSachenTcu.cpp \
+	source/core/board/NstBoardKonamiVrc4.cpp \
+	source/core/board/NstBoardIremG101.hpp \
+	source/core/board/NstBoardJalecoJf13.cpp \
+	source/core/board/NstBoardKayPandaPrince.cpp \
+	source/core/board/NstBoardTaitoX1017.cpp \
+	source/core/board/NstBoardBmc110in1.hpp \
+	source/core/board/NstBoardHes.cpp \
+	source/core/board/NstBoardSachenStreetHeroes.cpp \
+	source/core/board/NstBoardUnlMortalKombat2.cpp \
+	source/core/board/NstBoardKonamiVsSystem.cpp \
+	source/core/board/NstBoardBandaiKaraokeStudio.cpp \
+	source/core/board/NstBoardBtlAx5705.cpp \
+	source/core/board/NstBoardExRom.hpp \
+	source/core/board/NstBoardBtl2708.hpp \
+	source/core/board/NstBoardBtl2708.cpp \
+	source/core/board/NstBoardBandaiLz93d50.cpp \
+	source/core/board/NstBoardUnlEdu2000.hpp \
+	source/core/board/NstBoardTengenRambo1.hpp \
+	source/core/board/NstBoardBmcT262.hpp \
+	source/core/board/NstBoardCony.hpp \
+	source/core/board/NstBoardBmc150in1.hpp \
+	source/core/board/NstBoardEvent.cpp \
+	source/core/board/NstBoardFutureMedia.cpp \
+	source/core/board/NstBoardRumbleStation.hpp \
+	source/core/board/NstBoardSomeriTeamSl12.hpp \
+	source/core/board/NstBoardBtlSmb3.hpp \
+	source/core/board/NstBoardUnlSuperFighter3.hpp \
+	source/core/board/NstBoardBmcSuperBig7in1.cpp \
+	source/core/board/NstBoardIremHolyDiver.hpp \
+	source/core/board/NstBoardBmc22Games.hpp \
+	source/core/board/NstBoardMmc2.hpp \
+	source/core/board/NstBoardJyCompany.cpp \
+	source/core/board/NstBoardSachenSa0036.cpp \
+	source/core/board/NstBoardTxRom.hpp \
+	source/core/board/NstBoardKonamiVrc3.hpp \
+	source/core/board/NstBoardTengenRambo1.cpp \
+	source/core/board/NstBoardFb.cpp \
+	source/core/board/NstBoardCnePsb.hpp \
+	source/core/board/NstBoardBmcGamestarA.hpp \
+	source/core/board/NstBoardBtlGeniusMerioBros.hpp \
+	source/core/board/NstBoardAcclaimMcAcc.hpp \
+	source/core/board/NstBoardBandai24c0x.hpp \
+	source/core/board/NstBoardKayH2288.hpp \
+	source/core/board/NstBoardBmcCh001.hpp \
+	source/core/board/NstBoardKonamiVrc4.hpp \
+	source/core/board/NstBoardBtlSmb3.cpp \
+	source/core/board/NstBoardJalecoSs88006.hpp \
+	source/core/board/NstBoardKonamiVrc1.hpp \
+	source/core/board/NstBoardBmc15in1.cpp \
+	source/core/board/NstBoardRumbleStation.cpp \
+	source/core/board/NstBoardTxcPoliceman.hpp \
+	source/core/board/NstBoardBmcFk23c.cpp \
+	source/core/board/NstBoardBmc21in1.hpp \
+	source/core/board/NstBoardSubor.hpp \
+	source/core/board/NstBoardUnlWorldHero.cpp \
+	source/core/board/NstBoardBandaiDatach.cpp \
+	source/core/board/NstBoardUnlXzy.cpp \
+	source/core/board/NstBoardTxc.hpp \
+	source/core/board/NstBoardTxcPoliceman.cpp \
+	source/core/board/NstBoardWaixing.cpp \
+	source/core/board/NstBoardKonamiVrc3.cpp \
+	source/core/board/NstBoardNamcot.hpp \
+	source/core/board/NstBoardSunsoft4.hpp \
+	source/core/board/NstBoardAe.cpp \
+	source/core/board/NstBoardBtlDragonNinja.hpp \
+	source/core/board/NstBoardJyCompany.hpp \
+	source/core/board/NstBoardBtlSuperBros11.cpp \
+	source/core/board/NstBoardBmc110in1.cpp \
+	source/core/board/NstBoardNxRom.hpp \
+	source/core/board/NstBoardBmcSuperVision16in1.cpp \
+	source/core/board/NstBoardAveD1012.hpp \
+	source/core/board/NstBoardUnlMortalKombat2.hpp \
+	source/core/board/NstBoardSunsoft4.cpp \
+	source/core/board/NstBoardBmcCh001.cpp \
+	source/core/board/NstBoardBmcSuper40in1.cpp \
+	source/core/board/NstBoardAxRom.cpp \
+	source/core/board/NstBoardBmcSuper24in1.hpp \
+	source/core/board/NstBoardKayH2288.cpp \
+	source/core/board/NstBoardSachen.hpp \
+	source/core/board/NstBoardIremH3001.hpp \
+	source/core/board/NstBoardSunsoftFme7.hpp \
+	source/core/board/NstBoardBmcGoldenCard6in1.cpp \
+	source/core/board/NstBoardSuperGameLionKing.hpp \
+	source/core/board/NstBoardRcm.cpp \
+	source/core/board/NstBoardUnlKingOfFighters96.hpp \
+	source/core/board/NstBoardGxRom.hpp \
+	source/core/board/NstBoardNamcot34xx.cpp \
+	source/core/board/NstBoardTaitoX1017.hpp \
+	source/core/board/NstBoardGxRom.cpp \
+	source/core/board/NstBoardBmcMarioParty7in1.cpp \
+	source/core/board/NstBoardMmc1.cpp \
+	source/core/board/NstBoardNanjing.cpp \
+	source/core/board/NstBoardBmcFamily4646B.cpp \
+	source/core/board/NstBoardBtlT230.cpp \
+	source/core/board/NstBoardBmc1200in1.hpp \
+	source/core/board/NstBoardMagicSeries.cpp \
+	source/core/board/NstBoardSunsoft2.hpp \
+	source/core/board/NstBoardBmcGoldenCard6in1.hpp \
+	source/core/board/NstBoardAveNina.cpp \
+	source/core/board/NstBoardMmc6.cpp \
+	source/core/board/NstBoardTaitoTc0190fmc.hpp \
+	source/core/board/NstBoardBmc35in1.hpp \
+	source/core/board/NstBoardBmc9999999in1.hpp \
+	source/core/board/NstBoardKasing.cpp \
+	source/core/board/NstBoardCxRom.hpp \
+	source/core/board/NstBoardUnlCc21.hpp \
+	source/core/board/NstBoardJalecoJf19.cpp \
+	source/core/board/NstBoardSachenS8259.hpp \
+	source/core/board/NstBoardFukutake.hpp \
+	source/core/board/NstBoardBandai.hpp \
+	source/core/board/NstBoardZz.cpp \
+	source/core/board/NstBoardDreamtech.hpp \
+	source/core/board/NstBoardBmc72in1.hpp \
+	source/core/board/NstBoardHenggedianzi.cpp \
+	source/core/board/NstBoardOpenCorp.hpp \
+	source/core/board/NstBoardBmcPowerjoy84in1.hpp \
+	source/core/board/NstBoardCneShlz.cpp \
+	source/core/board/NstBoardKaiser.hpp \
+	source/core/board/NstBoardKonamiVrc7.cpp \
+	source/core/board/NstBoardBmc22Games.cpp \
+	source/core/board/NstBoardBmcCtc65.hpp \
+	source/core/board/NstBoard.hpp \
+	source/core/board/NstBoardBmcGamestarB.cpp \
+	source/core/board/NstBoardWaixingSecurity.hpp \
+	source/core/board/NstBoardIrem.hpp \
+	source/core/board/NstBoardUnlN625092.cpp \
+	source/core/board/NstBoardBtlSmb2b.hpp \
+	source/core/board/NstBoardBmc150in1.cpp \
+	source/core/board/NstBoardBmcSuperHiK4in1.cpp \
+	source/core/board/NstBoardBtlShuiGuanPipe.cpp \
+	source/core/board/NstBoardBtlMarioBaby.hpp \
+	source/core/board/NstBoardBmc800in1.hpp \
+	source/core/board/NstBoardCnePsb.cpp \
+	source/core/board/NstBoardSuperGamePocahontas2.cpp \
+	source/core/board/NstBoardSunsoft1.hpp \
+	source/core/board/NstBoardSachenSa0037.cpp \
+	source/core/board/NstBoardVsSystem.hpp \
+	source/core/board/NstBoardHes.hpp \
+	source/core/board/NstBoardWhirlwind.hpp \
+	source/core/board/NstBoardSunsoftFme7.cpp \
+	source/core/board/NstBoardSachen74x374.hpp \
+	source/core/board/NstBoardBmcBallgames11in1.cpp \
+	source/core/board/NstBoardFukutake.cpp \
+	source/core/board/NstBoardCaltron.hpp \
+	source/core/board/NstBoardUnlN625092.hpp \
+	source/core/board/NstBoardIremH3001.cpp \
+	source/core/board/NstBoardTaitoTc0190fmcPal16r4.cpp \
+	source/core/board/NstBoardKayPandaPrince.hpp \
+	source/core/board/NstBoardTaitoTc0190fmc.cpp \
+	source/core/board/NstBoardBmcGolden190in1.cpp \
+	source/core/board/NstBoardQj.cpp \
+	source/core/board/NstBoardBmcResetBased4in1.hpp \
+	source/core/board/NstBoardBmcGamestarA.cpp \
+	source/core/board/NstBoardTaito.hpp \
+	source/core/board/NstBoardWaixingFfv.hpp \
+	source/core/board/NstBoardNamcot34xx.hpp \
+	source/core/board/NstBoardBtlSmb2c.cpp \
+	source/core/board/NstBoardSachenSa72008.hpp \
+	source/core/board/NstBoardKasing.hpp \
+	source/core/board/NstBoardSunsoft2.cpp \
+	source/core/board/NstBoardWaixingFfv.cpp \
+	source/core/board/NstBoardBxRom.hpp \
+	source/core/board/NstBoardBmcFk23c.hpp \
+	source/core/board/NstBoardBmc15in1.hpp \
+	source/core/board/NstBoardBtlDragonNinja.cpp \
+	source/core/board/NstBoardSunsoft.hpp \
+	source/core/board/NstBoardSunsoft3.cpp \
+	source/core/board/NstBoardJalecoJf13.hpp \
+	source/core/board/NstBoardDiscrete.hpp \
+	source/core/board/NstBoardWaixingSgzlz.hpp \
+	source/core/board/NstBoardNitra.hpp \
+	source/core/board/NstBoardZz.hpp \
+	source/core/board/NstBoardUnlXzy.hpp \
+	source/core/board/NstBoardRexSoftSl1632.cpp \
+	source/core/board/NstBoardSachenTca01.cpp \
+	source/core/board/NstBoardBtlTobidaseDaisakusen.cpp \
+	source/core/board/NstBoardQj.hpp \
+	source/core/board/NstBoardBandaiOekaKids.hpp \
+	source/core/board/NstBoardAxRom.hpp \
+	source/core/board/NstBoardBandaiKaraokeStudio.hpp \
+	source/core/board/NstBoardMxRom.hpp \
+	source/core/board/NstBoardTengen.hpp \
+	source/core/board/NstBoardSomeriTeamSl12.cpp \
+	source/core/board/NstBoardJalecoJf11.hpp \
+	source/core/board/NstBoardBmc31in1.cpp \
+	source/core/board/NstBoardUnlKingOfFighters96.cpp \
+	source/core/board/NstBoardTxcMxmdhtwo.hpp \
+	source/core/board/NstBoardAgci.cpp \
+	source/core/board/NstBoardBmcSuper40in1.hpp \
+	source/core/board/NstBoardBmcVt5201.cpp \
+	source/core/board/NstBoardNihon.hpp \
+	source/core/board/NstBoardMagicSeries.hpp \
+	source/core/board/NstBoardPxRom.hpp \
+	source/core/board/NstBoardUnlTf1201.hpp \
+	source/core/board/NstBoardCneDecathlon.cpp \
+	source/core/board/NstBoardBandaiAerobicsStudio.hpp \
+	source/core/board/NstBoardBmcSuperHiK4in1.hpp \
+	source/core/board/NstBoardRexSoftDb5z.cpp \
+	source/core/board/NstBoardWhirlwind.cpp \
+	source/core/board/NstBoardBmcSuper22Games.cpp \
+	source/core/board/NstBoardBandaiLz93d50ex.cpp \
+	source/core/board/NstBoardSachenSa72007.cpp \
+	source/core/board/NstBoardFujiya.hpp \
+	source/core/board/NstBoardBmc1200in1.cpp \
+	source/core/board/NstBoardMmc5.hpp \
+	source/core/board/NstBoardSomeriTeam.hpp \
+	source/core/board/NstBoardBmc76in1.hpp \
+	source/core/board/NstBoardBmc20in1.hpp \
+	source/core/board/NstBoardSachenSa72007.hpp \
+	source/core/board/NstBoardBmc8157.hpp \
+	source/core/board/NstBoardAgci.hpp \
+	source/core/board/NstBoardNamcot163.cpp \
+	source/core/board/NstBoardWaixing.hpp \
+	source/core/board/NstBoardBmcSuperBig7in1.hpp \
+	source/core/board/NstBoardCony.cpp \
+	source/core/board/NstBoardNihon.cpp \
+	source/core/board/NstBoardSachenTcu.hpp \
+	source/core/NstPins.hpp \
+	source/core/NstNsf.hpp \
+	source/core/NstTrackerRewinder.hpp \
+	source/core/NstFds.cpp \
+	source/core/NstVector.hpp \
+	source/core/NstPatcher.hpp \
+	source/core/NstVideoFilterScaleX.cpp \
+	source/core/NstCartridgeInes.hpp \
+	source/core/NstNsf.cpp \
+	source/core/NstSoundPcm.cpp \
+	source/core/NstSoundPcm.hpp \
+	source/core/NstVideoFilterNtsc.hpp \
+	source/core/NstCartridgeRomset.cpp \
+	source/core/NstVideoFilterNtsc.cpp \
+	source/core/NstChecksum.cpp \
+	source/core/NstVideoFilterNtscCfg.cpp \
+	source/core/NstZlib.hpp \
+	source/core/NstCrc32.cpp \
+	source/core/NstHook.hpp \
+	source/core/NstSoundPlayer.hpp \
+	source/core/NstBarcodeReader.hpp \
+	source/core/NstCpu.hpp \
+	source/core/NstCrc32.hpp \
+	source/nes_ntsc/nes_ntsc_impl.h \
+	source/nes_ntsc/nes_ntsc_config.h \
+	source/nes_ntsc/nes_ntsc.h \
+	source/nes_ntsc/demo_impl.h \
+	source/unix/input.cpp \
+	source/unix/ini.cpp \
+	source/unix/config.h \
+	source/unix/png.cpp \
+	source/unix/png.h \
+	source/unix/config.cpp \
+	source/unix/cheats.h \
+	source/unix/cursor.h \
+	source/unix/audio.cpp \
+	source/unix/cli.h \
+	source/unix/audio.h \
+	source/unix/video.h \
+	source/unix/cli.cpp \
+	source/unix/cursor.cpp \
+	source/unix/ini.h \
+	source/unix/font.h \
+	source/unix/video.cpp \
+	source/unix/main.h \
+	source/unix/input.h \
+	source/unix/cheats.cpp
+
+if ENABLE_GUI
+nestopia_SOURCES += \
+	source/unix/gtkui/gtkui_config.h \
+	source/unix/gtkui/gtkui_archive.h \
+	source/unix/gtkui/gtkui_cheats.cpp \
+	source/unix/gtkui/gtkui_callbacks.h \
+	source/unix/gtkui/gtkui_callbacks.cpp \
+	source/unix/gtkui/gtkui_dialogs.cpp \
+	source/unix/gtkui/gtkui_cheats.h \
+	source/unix/gtkui/gtkui_dialogs.h \
+	source/unix/gtkui/gtkui_archive.cpp \
+	source/unix/gtkui/gtkui.cpp \
+	source/unix/gtkui/gtkui.h \
+	source/unix/gtkui/gtkui_config.cpp
+endif
+
+# install full HTML suite
+if ENABLE_FULL_HTML
+dist_html_DATA += \
+	doc/index.html \
+	doc/index-deprecated-list.html \
+	doc/index-allclasses-frame.html \
+	doc/index-overview-tree.html \
+	doc/index-all.html \
+	doc/index-overview-summary.html \
+	doc/index-overview-frame.html
+
+htmldetailscoredir = $(htmldir)/details/core
+dist_htmldetailscore_DATA = \
+	doc/details/core/Nes..Core..CpuModel.html \
+	doc/details/core/Nes..Core..System.html \
+	doc/details/core/Nes..uchar.html \
+	doc/details/core/Nes..schar.html \
+	doc/details/core/Nes.html \
+	doc/details/core/Nes..Core.html \
+	doc/details/core/Nes..Core..ImplicitBool..Type.html \
+	doc/details/core/Nes..dword.html \
+	doc/details/core/Nes..ulong.html \
+	doc/details/core/project-frame.html \
+	doc/details/core/Nes..Core..ImplicitBool.html \
+	doc/details/core/Nes..Core..PpuModel.html \
+	doc/details/core/Nes..Result.html \
+	doc/details/core/Nes..Core..FavoredSystem.html \
+	doc/details/core/project-summary.html \
+	doc/details/core/Nes..ushort.html \
+	doc/details/core/Nes..byte.html \
+	doc/details/core/Nes..uint.html \
+	doc/details/core/Nes..Core..Region.html \
+	doc/details/core/Nes..word.html \
+	doc/details/core/project-tree.html
+
+htmldetailsapidir = $(htmldir)/details/api
+dist_htmldetailsapi_DATA = \
+	doc/details/api/Nes..Api..TapeRecorder.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Property.html \
+	doc/details/api/Nes..Core..Sound..Output..Unlocker.html \
+	doc/details/api/Nes..Api..DipSwitches.html \
+	doc/details/api/Nes..Api..Input.html \
+	doc/details/api/Nes..Api..BarcodeReader.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Wram.html \
+	doc/details/api/Nes..Api..Fds..DiskData..File.html \
+	doc/details/api/Nes..Api..Video..Output.html \
+	doc/details/api/Nes..Api..User..LogCallback.html \
+	doc/details/api/Nes..Core..Input..Controllers..Pachinko.html \
+	doc/details/api/Nes..Core..Input..Controllers..OekaKidsTablet.html \
+	doc/details/api/Nes..Api..Cartridge..NesHeader..Mirroring.html \
+	doc/details/api/Nes..Core..Video..Output..UnlockCallback.html \
+	doc/details/api/Nes..Api..Cartridge..ChooseProfileCaller.html \
+	doc/details/api/Nes..Api..Sound..Speaker.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..System..Ppu.html \
+	doc/details/api/Nes..Core..Input..Controllers..Mouse..PollCallback.html \
+	doc/details/api/Nes..Core..Input..Controllers..PowerGlove.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..System..Cpu.html \
+	doc/details/api/Nes..Core..Input..Controllers..PollCaller1.html \
+	doc/details/api/Nes..Core..Input..Controllers..Pachinko..PollCallback.html \
+	doc/details/api/Nes..Api..Sound..Channel.html \
+	doc/details/api/Nes..Core..Video..Output..Unlocker.html \
+	doc/details/api/Nes..Core..Input..Controllers..Zapper..PollCallback.html \
+	doc/details/api/Nes..Core..Input.html \
+	doc/details/api/Nes..Core..Sound.html \
+	doc/details/api/Nes..Api..Fds..Event.html \
+	doc/details/api/Nes..Api..Video..RenderState..Filter.html \
+	doc/details/api/Nes..Core..Input..Controllers..KaraokeStudio..PollCallback.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..System.html \
+	doc/details/api/Nes..Core..Input..Controllers..Mouse.html \
+	doc/details/api/Nes..Api..Rewinder.html \
+	doc/details/api/Nes..Core..Sound..Output..Locker.html \
+	doc/details/api/Nes..Core..Sound..Output..LockCallback.html \
+	doc/details/api/Nes..Api..Rewinder..State.html \
+	doc/details/api/Nes..Api..User..Question.html \
+	doc/details/api/Nes..Api..Video..Palette..Mode.html \
+	doc/details/api/Nes.html \
+	doc/details/api/Nes..Api..Video..Palette.html \
+	doc/details/api/Nes..Core..Input..Controllers..OekaKidsTablet..PollCallback.html \
+	doc/details/api/Nes..Core.html \
+	doc/details/api/Nes..Api..Emulator..Core.html \
+	doc/details/api/Nes..Core..Input..Controllers..Zapper.html \
+	doc/details/api/Nes..Api..Input..ControllerCallback.html \
+	doc/details/api/Nes..Api..Rewinder..Direction.html \
+	doc/details/api/Nes..Core..Video..Output..LockCallback.html \
+	doc/details/api/Nes..Api..TapeRecorder..Event.html \
+	doc/details/api/Nes..Api..Machine.html \
+	doc/details/api/Nes..Api..User..File..Patch.html \
+	doc/details/api/Nes..Api..User..FileIoCallback.html \
+	doc/details/api/Nes..Api..Cheats..Code.html \
+	doc/details/api/Nes..Api..Video..Decoder.html \
+	doc/details/api/Nes..Api..Video..DecoderPreset.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Properties.html \
+	doc/details/api/Nes..Api..Machine..AskProfile.html \
+	doc/details/api/Nes..Api..User..File.html \
+	doc/details/api/Nes..Api..User..EventCaller.html \
+	doc/details/api/Nes..Api..Emulator.html \
+	doc/details/api/Nes..Api..Fds..DiskData..File..Type.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Roms.html \
+	doc/details/api/Nes..Api..Rewinder..StateCallback.html \
+	doc/details/api/Nes..Api..Cartridge..Database..Entry.html \
+	doc/details/api/Nes..Core..Input..Controllers..Paddle.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board.html \
+	doc/details/api/Nes..Core..Input..Controllers.html \
+	doc/details/api/Nes..Api..Fds..Motor.html \
+	doc/details/api/Nes..Api..Fds..DiskData..Files.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Dump..State.html \
+	doc/details/api/Nes..Core..Input..Controllers..KonamiHyperShot.html \
+	doc/details/api/Nes..Core..Input..Controllers..VsSystem..PollCallback.html \
+	doc/details/api/Nes..Api..Movie.html \
+	doc/details/api/Nes..Api..Machine..Compression.html \
+	doc/details/api/Nes..Api..Fds..DiskCaller.html \
+	doc/details/api/Nes..Core..Input..Controllers..DoremikkoKeyboard.html \
+	doc/details/api/Nes..Core..Input..Controllers..Paddle..PollCallback.html \
+	doc/details/api/Nes..Core..Input..Controllers..PollCaller3.html \
+	doc/details/api/Nes..Api..Sound..Output.html \
+	doc/details/api/Nes..Api..Input..Type.html \
+	doc/details/api/Nes..Api..Video..Palette..Colors.html \
+	doc/details/api/Nes..Core..Input..Controllers..Mahjong.html \
+	doc/details/api/Nes..Core..Video.html \
+	doc/details/api/Nes..Api..Video..RenderState..Bits..Mask.html \
+	doc/details/api/Nes..Core..Input..Controllers..PowerGlove..Gesture.html \
+	doc/details/api/Nes..Api..Cartridge..NesHeader..System.html \
+	doc/details/api/Nes..Api..User.html \
+	doc/details/api/Nes..Api..Input..ControllerCaller.html \
+	doc/details/api/Nes..Api..Video..RenderState.html \
+	doc/details/api/Nes..Api..Video.html \
+	doc/details/api/Nes..Core..Input..Controllers..Mahjong..PollCallback.html \
+	doc/details/api/Nes..Api..Cartridge..Profile.html \
+	doc/details/api/Nes..Core..Input..Controllers..HoriTrack.html \
+	doc/details/api/Nes..Core..Input..Controllers..TopRider..PollCallback.html \
+	doc/details/api/Nes..Core..Video..Output.html \
+	doc/details/api/Nes..Core..Input..Controllers..PowerGlove..PollCallback.html \
+	doc/details/api/Nes..Api..Cartridge..NesHeader..Region.html \
+	doc/details/api/Nes..Core..Input..Controllers..PartyTap.html \
+	doc/details/api/Nes..Api..User..EventCallback.html \
+	doc/details/api/Nes..Api..User..Event.html \
+	doc/details/api/Nes..Api..Rewinder..StateCaller.html \
+	doc/details/api/Nes..Core..Input..Controllers..Pad..PollCallback.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Sample.html \
+	doc/details/api/Nes..Core..Input..Controllers..CrazyClimber..PollCallback.html \
+	doc/details/api/Nes..Api..Nsf..Event.html \
+	doc/details/api/Nes..Core..Input..Controllers..BandaiHyperShot..PollCallback.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Rams.html \
+	doc/details/api/Nes..Api..User..QuestionCaller.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Dump.html \
+	doc/details/api/project-frame.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Vram.html \
+	doc/details/api/Nes..Api..Cheats.html \
+	doc/details/api/Nes..Core..Input..Controllers..BandaiHyperShot.html \
+	doc/details/api/Nes..Core..Input..Controllers..PartyTap..PollCallback.html \
+	doc/details/api/Nes..Api..Machine..Event.html \
+	doc/details/api/Nes..Core..Input..Controllers..TopRider.html \
+	doc/details/api/Nes..Core..Input..Controllers..KonamiHyperShot..PollCallback.html \
+	doc/details/api/Nes..Core..Input..Controllers..PokkunMoguraa..PollCallback.html \
+	doc/details/api/Nes..Core..Sound..Output..UnlockCallback.html \
+	doc/details/api/Nes..Core..Input..Controllers..FamilyKeyboard.html \
+	doc/details/api/Nes..Api..Cartridge.html \
+	doc/details/api/Nes..Api..Fds..DiskCallback.html \
+	doc/details/api/Nes..Api..Input..AdapterCaller.html \
+	doc/details/api/Nes..Api..User..Answer.html \
+	doc/details/api/Nes..Api..Video..Palette..CustomType.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Chips.html \
+	doc/details/api/Nes..Api..Fds.html \
+	doc/details/api/Nes..Api..Fds..DiskData.html \
+	doc/details/api/Nes..Api..Machine..FavoredSystem.html \
+	doc/details/api/Nes..Core..Input..Controllers..FamilyTrainer..PollCallback.html \
+	doc/details/api/Nes..Core..Input..Controllers..DoremikkoKeyboard..PollCallback.html \
+	doc/details/api/Nes..Api..Machine..EventCallback.html \
+	doc/details/api/Nes..Api..TapeRecorder..EventCallback.html \
+	doc/details/api/project-summary.html \
+	doc/details/api/Nes..Core..Input..Controllers..PowerPad.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Rom.html \
+	doc/details/api/Nes..Api..Movie..EventCaller.html \
+	doc/details/api/Nes..Core..Input..Controllers..PowerPad..PollCallback.html \
+	doc/details/api/Nes..Api..Cheats..RAM_SIZE.html \
+	doc/details/api/Nes..Api..Movie..EventCallback.html \
+	doc/details/api/Nes..Core..Input..Controllers..Pad.html \
+	doc/details/api/Nes..Api..Nsf..EventCallback.html \
+	doc/details/api/Nes..Api..Machine..Mode.html \
+	doc/details/api/Nes..Api..Fds..DiskData..Data.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..System..Type.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Ram.html \
+	doc/details/api/Nes..Api..Sound.html \
+	doc/details/api/Nes..Api..Input..Controllers.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Pins.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Samples.html \
+	doc/details/api/Nes..Api..Movie..Event.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Pin.html \
+	doc/details/api/Nes..Core..Input..Controllers..ExcitingBoxing..PollCallback.html \
+	doc/details/api/Nes..Api..User..LogCaller.html \
+	doc/details/api/Nes..Api..Machine..Patch.html \
+	doc/details/api/Nes..Core..Input..Controllers..ExcitingBoxing.html \
+	doc/details/api/Nes..Core..Input..Controllers..VsSystem.html \
+	doc/details/api/Nes..Core..Input..Controllers..PokkunMoguraa.html \
+	doc/details/api/Nes..Api..Machine..EventCaller.html \
+	doc/details/api/Nes..Api..User..QuestionCallback.html \
+	doc/details/api/Nes..Core..Input..Controllers..HoriTrack..PollCallback.html \
+	doc/details/api/Nes..Core..Sound..Output.html \
+	doc/details/api/Nes..Core..Input..Controllers..FamilyTrainer.html \
+	doc/details/api/Nes..Api..TapeRecorder..EventCaller.html \
+	doc/details/api/Nes..Core..Video..Output..Locker.html \
+	doc/details/api/Nes..Api..Cartridge..NesHeader..Ppu.html \
+	doc/details/api/Nes..Api..Fds..DriveCallback.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Game.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Prg.html \
+	doc/details/api/Nes..Core..Input..Controllers..KaraokeStudio.html \
+	doc/details/api/Nes..Api..User..File..Action.html \
+	doc/details/api/Nes..Api..Fds..DriveCaller.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Chr.html \
+	doc/details/api/Nes..Api..Video..RenderState..Bits.html \
+	doc/details/api/Nes..Core..Input..Controllers..SuborKeyboard.html \
+	doc/details/api/Nes..Api..Nsf..EventCaller.html \
+	doc/details/api/Nes..Api..Cartridge..NesHeader.html \
+	doc/details/api/Nes..Core..Input..Controllers..SuborKeyboard..PollCallback.html \
+	doc/details/api/Nes..Api..Cartridge..Database.html \
+	doc/details/api/Nes..Api..User..FileIoCaller.html \
+	doc/details/api/Nes..Api..Nsf.html \
+	doc/details/api/Nes..Api..Video..RenderState..Scale.html \
+	doc/details/api/Nes..Core..Input..Controllers..CrazyClimber.html \
+	doc/details/api/Nes..Core..Input..Controllers..PollCaller2.html \
+	doc/details/api/Nes..Api..Input..AdapterCallback.html \
+	doc/details/api/Nes..Api.html \
+	doc/details/api/Nes..Api..Nsf..TuneMode.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Hash.html \
+	doc/details/api/Nes..Api..Input..Adapter.html \
+	doc/details/api/project-tree.html \
+	doc/details/api/Nes..Api..Cartridge..ChooseProfileCallback.html \
+	doc/details/api/Nes..Api..Cartridge..Profile..Board..Chip.html \
+	doc/details/api/Nes..Core..Input..Controllers..FamilyKeyboard..PollCallback.html \
+	doc/details/api/Nes..Api..Movie..How.html
+endif
--- a/configure.ac
+++ b/configure.ac
@ -0,0 +1,129 @@
+dnl Initialise Autoconf
+AC_PREREQ([2.69])
+AC_INIT(
+	[nestopia],
+	[1.48-WIP])
+AC_CONFIG_SRCDIR([source/unix/main.cpp])
+AC_LANG([C++])
+
+
+
+dnl ========================================================================
+dnl Check whether we want to set defaults for CXXFLAGS, CPPFLAGS and LDFLAGS
+dnl ========================================================================
+AC_MSG_CHECKING([whether configure should try to set CXXFLAGS/CPPFLAGS/LDFLAGS])
+AS_IF([test "x${CXXFLAGS+set}" = "xset" || test "x${CPPFLAGS+set}" = "xset" || test "x${LDFLAGS+set}" = "xset"],
+	[enable_flags_setting=no],
+	[enable_flags_setting=yes]
+)
+AC_MSG_RESULT([${enable_flags_setting}])
+
+AX_CHECK_ENABLE_DEBUG
+AS_IF([test "x${enable_debug}" = "xno"],
+	[
+		cxxflags_test="-O3"
+		cppflags_test=""
+
+		AC_CANONICAL_HOST
+		AS_CASE([${host_os}],
+			[darwin*],
+			[ldflags_test="-Wl,-dead_strip_dylibs"],
+			[linux*],
+			[ldflags_test="-Wl,-O1 -Wl,--as-needed"]
+		)
+	]
+)
+
+
+
+dnl =======================================
+dnl Check for standard headers and programs
+dnl =======================================
+AX_COMPILER_VENDOR
+AX_COMPILER_VERSION
+AC_PROG_SED
+AC_PROG_CXX
+
+
+
+dnl ==================================
+dnl Set CXXFLAGS, CPPFLAGS and LDFLAGS
+dnl ==================================
+AS_IF([test "x${enable_flags_setting}" = "xyes" && test "x${enable_debug}" = "xno"],
+	[
+	AX_APPEND_COMPILE_FLAGS([${cxxflags_test} -Wno-narrowing -Wno-deprecated-declarations], [CXXFLAGS])
+	CXXFLAGS=$( echo ${CXXFLAGS} | $SED -e 's/^ *//' -e 's/ *$//' )
+	
+	AX_APPEND_COMPILE_FLAGS([${cppflags_test}], [CPPFLAGS])
+	CPPFLAGS=$( echo ${CPPFLAGS} | $SED -e 's/^ *//' -e 's/ *$//' )
+	
+	AX_APPEND_LINK_FLAGS([${ldflags_test}], [LDFLAGS])
+	LDFLAGS=$( echo ${LDFLAGS} | $SED -e 's/^ *//' -e 's/ *$//' )
+	]
+)
+
+
+
+dnl ======================
+dnl Check for dependencies
+dnl ======================
+dnl zlib
+PKG_CHECK_MODULES([ZLIB], [zlib])
+
+dnl libarchive
+PKG_CHECK_MODULES([LIBARCHIVE], [libarchive])
+
+dnl libao
+PKG_CHECK_MODULES([LIBAO], [ao])
+
+dnl SDL2
+PKG_CHECK_MODULES([SDL2], [sdl2])
+
+dnl LibEpoxy
+PKG_CHECK_MODULES([LIBEPOXY], [epoxy])
+
+dnl GTK3
+AC_ARG_ENABLE([gui],
+	AS_HELP_STRING([--disable-gui], [Disable building GUI with GTK+3]))
+
+AS_IF([test "x$enable_gui" != "xno"], [
+	dnl GUI with GTK+3 requested
+	PKG_CHECK_MODULES([GTK3], [gtk+-3.0])
+])
+AM_CONDITIONAL([ENABLE_GUI], [test "x$enable_gui" != "xno"])
+
+dnl full HTML suite
+AC_ARG_ENABLE([doc],
+	AS_HELP_STRING([--enable-doc], [Install full HTML documentation]))
+AM_CONDITIONAL([ENABLE_FULL_HTML], [test "x$enable_doc" = "xyes"])
+
+
+
+dnl ===================
+dnl Initialise Automake
+dnl ===================
+AM_INIT_AUTOMAKE([1.15 foreign dist-bzip2 no-dist-gzip subdir-objects silent-rules])
+AM_SILENT_RULES([yes])
+
+
+
+dnl ========
+dnl Finalise
+dnl ========
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+
+
+
+dnl ============================
+dnl Report configuration to user
+dnl ============================
+AC_MSG_RESULT([
+	${PACKAGE_NAME} ${VERSION}
+	Using ${ax_cv_cxx_compiler_vendor}, ${ax_cv_cxx_compiler_version}
+
+	CXX:        ${CXX}
+	CXXFLAGS:   ${CXXFLAGS}
+	CPPFLAGS:   ${CPPFLAGS}
+	LDFLAGS:    ${LDFLAGS}
+])
--- a/source/core/NstZlib.cpp
+++ b/source/core/NstZlib.cpp
@ -37,7 +37,7 @@

 #endif

- #include "../zlib/zlib.h"
+ #include "zlib.h"

 #endif

--- a/source/unix/icons/128/nestopia.png
+++ b/source/unix/icons/128/nestopia.png
--- a/source/unix/icons/32/nestopia.png
+++ b/source/unix/icons/32/nestopia.png
--- a/source/unix/icons/48/nestopia.png
+++ b/source/unix/icons/48/nestopia.png
--- a/source/unix/icons/64/nestopia.png
+++ b/source/unix/icons/64/nestopia.png
--- a/source/unix/icons/96/nestopia.png
+++ b/source/unix/icons/96/nestopia.png
--- a/source/unix/icons/svg/nespad.svg
+++ b/source/unix/icons/svg/nespad.svg
--- a/source/unix/icons/svg/nestopia.svg
+++ b/source/unix/icons/svg/nestopia.svg
--- a/source/zlib/ioapi.h
+++ b/source/zlib/ioapi.h
@ -1,75 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-*/
-
-#ifndef _ZLIBIOAPI_H
-#define _ZLIBIOAPI_H
-
-
-#define ZLIB_FILEFUNC_SEEK_CUR (1)
-#define ZLIB_FILEFUNC_SEEK_END (2)
-#define ZLIB_FILEFUNC_SEEK_SET (0)
-
-#define ZLIB_FILEFUNC_MODE_READ      (1)
-#define ZLIB_FILEFUNC_MODE_WRITE     (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
-
-#define ZLIB_FILEFUNC_MODE_EXISTING (4)
-#define ZLIB_FILEFUNC_MODE_CREATE   (8)
-
-
-#ifndef ZCALLBACK
-
-#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-#define ZCALLBACK CALLBACK
-#else
-#define ZCALLBACK
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
-typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
-
-typedef struct zlib_filefunc_def_s
-{
-    open_file_func      zopen_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell_file_func      ztell_file;
-    seek_file_func      zseek_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
-} zlib_filefunc_def;
-
-
-
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-
-#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
-#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
-#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
-#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
-#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
-#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
--- a/source/zlib/unzip.h
+++ b/source/zlib/unzip.h
@ -1,354 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-
-   Multi volume ZipFile (span) are not supported.
-   Encryption compatible with pkzip 2.04g only supported
-   Old compressions used by old PKZip 1.x are not supported
-
-
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-
-*/
-
-/* for more info about .ZIP format, see
-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
-      http://www.info-zip.org/pub/infozip/doc/
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip
-*/
-
-#ifndef _unz_H
-#define _unz_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__;
-typedef unzFile__ *unzFile;
-#else
-typedef voidp unzFile;
-#endif
-
-
-#define UNZ_OK                          (0)
-#define UNZ_END_OF_LIST_OF_FILE         (-100)
-#define UNZ_ERRNO                       (Z_ERRNO)
-#define UNZ_EOF                         (0)
-#define UNZ_PARAMERROR                  (-102)
-#define UNZ_BADZIPFILE                  (-103)
-#define UNZ_INTERNALERROR               (-104)
-#define UNZ_CRCERROR                    (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s
-{
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
-} tm_unz;
-
-/* unz_global_info structure contain global data about the ZIPfile
-   These data comes from the end of central dir */
-typedef struct unz_global_info_s
-{
-    uLong number_entry;         /* total number of entries in
-                       the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info;
-
-
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_info_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    uLong compressed_size;      /* compressed size                 4 bytes */
-    uLong uncompressed_size;    /* uncompressed size               4 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-} unz_file_info;
-
-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-                                                 const char* fileName2,
-                                                 int iCaseSensitivity));
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-    (like 1 on Unix, 2 on Windows)
-*/
-
-
-extern unzFile ZEXPORT unzOpen OF((const char *path));
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
-     "zlib/zlib113.zip".
-     If the zipfile cannot be opened (file don't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
-
-extern unzFile ZEXPORT unzOpen2 OF((const char *path,
-                                    zlib_filefunc_def* pzlib_filefunc_def));
-/*
-   Open a Zip file, like unzOpen, but provide a set of file low level API
-      for read/write the zip file (see ioapi.h)
-*/
-
-extern int ZEXPORT unzClose OF((unzFile file));
-/*
-  Close a ZipFile opened with unzipOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-  return UNZ_OK if there is no problem. */
-
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
-                                        unz_global_info *pglobal_info));
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-
-
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-                                           char *szComment,
-                                           uLong uSizeBuf));
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-
-
-/***************************************************************************/
-/* Unzip package allow you browse the directory of the zipfile */
-
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-
-extern int ZEXPORT unzLocateFile OF((unzFile file,
-                     const char *szFileName,
-                     int iCaseSensitivity));
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-
-
-/* ****************************************** */
-/* Ryan supplied functions */
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;   /* offset in zip file directory */
-    uLong num_of_file;            /* # of file */
-} unz_file_pos;
-
-extern int ZEXPORT unzGetFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-/* ****************************************** */
-
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-                         unz_file_info *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
-/*
-  Get Info about the current file
-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-        the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
-            (fileNameBufferSize is the size of the buffer)
-  if extraField!=NULL, the extra field information will be copied in extraField
-            (extraFieldBufferSize is the size of the buffer).
-            This is the Central-header version of the extra field
-  if szComment!=NULL, the comment string of the file will be copied in szComment
-            (commentBufferSize is the size of the buffer)
-*/
-
-/***************************************************************************/
-/* for reading the content of the current zipfile, you can open it, read data
-   from it, and close it (you can close it before reading all the file)
-   */
-
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
-                                                  const char* password));
-/*
-  Open for reading data the current file in the zipfile.
-  password is a crypting password
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw,
-                                           const char* password));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
-                      voidp buf,
-                      unsigned len));
-/*
-  Read bytes from the current file (opened by unzOpenCurrentFile)
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-
-extern z_off_t ZEXPORT unztell OF((unzFile file));
-/*
-  Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof OF((unzFile file));
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-                                             voidp buf,
-                                             unsigned len));
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-
-/***************************************************************************/
-
-/* Get the current file offset */
-extern uLong ZEXPORT unzGetOffset (unzFile file);
-
-/* Set the current file offset */
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _unz_H */
--- a/source/zlib/zconf.h
+++ b/source/zlib/zconf.h
@ -1,332 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_          z_deflateInit_
-#  define deflate               z_deflate
-#  define deflateEnd            z_deflateEnd
-#  define inflateInit_          z_inflateInit_
-#  define inflate               z_inflate
-#  define inflateEnd            z_inflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateCopy           z_deflateCopy
-#  define deflateReset          z_deflateReset
-#  define deflateParams         z_deflateParams
-#  define deflateBound          z_deflateBound
-#  define deflatePrime          z_deflatePrime
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateCopy           z_inflateCopy
-#  define inflateReset          z_inflateReset
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  define uncompress            z_uncompress
-#  define adler32               z_adler32
-#  define crc32                 z_crc32
-#  define get_crc_table         z_get_crc_table
-#  define zError                z_zError
-
-#  define alloc_func            z_alloc_func
-#  define free_func             z_free_func
-#  define in_func               z_in_func
-#  define out_func              z_out_func
-#  define Byte                  z_Byte
-#  define uInt                  z_uInt
-#  define uLong                 z_uLong
-#  define Bytef                 z_Bytef
-#  define charf                 z_charf
-#  define intf                  z_intf
-#  define uIntf                 z_uIntf
-#  define uLongf                z_uLongf
-#  define voidpf                z_voidpf
-#  define voidp                 z_voidp
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
-#  endif
-#  define z_off_t off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#  ifdef FAR
-#    undef FAR
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(deflateBound,"DEBND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(compressBound,"CMBND")
-#   pragma map(inflate_table,"INTABL")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
--- a/source/zlib/zip.h
+++ b/source/zlib/zip.h
@ -1,235 +0,0 @@
-/* zip.h -- IO for compress .zip files using zlib
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This unzip package allow creates .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-   Multi volume ZipFile (span) are not supported.
-   Encryption compatible with pkzip 2.04g only supported
-   Old compressions used by old PKZip 1.x are not supported
-
-  For uncompress .zip file, look at unzip.h
-
-
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.html for evolution
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-
-*/
-
-/* for more info about .ZIP format, see
-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
-      http://www.info-zip.org/pub/infozip/doc/
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip
-*/
-
-#ifndef _zip_H
-#define _zip_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagzipFile__ { int unused; } zipFile__;
-typedef zipFile__ *zipFile;
-#else
-typedef voidp zipFile;
-#endif
-
-#define ZIP_OK                          (0)
-#define ZIP_EOF                         (0)
-#define ZIP_ERRNO                       (Z_ERRNO)
-#define ZIP_PARAMERROR                  (-102)
-#define ZIP_BADZIPFILE                  (-103)
-#define ZIP_INTERNALERROR               (-104)
-
-#ifndef DEF_MEM_LEVEL
-#  if MAX_MEM_LEVEL >= 8
-#    define DEF_MEM_LEVEL 8
-#  else
-#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#  endif
-#endif
-/* default memLevel */
-
-/* tm_zip contain date/time info */
-typedef struct tm_zip_s
-{
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
-} tm_zip;
-
-typedef struct
-{
-    tm_zip      tmz_date;       /* date in understandable format           */
-    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
-/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
-
-    uLong       internal_fa;    /* internal file attributes        2 bytes */
-    uLong       external_fa;    /* external file attributes        4 bytes */
-} zip_fileinfo;
-
-typedef const char* zipcharpc;
-
-
-#define APPEND_STATUS_CREATE        (0)
-#define APPEND_STATUS_CREATEAFTER   (1)
-#define APPEND_STATUS_ADDINZIP      (2)
-
-extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
-/*
-  Create a zipfile.
-     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
-       an Unix computer "zlib/zlib113.zip".
-     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
-       will be created at the end of the file.
-         (useful if the file contain a self extractor code)
-     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
-       add files in existing zip (be sure you don't add file that doesn't exist)
-     If the zipfile cannot be opened, the return value is NULL.
-     Else, the return value is a zipFile Handle, usable with other function
-       of this zip package.
-*/
-
-/* Note : there is no delete function into a zipfile.
-   If you want delete file into a zipfile, you must open a zipfile, and create another
-   Of couse, you can use RAW reading and writing to copy the file you did not want delte
-*/
-
-extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
-                                   int append,
-                                   zipcharpc* globalcomment,
-                                   zlib_filefunc_def* pzlib_filefunc_def));
-
-extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
-                       const char* filename,
-                       const zip_fileinfo* zipfi,
-                       const void* extrafield_local,
-                       uInt size_extrafield_local,
-                       const void* extrafield_global,
-                       uInt size_extrafield_global,
-                       const char* comment,
-                       int method,
-                       int level));
-/*
-  Open a file in the ZIP for writing.
-  filename : the filename in zip (if NULL, '-' without quote will be used
-  *zipfi contain supplemental information
-  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
-    contains the extrafield data the the local header
-  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
-    contains the extrafield data the the local header
-  if comment != NULL, comment contain the comment string
-  method contain the compression method (0 for store, Z_DEFLATED for deflate)
-  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
-*/
-
-
-extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw));
-
-/*
-  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
- */
-
-extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
-                                            const char* filename,
-                                            const zip_fileinfo* zipfi,
-                                            const void* extrafield_local,
-                                            uInt size_extrafield_local,
-                                            const void* extrafield_global,
-                                            uInt size_extrafield_global,
-                                            const char* comment,
-                                            int method,
-                                            int level,
-                                            int raw,
-                                            int windowBits,
-                                            int memLevel,
-                                            int strategy,
-                                            const char* password,
-                                            uLong crcForCtypting));
-
-/*
-  Same than zipOpenNewFileInZip2, except
-    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
-    password : crypting password (NULL for no crypting)
-    crcForCtypting : crc of file to compress (needed for crypting)
- */
-
-
-extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
-                       const void* buf,
-                       unsigned len));
-/*
-  Write data in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
-/*
-  Close the current file in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
-                                            uLong uncompressed_size,
-                                            uLong crc32));
-/*
-  Close the current file in the zipfile, for fiel opened with
-    parameter raw=1 in zipOpenNewFileInZip2
-  uncompressed_size and crc32 are value for the uncompressed size
-*/
-
-extern int ZEXPORT zipClose OF((zipFile file,
-                const char* global_comment));
-/*
-  Close the zipfile
-*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _zip_H */
--- a/source/zlib/zlib.h
+++ b/source/zlib/zlib.h