mirror of
https://github.com/kuhyx/engineer-thesis-WUT.git
synced 2026-07-04 14:43:10 +02:00
feat: fix wrong glfw include
This commit is contained in:
parent
d79b634e84
commit
1228e5d618
3
.vscode/c_cpp_properties.json
vendored
3
.vscode/c_cpp_properties.json
vendored
@ -1,6 +1,9 @@
|
||||
{
|
||||
"configurations": [
|
||||
{
|
||||
"defines":[
|
||||
"GLFW_INCLUDE_NONE"
|
||||
],
|
||||
"name": "linux-gcc-x64",
|
||||
"includePath": [
|
||||
"${workspaceFolder}/**",
|
||||
|
||||
3
.vscode/launch.json
vendored
3
.vscode/launch.json
vendored
@ -2,6 +2,9 @@
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"defines": [
|
||||
"GLFW_INCLUDE_NONE"
|
||||
],
|
||||
"name": "C/C++ Runner: Debug Session",
|
||||
"type": "cppdbg",
|
||||
"request": "launch",
|
||||
|
||||
11
.vscode/tasks.json
vendored
11
.vscode/tasks.json
vendored
@ -9,12 +9,17 @@
|
||||
"-std=c++2a",
|
||||
"-I${workspaceFolder}/dependencies/include",
|
||||
"-L${workspaceFolder}/dependencies/library",
|
||||
"-Wall",
|
||||
"${workspaceFolder}/Engine/engine/*.hpp",
|
||||
"-Wall",
|
||||
"${workspaceFolder}/Engine/engine/*.hpp",
|
||||
"${workspaceFolder}/Engine/engine/*.cpp",
|
||||
"${workspaceFolder}/Engine/engine/glad.c",
|
||||
"-o",
|
||||
"${workspaceFolder}/Engine/engine/match", "-lglut", "-lglfw", "-lGLU", "-lGL", "-lm",
|
||||
"${workspaceFolder}/Engine/engine/match",
|
||||
"-lglut",
|
||||
"-lglfw",
|
||||
"-lGLU",
|
||||
"-lGL",
|
||||
"-lm",
|
||||
"-ldl"
|
||||
],
|
||||
"options": {
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
#define BEFORE_RENDER_CPP
|
||||
#include "./beforeRender.hpp"
|
||||
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
// "Copyright [2023] <Krzysztof Rudnicki>"
|
||||
#ifndef ENGINE_ENGINE_BEFORERENDER_HPP_
|
||||
#define ENGINE_ENGINE_BEFORERENDER_HPP_
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
void configureGLFW(const int GLFWMajorVersion, const int GLFWMinorVersion);
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
// "Copyright [2023] <Krzysztof Rudnicki>"
|
||||
#ifndef ENGINE_ENGINE_CONSTANTS_HPP_
|
||||
#define ENGINE_ENGINE_CONSTANTS_HPP_
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
#define DRAW_CPP
|
||||
#include "./draw.hpp"
|
||||
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include <cmath>
|
||||
#include <filesystem>
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
// "Copyright [2023] <Krzysztof Rudnicki>"
|
||||
#ifndef ENGINE_ENGINE_DRAW_HPP_
|
||||
#define ENGINE_ENGINE_DRAW_HPP_
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
Binary file not shown.
@ -1,8 +1,8 @@
|
||||
// "Copyright [2023] <Krzysztof Rudnicki>"
|
||||
#ifndef MAIN_CPP
|
||||
#define MAIN_CPP
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <random>
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
#define RENDER_LOOP_CPP
|
||||
#include "./renderLoop.hpp"
|
||||
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
// "Copyright [2023] <Krzysztof Rudnicki>"
|
||||
#ifndef ENGINE_ENGINE_RENDERLOOP_HPP_
|
||||
#define ENGINE_ENGINE_RENDERLOOP_HPP_
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
#define SHADERS_CPP
|
||||
#include "./shaders.hpp"
|
||||
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include "./constants.hpp"
|
||||
#include "./misc.hpp"
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
// "Copyright [2023] <Krzysztof Rudnicki>"
|
||||
#ifndef ENGINE_ENGINE_SHADERS_HPP_
|
||||
#define ENGINE_ENGINE_SHADERS_HPP_
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <utility>
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
#define TEXTURES_CPP
|
||||
#include "textures.hpp"
|
||||
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include "stb_image.h"
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
// "Copyright [2023] <Krzysztof Rudnicki>"
|
||||
#ifndef TEXTURES_HPP
|
||||
#define TEXTURES_HPP
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user