From d71aad9d72813a54e42b484e74e939166dc15595 Mon Sep 17 00:00:00 2001
From: stonedDiscord <stoned@derpymail.org>
Date: Wed, 31 Jul 2019 22:33:15 +0200
Subject: [PATCH] Revert "make default clone compileable to improve new dev
 experience and switch to qt on linux"

This reverts commit bf8aad33de3b326f3a36cad33ced5d3acd7f2c24.
---
 .gitlab-ci.yml         | 22 +++++++++++-----------
 Attorney_Online.pro    |  4 ++--
 scripts/macos_build.sh |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6cdead7..0f68fe5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,15 +29,15 @@ build linux x86_64:
     - clang --version
 
     # Extract BASS
-    #- mkdir bass
-    #- cd bass
-    #- curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
-    #- unzip bass.zip
-    #- cp x64/libbass.so ../lib
-    #- curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
-    #- unzip bassopus.zip
-    #- cp x64/libbassopus.so ../lib
-    #- cd ..
+    - mkdir bass
+    - cd bass
+    - curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
+    - unzip bass.zip
+    - cp x64/libbass.so ../lib
+    - curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
+    - unzip bassopus.zip
+    - cp x64/libbassopus.so ../lib
+    - cd ..
 
     # Extract Discord RPC
     - mkdir discord-rpc
@@ -56,7 +56,7 @@ build linux x86_64:
     - cd ..
 
     # Build
-    - qmake -spec linux-clang -DDISCORD -DQTAUDIO
+    - qmake -spec linux-clang
     - make -j4
 
     # Post-processing
@@ -88,7 +88,7 @@ build windows i686:
     - cd ..
 
     # Build
-    - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake -DDISCORD -DBASSAUDIO
+    - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake
     - make -j4
 
     # Post-processing
diff --git a/Attorney_Online.pro b/Attorney_Online.pro
index aefd514..20a61d3 100644
--- a/Attorney_Online.pro
+++ b/Attorney_Online.pro
@@ -16,13 +16,13 @@ HEADERS += $$files($$PWD/include/*.h)
 
 LIBS += -L$$PWD/lib
 
-#DEFINES += DISCORD
+DEFINES += DISCORD
 
 contains(DEFINES, DISCORD) {
 LIBS += -ldiscord-rpc
 }
 
-#DEFINES += BASSAUDIO
+DEFINES += BASSAUDIO
 
 contains(DEFINES, BASSAUDIO) {
 LIBS += -lbass
diff --git a/scripts/macos_build.sh b/scripts/macos_build.sh
index 389d6ae..22e2d45 100755
--- a/scripts/macos_build.sh
+++ b/scripts/macos_build.sh
@@ -30,4 +30,4 @@ tar -xvf apng.tar.xz
 cp clang_64/plugins/imageformats/libqapng.dylib ../lib
 cd ..
 
-qmake -DDISCORD -DBASSAUDIO && make -j2
+qmake && make -j2