diff options
| author | stonedDiscord <stoned@derpymail.org> | 2019-08-04 19:39:34 +0200 |
|---|---|---|
| committer | stonedDiscord <stoned@derpymail.org> | 2019-08-04 19:39:34 +0200 |
| commit | d4129f0225ab97c320a4a72e009d3684b50f2bd2 (patch) | |
| tree | 6720d52a4cb1caef90e7c7abd1a8b556ffe6f04b | |
| parent | d71aad9d72813a54e42b484e74e939166dc15595 (diff) | |
try this again
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rw-r--r-- | Attorney_Online.pro | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f68fe5a..a60c363c 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 + - qmake -spec linux-clang "DEFINES += DISCORD QTAUDIO" - make -j4 # Post-processing @@ -88,7 +88,7 @@ build windows i686: - cd .. # Build - - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake + - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake "DEFINES += -DDISCORD -DBASSAUDIO" - make -j4 # Post-processing diff --git a/Attorney_Online.pro b/Attorney_Online.pro index 20a61d36..aefd5140 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 |