Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ build/
**.csproj
**.nsight-gfxproj
**.DotSettings
**.user
**.user

# Clangd Language Server
.cache/
17 changes: 14 additions & 3 deletions App/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
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()
2 changes: 1 addition & 1 deletion Core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
target_include_directories(Core PUBLIC "Source" "vendor/stb")
3 changes: 2 additions & 1 deletion Core/Source/Core/Renderer/Shader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <iostream>
#include <fstream>
#include <vector>

#include <glad/gl.h>

Expand Down Expand Up @@ -185,4 +186,4 @@ namespace Renderer {
return newShaderHandle;
}

}
}
2 changes: 1 addition & 1 deletion Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
set_target_properties(glm::glm PROPERTIES FOLDER "Dependencies")