This commit is contained in:
		
							parent
							
								
									f9ce347ca0
								
							
						
					
					
						commit
						e65b6b3f83
					
				
					 4 changed files with 0 additions and 6 deletions
				
			
		| 
						 | 
					@ -25,7 +25,6 @@ class LightRecipe(ConanFile):
 | 
				
			||||||
    def requirements(self):
 | 
					    def requirements(self):
 | 
				
			||||||
        self.requires("entt/3.15.0")
 | 
					        self.requires("entt/3.15.0")
 | 
				
			||||||
        self.requires("glfw/3.4")
 | 
					        self.requires("glfw/3.4")
 | 
				
			||||||
        self.requires("glm/1.0.1")
 | 
					 | 
				
			||||||
        self.requires("stb/cci.20240531")
 | 
					        self.requires("stb/cci.20240531")
 | 
				
			||||||
        self.requires("yaml-cpp/0.8.0")
 | 
					        self.requires("yaml-cpp/0.8.0")
 | 
				
			||||||
        self.requires("lz4/1.10.0")
 | 
					        self.requires("lz4/1.10.0")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								external/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								external/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -40,7 +40,6 @@ endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
add_compile_definitions(IMGUI_IMPL_OPENGL_LOADER_GLAD)
 | 
					add_compile_definitions(IMGUI_IMPL_OPENGL_LOADER_GLAD)
 | 
				
			||||||
include_directories(${DEPENDENCIES_DIR}GLFW/include)
 | 
					include_directories(${DEPENDENCIES_DIR}GLFW/include)
 | 
				
			||||||
include_directories(${DEPENDENCIES_DIR}glm/)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
add_library(imgui STATIC ${IMGUI_FILES} ${IMGUI_BACKEND_FILES})
 | 
					add_library(imgui STATIC ${IMGUI_FILES} ${IMGUI_BACKEND_FILES})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -49,6 +48,5 @@ target_link_libraries(
 | 
				
			||||||
  imgui
 | 
					  imgui
 | 
				
			||||||
  PUBLIC glad
 | 
					  PUBLIC glad
 | 
				
			||||||
  PUBLIC opengl::opengl
 | 
					  PUBLIC opengl::opengl
 | 
				
			||||||
  PUBLIC glm::glm 
 | 
					 | 
				
			||||||
  PUBLIC glfw
 | 
					  PUBLIC glfw
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,8 +5,6 @@ else()
 | 
				
			||||||
endif()
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(window PUBLIC 
 | 
					target_link_libraries(window PUBLIC 
 | 
				
			||||||
    glm::glm
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    PRIVATE
 | 
					    PRIVATE
 | 
				
			||||||
    glfw
 | 
					    glfw
 | 
				
			||||||
    logger 
 | 
					    logger 
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,4 @@
 | 
				
			||||||
find_package(glfw3 REQUIRED)
 | 
					find_package(glfw3 REQUIRED)
 | 
				
			||||||
find_package(glm REQUIRED)
 | 
					 | 
				
			||||||
find_package(stb REQUIRED)
 | 
					find_package(stb REQUIRED)
 | 
				
			||||||
find_package(yaml-cpp REQUIRED)
 | 
					find_package(yaml-cpp REQUIRED)
 | 
				
			||||||
find_package(EnTT REQUIRED)
 | 
					find_package(EnTT REQUIRED)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue