fix issues

nisaldilshan · Jul 11, 2024 · 82a9f71 · 82a9f71
1 parent f6c0f31
commit 82a9f71
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,6 @@ message(STATUS "CMake Binary Dir " + ${CMAKE_BINARY_DIR})
 
 set(CONAN_DISABLE_CHECK_COMPILER On)
 find_package(imgui REQUIRED)
-find_package(WebGPU REQUIRED)
 find_package(glfw3 REQUIRED)
 find_package(glm REQUIRED)
 find_package(stb REQUIRED)
@@ -40,11 +39,13 @@ option(RENDERER "Renderer to be used" "WebGPU")
 
 #### WALNUT GRAPHICS ###
 if (RENDERER STREQUAL "OpenGL")
+    find_package(glad REQUIRED)
     add_subdirectory(Walnut/src/Walnut/GraphicsAPI/OpenGL)
 elseif(RENDERER STREQUAL "Vulkan")
     find_package (Vulkan REQUIRED)
     add_subdirectory(Walnut/src/Walnut/GraphicsAPI/Vulkan)
 elseif(RENDERER STREQUAL "WebGPU")
+    find_package(WebGPU REQUIRED)
     add_subdirectory(vendor/glfw3webgpu)
     add_subdirectory(Walnut/src/Walnut/GraphicsAPI/WebGPU)
 else()
@@ -62,7 +63,7 @@ add_library (walnut SHARED
 
 target_compile_definitions(walnut PRIVATE Walnut_EXPORTS)
 target_include_directories(walnut PRIVATE "Walnut/src")
-target_link_libraries(walnut PRIVATE stb::stb)
+target_link_libraries(walnut PRIVATE stb::stb glm::glm)
 
 if (RENDERER STREQUAL "OpenGL")
     target_link_libraries(walnut PRIVATE walnut-graphics-opengl)

diff --git a/Walnut/src/Walnut/GraphicsAPI/OpenGL/CMakeLists.txt b/Walnut/src/Walnut/GraphicsAPI/OpenGL/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library (walnut-graphics-opengl STATIC
 
 target_include_directories(walnut-graphics-opengl PUBLIC ${CMAKE_SOURCE_DIR}/Walnut/src) 
 
-target_link_libraries(walnut-graphics-opengl PUBLIC glfw3 glad)
+target_link_libraries(walnut-graphics-opengl PUBLIC glfw glad::glad imgui::imgui)
 
 message(STATUS "OPENGL_LIBRARIES= " ${OPENGL_LIBRARIES})
 message(STATUS "X11_LIBRARIES= " ${X11_LIBRARIES})

diff --git a/Walnut/src/Walnut/GraphicsAPI/OpenGL/GlfwOpenGLRenderingBackend.cpp b/Walnut/src/Walnut/GraphicsAPI/OpenGL/GlfwOpenGLRenderingBackend.cpp
@@ -17,10 +17,6 @@ namespace Walnut
 
 	}
 
-	void GlfwOpenGLRenderingBackend::SetupGraphicsAPI()
-	{
-	}
-
 	void GlfwOpenGLRenderingBackend::SetupWindow(int width, int height)
 	{
 		GraphicsAPI::OpenGL::SetupViewport(width, height);
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,10 +17,6 @@ namespace Walnut @@
     	}
-    	void GlfwOpenGLRenderingBackend::SetupGraphicsAPI()
-    	{
-    	}
     	void GlfwOpenGLRenderingBackend::SetupWindow(int width, int height)
     	{
     		GraphicsAPI::OpenGL::SetupViewport(width, height);
@@ Expand Down @@