make default clone compileable to improve new dev experience and switch to qt on linux
This commit is contained in:
		
							parent
							
								
									afbbc5476b
								
							
						
					
					
						commit
						bf8aad33de
					
				@ -29,15 +29,15 @@ build linux x86_64:
 | 
				
			|||||||
    - clang --version
 | 
					    - clang --version
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Extract BASS
 | 
					    # Extract BASS
 | 
				
			||||||
    - mkdir bass
 | 
					    #- mkdir bass
 | 
				
			||||||
    - cd bass
 | 
					    #- cd bass
 | 
				
			||||||
    - curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
 | 
					    #- curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip
 | 
				
			||||||
    - unzip bass.zip
 | 
					    #- unzip bass.zip
 | 
				
			||||||
    - cp x64/libbass.so ../lib
 | 
					    #- cp x64/libbass.so ../lib
 | 
				
			||||||
    - curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
 | 
					    #- curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip
 | 
				
			||||||
    - unzip bassopus.zip
 | 
					    #- unzip bassopus.zip
 | 
				
			||||||
    - cp x64/libbassopus.so ../lib
 | 
					    #- cp x64/libbassopus.so ../lib
 | 
				
			||||||
    - cd ..
 | 
					    #- cd ..
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Extract Discord RPC
 | 
					    # Extract Discord RPC
 | 
				
			||||||
    - mkdir discord-rpc
 | 
					    - mkdir discord-rpc
 | 
				
			||||||
@ -56,7 +56,7 @@ build linux x86_64:
 | 
				
			|||||||
    - cd ..
 | 
					    - cd ..
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Build
 | 
					    # Build
 | 
				
			||||||
    - qmake -spec linux-clang
 | 
					    - qmake -spec linux-clang -DDISCORD -DQTAUDIO
 | 
				
			||||||
    - make -j4
 | 
					    - make -j4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Post-processing
 | 
					    # Post-processing
 | 
				
			||||||
@ -88,7 +88,7 @@ build windows i686:
 | 
				
			|||||||
    - cd ..
 | 
					    - cd ..
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Build
 | 
					    # Build
 | 
				
			||||||
    - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake
 | 
					    - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake -DDISCORD -DBASSAUDIO
 | 
				
			||||||
    - make -j4
 | 
					    - make -j4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Post-processing
 | 
					    # Post-processing
 | 
				
			||||||
 | 
				
			|||||||
@ -16,13 +16,13 @@ HEADERS += $$files($$PWD/include/*.h)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
LIBS += -L$$PWD/lib
 | 
					LIBS += -L$$PWD/lib
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DEFINES += DISCORD
 | 
					#DEFINES += DISCORD
 | 
				
			||||||
 | 
					
 | 
				
			||||||
contains(DEFINES, DISCORD) {
 | 
					contains(DEFINES, DISCORD) {
 | 
				
			||||||
LIBS += -ldiscord-rpc
 | 
					LIBS += -ldiscord-rpc
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DEFINES += BASSAUDIO
 | 
					#DEFINES += BASSAUDIO
 | 
				
			||||||
 | 
					
 | 
				
			||||||
contains(DEFINES, BASSAUDIO) {
 | 
					contains(DEFINES, BASSAUDIO) {
 | 
				
			||||||
LIBS += -lbass
 | 
					LIBS += -lbass
 | 
				
			||||||
 | 
				
			|||||||
@ -30,4 +30,4 @@ tar -xvf apng.tar.xz
 | 
				
			|||||||
cp clang_64/plugins/imageformats/libqapng.dylib ../lib
 | 
					cp clang_64/plugins/imageformats/libqapng.dylib ../lib
 | 
				
			||||||
cd ..
 | 
					cd ..
 | 
				
			||||||
 | 
					
 | 
				
			||||||
qmake && make -j2
 | 
					qmake -DDISCORD -DBASSAUDIO && make -j2
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user