Revert "make default clone compileable to improve new dev experience and switch to qt on linux"

This reverts commit bf8aad33de.
This commit is contained in:
stonedDiscord 2019-07-31 22:33:15 +02:00
parent bf8aad33de
commit d71aad9d72
3 changed files with 14 additions and 14 deletions

View File

@ -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

View File

@ -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

View File

@ -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