mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 05:40:04 +00:00 
			
		
		
		
	build: Rework CI and move all bundling into new build target. (#6556)
* build: Rework CI and move all bundling into new build target. * ci: Use "mingw" in msys2 release names for compatibility. * ci: Use "osx" in macOS release names for compatibility. * ci: Disable macOS upload. Will be moved to a separate PR for canary merge.
This commit is contained in:
		
							parent
							
								
									2e479fcec5
								
							
						
					
					
						commit
						2d6aca4563
					
				
					 57 changed files with 614 additions and 967 deletions
				
			
		|  | @ -290,22 +290,6 @@ elseif(WIN32) | |||
|     endif() | ||||
| endif() | ||||
| 
 | ||||
| if (CITRA_BUNDLE_LIBRARIES) | ||||
|     if (APPLE) | ||||
|         set(BUNDLE_DIR "$<TARGET_BUNDLE_DIR:citra-qt>") | ||||
|     endif() | ||||
| 
 | ||||
|     add_custom_command(TARGET citra-qt | ||||
|         POST_BUILD | ||||
|         COMMAND ${CMAKE_COMMAND} | ||||
|         -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} | ||||
|         -DTYPE=qt | ||||
|         -DEXECUTABLE_PATH=$<TARGET_FILE:citra-qt> | ||||
|         -DBUNDLE_PATH=${BUNDLE_DIR} | ||||
|         -P ${CMAKE_SOURCE_DIR}/CMakeModules/BundleLibraries.cmake | ||||
|         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) | ||||
| endif() | ||||
| 
 | ||||
| create_target_directory_groups(citra-qt) | ||||
| 
 | ||||
| target_link_libraries(citra-qt PRIVATE audio_core citra_common citra_core input_common network video_core) | ||||
|  | @ -360,15 +344,6 @@ if(UNIX AND NOT APPLE) | |||
|     install(TARGETS citra-qt RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") | ||||
| endif() | ||||
| 
 | ||||
| if (MSVC) | ||||
|     include(CopyCitraQt6Deps) | ||||
|     copy_citra_Qt6_deps(citra-qt) | ||||
|     if (ENABLE_WEB_SERVICE AND OPENSSL_DLL_DIR) | ||||
|         include(CopyCitraOpensslDeps) | ||||
|         copy_citra_openssl_deps(citra-qt) | ||||
|     endif() | ||||
| endif() | ||||
| 
 | ||||
| if (NOT APPLE) | ||||
|     target_compile_definitions(citra-qt PRIVATE HAS_OPENGL) | ||||
| endif() | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue