Merge branch 'master' of github.com:tux3/qTox

INSTALL.md

@@ -165,7 +165,7 @@ sudo apt-get install libtool autotools-dev automake checkinstall check libopus-d
 
 Fedora:
 ```bash
-sudo dnf install libtool autoconf automake check check-devel libsodium-devel
+sudo dnf install libtool autoconf automake check check-devel libsodium-devel opus-devel libvpx-devel
 ```
 
 openSUSE:

README.md

@@ -8,10 +8,11 @@ qTox
 <h5>qTox is a powerful Tox client that follows the Tox design guidelines while running on all major platforms:</h5>
 
 * **Windows**:
-  - [**64 bit download**](#) - Currently unmaintained
+  - [**64 bit download**](https://build.tox.chat/view/Clients/job/qTox_build_windows_x86-64_release/lastSuccessfulBuild/artifact/qTox_build_windows_x86-64_release.zip)
-  - [**32 bit download** (for older hardware)](#) - Currently unmaintained
+  - [**32 bit download** (for older hardware)](https://build.tox.chat/view/Clients/job/qTox_build_windows_x86_release/lastSuccessfulBuild/artifact/qTox_build_windows_x86_release.zip)
 * **Linux**:
-  - [**binary**](#) - Currently unmaintained
+  - [**64 bit download**](https://build.tox.chat/view/Clients/job/qTox_build_linux_x86-64_release/lastSuccessfulBuild/artifact/qTox_build_linux_x86-64_release.tar.xz)
+  - [**32 bit download**](https://build.tox.chat/view/Clients/job/qTox_build_linux_x86_release/lastSuccessfulBuild/artifact/qTox_build_linux_x86_release.tar.xz)
   - [**packages**](/INSTALL.md#simple-install)
   - [**Gentoo overlay**](https://github.com/Tox/gentoo-overlay-tox)
 * **Mac**: [**download**](#) - Currently unmaintained<br/>

simple_make.sh

@@ -16,11 +16,17 @@ elif which dnf; then
         "Development Tools"
     sudo dnf install \
         git qt-devel qt-doc qt-creator qt5-qtsvg opencv-devel \
-        openal-soft-devel libXScrnSaver-devel qrencode-devel
+        openal-soft-devel libXScrnSaver-devel qrencode-devel \
+        opus-devel libvpx-devel qt5-qttools-devel glib2-devel \
+        gdk-pixbuf2-devel gtk2-devel
 else
     echo "Unknown package manager, attempting to compile anyways"
 fi
 
 ./bootstrap.sh
-qmake
+if [ -e /etc/redhat-release ]; then
+    qmake-qt5
+else
+    qmake
+fi
 make

windows/bootstrap.sh

@@ -19,13 +19,13 @@ cd $QTOX_DIR/libs
 
 
 ## toxcore
-if [ ! -f "libtoxcore-win32-i686.zip" ]; then
+if [ ! -f "libtoxcore_build_windows_x86_shared_release.zip" ]; then
-    wget --no-check-certificate http://jenkins.libtoxcore.so/job/libtoxcore-win32-i686/lastSuccessfulBuild/artifact/libtoxcore-win32-i686.zip
+    wget --no-check-certificate https://build.tox.chat/view/libtoxcore/job/libtoxcore_build_windows_x86_shared_release/lastSuccessfulBuild/artifact/libtoxcore_build_windows_x86_shared_release.zip
     rm -rf include/tox
 fi
 
 if [ ! -d "include/tox" ]; then
-    $QTOX_DIR/tools/unzip -o libtoxcore-win32-i686.zip -d ./
+    $QTOX_DIR/tools/unzip -o libtoxcore_build_windows_x86_shared_release.zip -d ./
 fi