Fix Linux build issues with quazip

dh4 · Sep 22, 2017 · fed08c4 · fed08c4
1 parent c378bf8
commit fed08c4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/build-scripts/platform/linux.sh b/build-scripts/platform/linux.sh
@@ -8,13 +8,13 @@ case "$1" in
 
     'setup_qt')
         sudo apt-get update -qq
-        sudo apt-get -y install qt4-qmake libqt4-dev libqt4-sql-sqlite
+        sudo apt-get -y install qt4-qmake libqt4-dev libqt4-sql-sqlite zlib1g-dev
     ;;
 
     'get_quazip')
-        wget http://downloads.sourceforge.net/quazip/quazip-0.7.1.tar.gz
-        tar -xvzf quazip-0.7.1.tar.gz > /dev/null
-        mv quazip-0.7.1/quazip .
+        wget http://downloads.sourceforge.net/quazip/quazip-0.7.3.tar.gz
+        tar -xvzf quazip-0.7.3.tar.gz > /dev/null
+        mv quazip-0.7.3/quazip .
     ;;
 
     'build')

diff --git a/build-scripts/platform/osx.sh b/build-scripts/platform/osx.sh
@@ -26,9 +26,9 @@ case "$1" in
     ;;
 
     'get_quazip')
-        wget http://downloads.sourceforge.net/quazip/quazip-0.7.1.tar.gz
-        tar -xvzf quazip-0.7.1.tar.gz >& /dev/null
-        mv quazip-0.7.1/quazip .
+        wget http://downloads.sourceforge.net/quazip/quazip-0.7.3.tar.gz
+        tar -xvzf quazip-0.7.3.tar.gz >& /dev/null
+        mv quazip-0.7.3/quazip .
     ;;
 
     'build')

diff --git a/build-scripts/platform/windows.sh b/build-scripts/platform/windows.sh
@@ -31,9 +31,9 @@ case "$1" in
     ;;
 
     'get_quazip')
-        wget http://downloads.sourceforge.net/quazip/quazip-0.7.1.tar.gz
-        tar -xvzf quazip-0.7.1.tar.gz > /dev/null
-        mv quazip-0.7.1/quazip .
+        wget http://downloads.sourceforge.net/quazip/quazip-0.7.3.tar.gz
+        tar -xvzf quazip-0.7.3.tar.gz > /dev/null
+        mv quazip-0.7.3/quazip .
     ;;
 
     'build')

diff --git a/mupen64plus-qt.pro b/mupen64plus-qt.pro
@@ -63,6 +63,7 @@ TRANSLATIONS += resources/locale/mupen64plus-qt_fr.ts
 win32|macx|linux_quazip_static {
     CONFIG += staticlib
     DEFINES += QUAZIP_STATIC
+    LIBS += -lz
 
     #Download quazip source and copy the quazip directory to project
     SOURCES += quazip/*.cpp