mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 06:50:05 +00:00 
			
		
		
		
	Add qt_arch variable to setup scripts, updating Windows to msvc2022
This commit is contained in:
		
							parent
							
								
									1fd51d23f3
								
							
						
					
					
						commit
						2f37e42b38
					
				
					 4 changed files with 8 additions and 4 deletions
				
			
		|  | @ -3,10 +3,11 @@ call tools\setup-common.bat | ||||||
| set build_dir=build-debug | set build_dir=build-debug | ||||||
| set build_type=Debug | set build_type=Debug | ||||||
| set qt_version=6.8.0 | set qt_version=6.8.0 | ||||||
|  | set qt_arch=msvc2022_64 | ||||||
| 
 | 
 | ||||||
| mkdir %build_dir% | mkdir %build_dir% | ||||||
| cmake -B %build_dir% -S . ^ | cmake -B %build_dir% -S . ^ | ||||||
|     -DCMAKE_BUILD_TYPE=%build_type% ^ |     -DCMAKE_BUILD_TYPE=%build_type% ^ | ||||||
|     -DCMAKE_CONFIGURATION_TYPES=%build_type% ^ |     -DCMAKE_CONFIGURATION_TYPES=%build_type% ^ | ||||||
|     -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/msvc2019_64 |     -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch% | ||||||
| pause | pause | ||||||
|  |  | ||||||
|  | @ -4,6 +4,7 @@ | ||||||
| build_dir=${1:-build-debug} | build_dir=${1:-build-debug} | ||||||
| build_type=Debug | build_type=Debug | ||||||
| qt_version=6.8.0 | qt_version=6.8.0 | ||||||
|  | qt_arch=gcc_64 | ||||||
| script_dir="$(dirname "$(readlink -f "$0")")" | script_dir="$(dirname "$(readlink -f "$0")")" | ||||||
| 
 | 
 | ||||||
| mkdir -p ${build_dir} | mkdir -p ${build_dir} | ||||||
|  | @ -11,5 +12,5 @@ cmake -B ${build_dir} -S . \ | ||||||
| 	-DCMAKE_BUILD_TYPE=${build_type} \ | 	-DCMAKE_BUILD_TYPE=${build_type} \ | ||||||
| 	-DCMAKE_CONFIGURATION_TYPES=${build_type} \ | 	-DCMAKE_CONFIGURATION_TYPES=${build_type} \ | ||||||
| 	-DCMAKE_INSTALL_PREFIX=${build_dir}/${build_type}/supercell-wx \ | 	-DCMAKE_INSTALL_PREFIX=${build_dir}/${build_type}/supercell-wx \ | ||||||
| 	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/gcc_64 \ | 	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/${qt_arch} \ | ||||||
| 	-G Ninja | 	-G Ninja | ||||||
|  |  | ||||||
|  | @ -3,10 +3,11 @@ call tools\setup-common.bat | ||||||
| set build_dir=build-release | set build_dir=build-release | ||||||
| set build_type=Release | set build_type=Release | ||||||
| set qt_version=6.8.0 | set qt_version=6.8.0 | ||||||
|  | set qt_arch=msvc2022_64 | ||||||
| 
 | 
 | ||||||
| mkdir %build_dir% | mkdir %build_dir% | ||||||
| cmake -B %build_dir% -S . ^ | cmake -B %build_dir% -S . ^ | ||||||
|     -DCMAKE_BUILD_TYPE=%build_type% ^ |     -DCMAKE_BUILD_TYPE=%build_type% ^ | ||||||
|     -DCMAKE_CONFIGURATION_TYPES=%build_type% ^ |     -DCMAKE_CONFIGURATION_TYPES=%build_type% ^ | ||||||
|     -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/msvc2019_64 |     -DCMAKE_PREFIX_PATH=C:/Qt/%qt_version%/%qt_arch% | ||||||
| pause | pause | ||||||
|  |  | ||||||
|  | @ -4,6 +4,7 @@ | ||||||
| build_dir=${1:-build-release} | build_dir=${1:-build-release} | ||||||
| build_type=Release | build_type=Release | ||||||
| qt_version=6.8.0 | qt_version=6.8.0 | ||||||
|  | qt_arch=gcc_64 | ||||||
| script_dir="$(dirname "$(readlink -f "$0")")" | script_dir="$(dirname "$(readlink -f "$0")")" | ||||||
| 
 | 
 | ||||||
| mkdir -p ${build_dir} | mkdir -p ${build_dir} | ||||||
|  | @ -11,5 +12,5 @@ cmake -B ${build_dir} -S . \ | ||||||
| 	-DCMAKE_BUILD_TYPE=${build_type} \ | 	-DCMAKE_BUILD_TYPE=${build_type} \ | ||||||
| 	-DCMAKE_CONFIGURATION_TYPES=${build_type} \ | 	-DCMAKE_CONFIGURATION_TYPES=${build_type} \ | ||||||
| 	-DCMAKE_INSTALL_PREFIX=${build_dir}/${build_type}/supercell-wx \ | 	-DCMAKE_INSTALL_PREFIX=${build_dir}/${build_type}/supercell-wx \ | ||||||
| 	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/gcc_64 \ | 	-DCMAKE_PREFIX_PATH=/opt/Qt/${qt_version}/${qt_arch} \ | ||||||
| 	-G Ninja | 	-G Ninja | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat