mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-11-04 04:20:05 +00:00 
			
		
		
		
	Merge pull request #445 from AdenKoperczak/add_wayland_plugin
Add wayland plugin
This commit is contained in:
		
						commit
						0ec90737d3
					
				
					 3 changed files with 18 additions and 0 deletions
				
			
		
							
								
								
									
										5
									
								
								.github/workflows/ci.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/ci.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -126,6 +126,9 @@ jobs:
 | 
				
			||||||
        sudo apt-get install doxygen \
 | 
					        sudo apt-get install doxygen \
 | 
				
			||||||
                             libfuse2 \
 | 
					                             libfuse2 \
 | 
				
			||||||
                             ninja-build \
 | 
					                             ninja-build \
 | 
				
			||||||
 | 
					                             wayland-protocols \
 | 
				
			||||||
 | 
					                             libwayland-dev \
 | 
				
			||||||
 | 
					                             libwayland-egl-backend-dev \
 | 
				
			||||||
                             ${{ matrix.compiler_packages }}
 | 
					                             ${{ matrix.compiler_packages }}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Setup Python Environment
 | 
					    - name: Setup Python Environment
 | 
				
			||||||
| 
						 | 
					@ -205,6 +208,8 @@ jobs:
 | 
				
			||||||
        cd plugins/
 | 
					        cd plugins/
 | 
				
			||||||
        mkdir -p sqldrivers/
 | 
					        mkdir -p sqldrivers/
 | 
				
			||||||
        cp "${RUNNER_WORKSPACE}/Qt/${{ matrix.qt_version }}/${{ matrix.qt_arch_dir }}/plugins/sqldrivers/libqsqlite.so" sqldrivers/
 | 
					        cp "${RUNNER_WORKSPACE}/Qt/${{ matrix.qt_version }}/${{ matrix.qt_arch_dir }}/plugins/sqldrivers/libqsqlite.so" sqldrivers/
 | 
				
			||||||
 | 
					        mkdir -p platforms/
 | 
				
			||||||
 | 
					        cp ${RUNNER_WORKSPACE}/Qt/${{ matrix.qt_version }}/${{ matrix.qt_arch_dir }}/plugins/platforms/libqwayland* platforms/
 | 
				
			||||||
        cd ..
 | 
					        cd ..
 | 
				
			||||||
        popd
 | 
					        popd
 | 
				
			||||||
        tar -czf supercell-wx-${{ matrix.artifact_suffix }}.tar.gz supercell-wx/
 | 
					        tar -czf supercell-wx-${{ matrix.artifact_suffix }}.tar.gz supercell-wx/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										3
									
								
								.github/workflows/clang-tidy-review.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/clang-tidy-review.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -65,6 +65,9 @@ jobs:
 | 
				
			||||||
        sudo apt-get install doxygen \
 | 
					        sudo apt-get install doxygen \
 | 
				
			||||||
                             libfuse2 \
 | 
					                             libfuse2 \
 | 
				
			||||||
                             ninja-build \
 | 
					                             ninja-build \
 | 
				
			||||||
 | 
					                             wayland-protocols \
 | 
				
			||||||
 | 
					                             libwayland-dev \
 | 
				
			||||||
 | 
					                             libwayland-egl-backend-dev \
 | 
				
			||||||
                             ${{ matrix.compiler_packages }}
 | 
					                             ${{ matrix.compiler_packages }}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Setup Python Environment
 | 
					    - name: Setup Python Environment
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -688,6 +688,16 @@ if (MSVC)
 | 
				
			||||||
else()
 | 
					else()
 | 
				
			||||||
    target_compile_options(scwx-qt PRIVATE "$<$<CONFIG:Release>:-g>")
 | 
					    target_compile_options(scwx-qt PRIVATE "$<$<CONFIG:Release>:-g>")
 | 
				
			||||||
    target_compile_options(supercell-wx PRIVATE "$<$<CONFIG:Release>:-g>")
 | 
					    target_compile_options(supercell-wx PRIVATE "$<$<CONFIG:Release>:-g>")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Add wayland client packages
 | 
				
			||||||
 | 
					    find_package(QT NAMES Qt6
 | 
				
			||||||
 | 
					                 COMPONENTS WaylandClient
 | 
				
			||||||
 | 
					                 REQUIRED)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    find_package(Qt${QT_VERSION_MAJOR}
 | 
				
			||||||
 | 
					                 COMPONENTS WaylandClient
 | 
				
			||||||
 | 
					                 REQUIRED)
 | 
				
			||||||
 | 
					    target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::WaylandClient)
 | 
				
			||||||
endif()
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
 | 
					target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue