From 2b8a31ff7cc495b756cd98954043405f3292e77c Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 12 Jul 2024 16:05:00 +0200 Subject: [PATCH] fixes after re-structure --- auth/Auth.h | 2 +- database/Database.h | 6 +++--- database/DatabaseConnection.h | 6 +++--- database/DatabaseType.h | 4 ++-- gpuapi/direct3d/UtilsDirect3d.h | 4 ++-- gpuapi/opengl/UtilsOpengl.h | 6 +++--- models/Attrib.h | 2 +- platform/win32/audio/XAudio2.h | 1 - 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/auth/Auth.h b/auth/Auth.h index 14e4969..c757415 100644 --- a/auth/Auth.h +++ b/auth/Auth.h @@ -13,7 +13,7 @@ #include #include -#include "../lib/curl/include/curl/curl.h" +#include "../../EngineDependencies/curl/include/curl/curl.h" #include "../utils/MathUtils.h" #define MAX_AUTH_POST_LENGTH 1024 diff --git a/database/Database.h b/database/Database.h index 3cf5e95..9b442c6 100644 --- a/database/Database.h +++ b/database/Database.h @@ -6,11 +6,11 @@ * @version 1.0.0 * @link https://jingga.app */ -#ifndef TOS_DATABASE -#define TOS_DATABASE +#ifndef TOS_DATABASE_H +#define TOS_DATABASE_H #include "../stdlib/Types.h" -#include "../lib/sqlite/src/sqlite3.h" +#include "../../EngineDependencies/sqlite/src/sqlite3.h" #include "DatabaseType.h" #include "DatabaseConnection.h" diff --git a/database/DatabaseConnection.h b/database/DatabaseConnection.h index 898cb6e..3de6947 100644 --- a/database/DatabaseConnection.h +++ b/database/DatabaseConnection.h @@ -6,11 +6,11 @@ * @version 1.0.0 * @link https://jingga.app */ -#ifndef TOS_DATABASE_CONNECTION -#define TOS_DATABASE_CONNECTION +#ifndef TOS_DATABASE_CONNECTION_H +#define TOS_DATABASE_CONNECTION_H #include "../stdlib/Types.h" -#include "../lib/sqlite/src/sqlite3.h" +#include "../../EngineDependencies/sqlite/src/sqlite3.h" #include "DatabaseType.h" diff --git a/database/DatabaseType.h b/database/DatabaseType.h index bfea785..3a51b03 100644 --- a/database/DatabaseType.h +++ b/database/DatabaseType.h @@ -6,8 +6,8 @@ * @version 1.0.0 * @link https://jingga.app */ -#ifndef TOS_DATABASE_TYPE -#define TOS_DATABASE_TYPE +#ifndef TOS_DATABASE_TYPE_H +#define TOS_DATABASE_TYPE_H enum DatabaseType { DB_TYPE_SQLITE, diff --git a/gpuapi/direct3d/UtilsDirect3d.h b/gpuapi/direct3d/UtilsDirect3d.h index 8ccecbb..e6c71ba 100644 --- a/gpuapi/direct3d/UtilsDirect3d.h +++ b/gpuapi/direct3d/UtilsDirect3d.h @@ -13,8 +13,8 @@ #include #include -#include "../../lib/directx/d3d12.h" -#include "../../lib/directx/d3dx12.h" +#include "../../../EngineDependencies/directx/d3d12.h" +#include "../../../EngineDependencies/directx/d3dx12.h" #include "../../stdlib/Types.h" diff --git a/gpuapi/opengl/UtilsOpengl.h b/gpuapi/opengl/UtilsOpengl.h index 2a25066..e087636 100644 --- a/gpuapi/opengl/UtilsOpengl.h +++ b/gpuapi/opengl/UtilsOpengl.h @@ -14,11 +14,11 @@ #include "../../models/Attrib.h" #include "../../models/Texture.h" -#include "../../lib/opengl/glew/include/GL/glew.h" -#include "../../lib/opengl/glfw/include/glfw3.h" +#include "../../../EngineDependencies/opengl/glew/include/GL/glew.h" +#include "../../../EngineDependencies/opengl/glfw/include/glfw3.h" #if GLFW_EXPOSE_NATIVE_WIN32 - #include "../../lib/opengl/glfw/include/glfw3native.h" + #include "../../../EngineDependencies/opengl/glfw/include/glfw3native.h" #endif #ifdef _WIN32 diff --git a/models/Attrib.h b/models/Attrib.h index ffca9ab..88de5c1 100644 --- a/models/Attrib.h +++ b/models/Attrib.h @@ -10,7 +10,7 @@ #define TOS_ATTRIB_H #if OPENGL - #include "../lib/opengl/glew/include/GL/glew.h" + #include "../../EngineDependencies/opengl/glew/include/GL/glew.h" struct Attrib { GLuint program; diff --git a/platform/win32/audio/XAudio2.h b/platform/win32/audio/XAudio2.h index c43717f..d8f0fd2 100644 --- a/platform/win32/audio/XAudio2.h +++ b/platform/win32/audio/XAudio2.h @@ -1,7 +1,6 @@ /** * Jingga * - * @package Stdlib * @copyright Jingga * @license OMS License 2.0 * @version 1.0.0