Skip to content

Commit

Permalink
FIX build on 42 computer
Browse files Browse the repository at this point in the history
  • Loading branch information
SaumonDesMers authored and afaure42 committed Feb 27, 2024
1 parent e986d21 commit 920f2c3
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}/src/app/threads/block_update
${CMAKE_CURRENT_SOURCE_DIR}/src/app/vulkan
${CMAKE_CURRENT_SOURCE_DIR}/src/app/window

${CMAKE_CURRENT_SOURCE_DIR}/external/glm
)

target_link_libraries(${PROJECT_NAME} glfw vulkan dl pthread X11 Xxf86vm Xrandr Xi)
Expand Down
8 changes: 4 additions & 4 deletions scripts/compile_shaders.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# https://github.com/google/shaderc/blob/main/downloads.md to download glslc

/usr/local/bin/glslc shaders/simple_shader.vert -o shaders/simple_shader.vert.spv
/usr/local/bin/glslc shaders/simple_shader.frag -o shaders/simple_shader.frag.spv
# /usr/local/bin/glslc shaders/simple_shader.vert -o shaders/simple_shader.vert.spv
# /usr/local/bin/glslc shaders/simple_shader.frag -o shaders/simple_shader.frag.spv

# ./glslc shaders/simple_shader.vert -o shaders/simple_shader.vert.spv
# ./glslc shaders/simple_shader.frag -o shaders/simple_shader.frag.spv

# ./external/glslc/glslc shaders/simple_shader.vert -o shaders/simple_shader.vert.spv
# ./external/glslc/glslc shaders/simple_shader.frag -o shaders/simple_shader.frag.spv
./external/glslc/glslc shaders/simple_shader.vert -o shaders/simple_shader.vert.spv
./external/glslc/glslc shaders/simple_shader.frag -o shaders/simple_shader.frag.spv

# glslang -V shaders/simple_shader.vert -o shaders/simple_shader.vert.spv
# glslang -V shaders/simple_shader.frag -o shaders/simple_shader.frag.spv
2 changes: 2 additions & 0 deletions src/app/scenes/WorldScene.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include "WorldScene.hpp"
#include "logger.hpp"

#include <algorithm>

WorldScene::WorldScene()
{
}
Expand Down
4 changes: 4 additions & 0 deletions src/app/threads/render/RenderThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#include "logger.hpp"

#include <iostream>
#include <array>
#include <algorithm>

RenderThread::RenderThread(
const Settings & settings,
Expand All @@ -13,6 +15,8 @@ RenderThread::RenderThread(
vk(vulkanAPI),
m_world_scene(worldScene)
{
(void)m_settings;
(void)m_world_scene;
}

RenderThread::~RenderThread()
Expand Down
3 changes: 2 additions & 1 deletion src/app/threads/update/UpdateThread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ UpdateThread::UpdateThread(
m_start_time(start_time),
m_last_frame_time(start_time)
{
(void)m_start_time;
}

UpdateThread::~UpdateThread()
Expand Down Expand Up @@ -100,4 +101,4 @@ void UpdateThread::rotateCamera()
-y_offset * sensitivity
);
}
}
}
3 changes: 2 additions & 1 deletion src/app/vulkan/VulkanAPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <cstring>
#include <set>
#include <algorithm>

VulkanAPI::VulkanAPI(GLFWwindow * window):
window(window)
Expand Down Expand Up @@ -91,7 +92,7 @@ void VulkanAPI::createInstance()

create_info.enabledExtensionCount = static_cast<uint32_t>(extensions.size());
create_info.ppEnabledExtensionNames = extensions.data();

VkDebugUtilsMessengerCreateInfoEXT debug_create_info;
populateDebugMessengerCreateInfo(debug_create_info);
#ifndef NDEBUG
Expand Down

0 comments on commit 920f2c3

Please sign in to comment.