@@ -, +, @@ Unbundle minizip. --- a/Osmose-0-9-96-QT.pro +++ a/Osmose-0-9-96-QT.pro @@ -4,9 +4,11 @@ TEMPLATE = app TARGET = -DEPENDPATH += . cpu osmose unzip -INCLUDEPATH += . cpu osmose unzip +DEPENDPATH += . cpu osmose +INCLUDEPATH += . cpu osmose LIBS += -lz -lasound +CONFIG += link_pkgconfig +PKGCONFIG += minizip QT+=opengl # Input @@ -44,10 +46,7 @@ HEADERS += EmulationThread.h \ osmose/VDP.h \ osmose/VDP_GG.h \ osmose/Version.h \ - osmose/WaveWriter.h \ - unzip/crypt.h \ - unzip/ioapi.h \ - unzip/unzip.h + osmose/WaveWriter.h FORMS += Configuration.ui LogWindow.ui SOURCES += EmulationThread.cpp \ Joystick.cpp \ @@ -84,5 +83,3 @@ SOURCES += EmulationThread.cpp \ osmose/VDP.cpp \ osmose/VDP_GG.cpp \ osmose/WaveWriter.cpp \ - unzip/ioapi.c \ - unzip/unzip.c --- a/osmose/MemoryMapper.h +++ a/osmose/MemoryMapper.h @@ -36,7 +36,7 @@ #include #include #include -#include "unzip/unzip.h" +#include "unzip.h" #include "Options.h" #include "Definitions.h" #include "DebugEventThrower.h"