try this again
This commit is contained in:
		
							parent
							
								
									d71aad9d72
								
							
						
					
					
						commit
						d4129f0225
					
				@ -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
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user