mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 22:00:05 +00:00 
			
		
		
		
	Merge pull request #60 from xsacha/qt5
Use Qt5 by default for citra-qt project.
This commit is contained in:
		
						commit
						bc64261d29
					
				
					 7 changed files with 55 additions and 32 deletions
				
			
		|  | @ -14,7 +14,7 @@ set(SRCS | |||
|             config/controller_config.cpp | ||||
|             config/controller_config_util.cpp) | ||||
| 
 | ||||
| set (HEADERS | ||||
| set(HEADERS | ||||
|             bootmanager.hxx | ||||
|             debugger/callstack.hxx | ||||
|             debugger/disassembler.hxx | ||||
|  | @ -26,24 +26,30 @@ set (HEADERS | |||
|             config/controller_config.hxx | ||||
|             config/controller_config_util.hxx) | ||||
| 
 | ||||
| qt4_wrap_ui(UI_HDRS | ||||
|                     debugger/callstack.ui | ||||
|                     debugger/disassembler.ui | ||||
|                     debugger/registers.ui | ||||
|                     hotkeys.ui | ||||
|                     main.ui | ||||
|                     config/controller_config.ui) | ||||
| set(UIS | ||||
|             debugger/callstack.ui | ||||
|             debugger/disassembler.ui | ||||
|             debugger/registers.ui | ||||
|             hotkeys.ui | ||||
|             main.ui | ||||
|             config/controller_config.ui) | ||||
| 
 | ||||
| # add uic results to include directories | ||||
| include_directories(${CMAKE_CURRENT_BINARY_DIR}) | ||||
| if(USE_QT5) | ||||
|     qt5_wrap_ui(UI_HDRS ${UIS}) | ||||
| else() | ||||
|     qt4_wrap_ui(UI_HDRS ${UIS}) | ||||
| endif() | ||||
| 
 | ||||
| add_executable(citra-qt ${SRCS} ${UI_HDRS}) | ||||
| if (APPLE) | ||||
| 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 ${ICONV_LIBRARY} ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${RT_LIBRARY} ${GLEW_LIBRARY} ${GLFW_LIBRARIES}) | ||||
| target_link_libraries(citra-qt core common video_core qhexedit ${ICONV_LIBRARY} ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${RT_LIBRARY} ${GLEW_LIBRARY}) | ||||
| if(USE_QT5) | ||||
|     target_link_libraries(citra-qt Qt5::Gui Qt5::Widgets Qt5::OpenGL) | ||||
| endif() | ||||
| 
 | ||||
| #install(TARGETS citra-qt RUNTIME DESTINATION ${bindir}) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue