SOme updates
This commit is contained in:
		
							parent
							
								
									9ce2dd94d0
								
							
						
					
					
						commit
						3a7087ffca
					
				@ -1,5 +1,5 @@
 | 
				
			|||||||
#!/bin/bash
 | 
					#!/bin/bash
 | 
				
			||||||
_build_helper_dir="$(pwd)/build-helpers"
 | 
					_build_helper_dir="$(pwd)/build-helpers/"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
_build_type="Debug"
 | 
					_build_type="Debug"
 | 
				
			||||||
if [[ -n "$1" ]]; then
 | 
					if [[ -n "$1" ]]; then
 | 
				
			||||||
@ -44,7 +44,7 @@ mkdir build || exit 1
 | 
				
			|||||||
cd build || exit 1
 | 
					cd build || exit 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo "Build type: $_build_type"
 | 
					echo "Build type: $_build_type"
 | 
				
			||||||
cmake .. -DCMAKE_BUILD_TYPE="$_build_type" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DBUILD_INCLUDE_FILE="$_build_helper_dir"/cmake/config/tearoot-server.cmake -DCMAKE_MODULE_PATH="$_build_helper_dir"/cmake/ -DDISABLE_QT=1 -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON -DCOMPILE_WEB_CLIENT="$_web_flag" $TEASPEAK_DEPLOY_TYPE_SPECIFIER
 | 
					cmake .. -DCMAKE_BUILD_TYPE="$_build_type" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DBUILD_INCLUDE_FILE="$_build_helper_dir"/cmake/config/tearoot-server.cmake -DCMAKE_MODULE_PATH="$_build_helper_dir/cmake/" -DDISABLE_QT=1 -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON -DCOMPILE_WEB_CLIENT="$_web_flag" $TEASPEAK_DEPLOY_TYPE_SPECIFIER
 | 
				
			||||||
_code=$?
 | 
					_code=$?
 | 
				
			||||||
if [[ $_code -ne 0 ]]; then
 | 
					if [[ $_code -ne 0 ]]; then
 | 
				
			||||||
	echo "Failed to run CMAKE project"
 | 
						echo "Failed to run CMAKE project"
 | 
				
			||||||
 | 
				
			|||||||
@ -1 +1 @@
 | 
				
			|||||||
Subproject commit 1ffadc46807efce964bec69f38f94ad7093023af
 | 
					Subproject commit fe6cc64884b2b408b607389f46266d44fd942a79
 | 
				
			||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user