mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 05:40:04 +00:00 
			
		
		
		
	CMake cleanup
Several cleanups to the buildsystem: - Do better factoring of common libs between platforms. - Add support to building on Windows. - Remove Qt4 support. - Re-sort file lists and add missing headers.
This commit is contained in:
		
							parent
							
								
									523385955c
								
							
						
					
					
						commit
						45976da975
					
				
					 9 changed files with 271 additions and 156 deletions
				
			
		|  | @ -2,54 +2,61 @@ set(CMAKE_AUTOMOC ON) | |||
| set(CMAKE_INCLUDE_CURRENT_DIR ON) | ||||
| 
 | ||||
| set(SRCS | ||||
|             bootmanager.cpp | ||||
|             config/controller_config.cpp | ||||
|             config/controller_config_util.cpp | ||||
|             debugger/callstack.cpp | ||||
|             debugger/disassembler.cpp | ||||
|             debugger/graphics.cpp | ||||
|             debugger/graphics_cmdlists.cpp | ||||
|             debugger/ramview.cpp | ||||
|             debugger/registers.cpp | ||||
|             bootmanager.cpp | ||||
|             hotkeys.cpp | ||||
|             main.cpp | ||||
|             config/controller_config.cpp | ||||
|             config/controller_config_util.cpp) | ||||
|             ) | ||||
| 
 | ||||
| set(HEADERS | ||||
|             bootmanager.hxx | ||||
|             config/controller_config.hxx | ||||
|             config/controller_config_util.hxx | ||||
|             debugger/callstack.hxx | ||||
|             debugger/disassembler.hxx | ||||
|             debugger/graphics.hxx | ||||
|             debugger/graphics_cmdlists.hxx | ||||
|             debugger/ramview.hxx | ||||
|             debugger/registers.hxx | ||||
|             bootmanager.hxx | ||||
|             hotkeys.hxx | ||||
|             main.hxx | ||||
|             version.h | ||||
|             config/controller_config.hxx | ||||
|             config/controller_config_util.hxx) | ||||
|             ) | ||||
| 
 | ||||
| set(UIS | ||||
|             config/controller_config.ui | ||||
|             debugger/callstack.ui | ||||
|             debugger/disassembler.ui | ||||
|             debugger/registers.ui | ||||
|             hotkeys.ui | ||||
|             main.ui | ||||
|             config/controller_config.ui) | ||||
|             ) | ||||
| 
 | ||||
| if(USE_QT5) | ||||
| create_directory_groups(${SRCS} ${HEADERS} ${UIS}) | ||||
| 
 | ||||
| if (Qt5_FOUND) | ||||
|     qt5_wrap_ui(UI_HDRS ${UIS}) | ||||
| else() | ||||
|     qt4_wrap_ui(UI_HDRS ${UIS}) | ||||
| endif() | ||||
| 
 | ||||
| add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) | ||||
| if(APPLE) | ||||
| 	set(ICONV_LIBRARY iconv) | ||||
| else() | ||||
| 	set(RT_LIBRARY rt) | ||||
| endif() | ||||
| target_link_libraries(citra-qt core common video_core qhexedit) | ||||
| target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS}) | ||||
| 
 | ||||
| target_link_libraries(citra-qt core common video_core qhexedit ${ICONV_LIBRARY} ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${RT_LIBRARY} ${PNG_LIBRARIES}) | ||||
| if(USE_QT5) | ||||
|     target_link_libraries(citra-qt Qt5::Gui Qt5::Widgets Qt5::OpenGL) | ||||
| if (APPLE) | ||||
|     target_link_libraries(citra-qt iconv ${COREFOUNDATION_LIBRARY}) | ||||
| elseif (WIN32) | ||||
|     target_link_libraries(citra-qt winmm) | ||||
| else() # Unix | ||||
|     target_link_libraries(citra-qt rt) | ||||
| endif() | ||||
| 
 | ||||
| #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue