mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	updated CMakeLists
This commit is contained in:
		
							parent
							
								
									59d00e6e4b
								
							
						
					
					
						commit
						6b83509a7e
					
				
					 6 changed files with 44 additions and 45 deletions
				
			
		|  | @ -37,9 +37,7 @@ include_directories(${SDL2_INCLUDE_DIR}) | ||||||
| include_directories(${OPENGL_INCLUDE_DIR}) | include_directories(${OPENGL_INCLUDE_DIR}) | ||||||
|      |      | ||||||
| # internal includes | # internal includes | ||||||
| include_directories(src/common/src) | include_directories(src) | ||||||
| include_directories(src/core/src) |  | ||||||
| include_directories(src/citra/src) |  | ||||||
| 
 | 
 | ||||||
| # process subdirectories | # process subdirectories | ||||||
| if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4) | if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,7 @@ | ||||||
| add_subdirectory(common) | add_subdirectory(common) | ||||||
| add_subdirectory(core) | add_subdirectory(core) | ||||||
| add_subdirectory(citra) | add_subdirectory(citra) | ||||||
|  | add_subdirectory(video_core) | ||||||
| 
 | 
 | ||||||
| if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4) | if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4) | ||||||
|     #add_subdirectory(citra_qt) |     #add_subdirectory(citra_qt) | ||||||
|  |  | ||||||
|  | @ -1,5 +1,5 @@ | ||||||
| set(SRCS	src/citra.cpp | set(SRCS    citra.cpp | ||||||
|             src/emuwindow/emuwindow_glfw.cpp) |             emuwindow/emuwindow_glfw.cpp) | ||||||
| 
 | 
 | ||||||
| # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) | # NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) | ||||||
| if (NOT X11_xf86vmode_LIB) | if (NOT X11_xf86vmode_LIB) | ||||||
|  |  | ||||||
|  | @ -1,18 +1,19 @@ | ||||||
| set(SRCS    src/break_points.cpp | set(SRCS    break_points.cpp | ||||||
|             src/console_listener.cpp |             console_listener.cpp | ||||||
|             src/extended_trace.cpp |             extended_trace.cpp | ||||||
|             src/file_search.cpp |             file_search.cpp | ||||||
|             src/file_util.cpp |             file_util.cpp | ||||||
|             src/hash.cpp |             hash.cpp | ||||||
|             src/log_manager.cpp |             log_manager.cpp | ||||||
|             src/math_util.cpp |             math_util.cpp | ||||||
|             src/mem_arena.cpp |             mem_arena.cpp | ||||||
|             src/memory_util.cpp |             memory_util.cpp | ||||||
|             src/misc.cpp |             misc.cpp | ||||||
|             src/msg_handler.cpp |             msg_handler.cpp | ||||||
|             src/string_util.cpp |             string_util.cpp | ||||||
|             src/thread.cpp |             thread.cpp | ||||||
|             src/timer.cpp |             timer.cpp | ||||||
|             src/version.cpp) |             utf8.cpp | ||||||
|  |             version.cpp) | ||||||
| 
 | 
 | ||||||
| add_library(common STATIC ${SRCS}) | add_library(common STATIC ${SRCS}) | ||||||
|  |  | ||||||
|  | @ -1,10 +1,23 @@ | ||||||
| set(SRCS	src/core.cpp | set(SRCS    core.cpp | ||||||
| 			src/memory.cpp |             core_timing.cpp | ||||||
| 			src/boot/apploader.cpp |             loader.cpp | ||||||
| 			src/boot/bootrom.cpp |             mem_map.cpp | ||||||
|             src/boot/loader.cpp |             mem_map_funcs.cpp | ||||||
| 			src/hle/hle.cpp |             system.cpp | ||||||
| 			src/hw/hw.cpp |             arm/disassembler/arm_disasm.cpp | ||||||
| 	    ) |             arm/interpreter/arm_interpreter.cpp | ||||||
|  |             arm/interpreter/armemu.cpp | ||||||
|  |             arm/interpreter/arminit.cpp | ||||||
|  |             arm/interpreter/armmmu.cpp | ||||||
|  |             arm/interpreter/armos.cpp | ||||||
|  |             arm/interpreter/armsupp.cpp | ||||||
|  |             arm/interpreter/armvirt.cpp | ||||||
|  |             arm/interpreter/thumbemu.cpp | ||||||
|  |             arm/mmu/arm1176jzf_s_mmu.cpp | ||||||
|  |             elf/elf_reader.cpp | ||||||
|  |             file_sys/directory_file_system/cpp | ||||||
|  |             file_sys/meta_file_system.cpp | ||||||
|  |             hw/hw.cpp | ||||||
|  |             hw/hw_lcd.cpp) | ||||||
| 
 | 
 | ||||||
| add_library(core STATIC ${SRCS}) | add_library(core STATIC ${SRCS}) | ||||||
|  |  | ||||||
|  | @ -1,19 +1,5 @@ | ||||||
| set(SRCS | set(SRCS    src/video_core.cpp | ||||||
|             src/bp_mem.cpp |  | ||||||
|             src/cp_mem.cpp |  | ||||||
|             src/xf_mem.cpp |  | ||||||
|             src/fifo.cpp |  | ||||||
|             src/fifo_player.cpp |  | ||||||
|             src/vertex_loader.cpp |  | ||||||
|             src/vertex_manager.cpp |  | ||||||
|             src/video_core.cpp |  | ||||||
|             src/shader_manager.cpp |  | ||||||
|             src/texture_decoder.cpp |  | ||||||
|             src/texture_manager.cpp |  | ||||||
|             src/utils.cpp |             src/utils.cpp | ||||||
|             src/renderer_gl3/renderer_gl3.cpp |             src/renderer_opengl/renderer_opengl.cpp) | ||||||
|             src/renderer_gl3/shader_interface.cpp |  | ||||||
|             src/renderer_gl3/texture_interface.cpp |  | ||||||
|             src/renderer_gl3/uniform_manager.cpp) |  | ||||||
| 
 | 
 | ||||||
| add_library(video_core STATIC ${SRCS}) | add_library(video_core STATIC ${SRCS}) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue