From 893d998d6f7d30a6e4ca1a83c70f6ce197caca66 Mon Sep 17 00:00:00 2001 From: Pranav Sharma Date: Wed, 8 Oct 2025 23:19:32 -0700 Subject: [PATCH] working linux build --- .gitignore | 5 ++++- App/CMakeLists.txt | 17 ++++++++++++++--- Core/CMakeLists.txt | 2 +- Core/Source/Core/Renderer/Shader.cpp | 3 ++- Dependencies.cmake | 2 +- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index bb30396..c23e27d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,7 @@ build/ **.csproj **.nsight-gfxproj **.DotSettings -**.user \ No newline at end of file +**.user + +# Clangd Language Server +.cache/ diff --git a/App/CMakeLists.txt b/App/CMakeLists.txt index e01ce72..b6d8493 100644 --- a/App/CMakeLists.txt +++ b/App/CMakeLists.txt @@ -24,6 +24,17 @@ target_link_libraries(App Core) target_include_directories(App PRIVATE Source) # Set working directory for VS debugger -set_target_properties(App PROPERTIES - VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/App" -) \ No newline at end of file +if (WIN32) + set_target_properties(App PROPERTIES + VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/App" + ) +endif() + + +# Copy over Shaders / Other assets for the non VS plebs +if (UNIX) + add_custom_target(copy_shaders + COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/App/Shaders" "${CMAKE_CURRENT_BINARY_DIR}/Shaders" + ) + add_dependencies(App copy_shaders) +endif() diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt index 63f505a..cd67202 100644 --- a/Core/CMakeLists.txt +++ b/Core/CMakeLists.txt @@ -33,4 +33,4 @@ target_link_libraries(Core glfw) target_link_libraries(Core glad) target_link_libraries(Core glm) -target_include_directories(Core PUBLIC "Source" "vendor/stb") \ No newline at end of file +target_include_directories(Core PUBLIC "Source" "vendor/stb") diff --git a/Core/Source/Core/Renderer/Shader.cpp b/Core/Source/Core/Renderer/Shader.cpp index 6bd886e..b70b894 100644 --- a/Core/Source/Core/Renderer/Shader.cpp +++ b/Core/Source/Core/Renderer/Shader.cpp @@ -2,6 +2,7 @@ #include #include +#include #include @@ -185,4 +186,4 @@ namespace Renderer { return newShaderHandle; } -} \ No newline at end of file +} diff --git a/Dependencies.cmake b/Dependencies.cmake index 9448942..9f45078 100644 --- a/Dependencies.cmake +++ b/Dependencies.cmake @@ -54,4 +54,4 @@ if (NOT glm_FOUND) add_subdirectory(${glm_SOURCE_DIR} ${glm_BINARY_DIR}) endif() endif() -set_target_properties(glm PROPERTIES FOLDER "Dependencies") \ No newline at end of file +set_target_properties(glm::glm PROPERTIES FOLDER "Dependencies")