diff --git a/CMakePresets.json b/CMakePresets.json index 0380302..f2c9ce5 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -1,58 +1,80 @@ { - "version": 3, - "cmakeMinimumRequired": { - "major": 3, - "minor": 19, - "patch": 0 + "version": 3, + "cmakeMinimumRequired": { + "major": 3, + "minor": 19, + "patch": 0 + }, + "configurePresets": [ + { + "name": "release", + "displayName": "Release (no ASan)", + "description": "Release build without sanitizers", + "binaryDir": "${sourceDir}/build", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_INSTALL_PREFIX": "C:/Program Files/Seele" + } }, - "configurePresets": [ - { - "name": "release", - "displayName": "Release (no ASan)", - "description": "Release build without sanitizers", - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_INSTALL_PREFIX": "C:/Program Files/Seele" - } - }, - { - "name": "release-asan", - "displayName": "Release (ASan)", - "description": "Release build with Address Sanitizer", - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_CXX_FLAGS": "-fsanitize=address -fno-omit-frame-pointer", - "CMAKE_C_FLAGS": "-fsanitize=address -fno-omit-frame-pointer", - "CMAKE_EXE_LINKER_FLAGS": "-fsanitize=address", - "CMAKE_SHARED_LINKER_FLAGS": "-fsanitize=address", - "CMAKE_INSTALL_PREFIX": "C:/Program Files/Seele" - } - }, - { - "name": "debug", - "displayName": "Debug (no ASan)", - "description": "Debug build without sanitizers", - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_INSTALL_PREFIX": "C:/Program Files/Seele" - } - }, - { - "name": "debug-asan", - "displayName": "Debug (ASan)", - "description": "Debug build with Address Sanitizer", - "binaryDir": "${sourceDir}/build", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_CXX_FLAGS": "-fsanitize=address -fno-omit-frame-pointer", - "CMAKE_C_FLAGS": "-fsanitize=address -fno-omit-frame-pointer", - "CMAKE_EXE_LINKER_FLAGS": "-fsanitize=address", - "CMAKE_SHARED_LINKER_FLAGS": "-fsanitize=address", - "CMAKE_INSTALL_PREFIX": "C:/Program Files/Seele" - } - } - ] -} \ No newline at end of file + { + "name": "release-asan", + "displayName": "Release (ASan)", + "description": "Release build with Address Sanitizer", + "binaryDir": "${sourceDir}/build", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_CXX_FLAGS": "-fsanitize=address -fno-omit-frame-pointer", + "CMAKE_C_FLAGS": "-fsanitize=address -fno-omit-frame-pointer", + "CMAKE_EXE_LINKER_FLAGS": "-fsanitize=address", + "CMAKE_SHARED_LINKER_FLAGS": "-fsanitize=address", + "CMAKE_INSTALL_PREFIX": "C:/Program Files/Seele" + } + }, + { + "name": "debug", + "displayName": "Debug (no ASan)", + "description": "Debug build without sanitizers", + "binaryDir": "${sourceDir}/build", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_INSTALL_PREFIX": "C:/Program Files/Seele" + } + }, + { + "name": "debug-asan", + "displayName": "Debug (ASan)", + "description": "Debug build with Address Sanitizer", + "binaryDir": "${sourceDir}/build", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_CXX_FLAGS": "-fsanitize=address -fno-omit-frame-pointer", + "CMAKE_C_FLAGS": "-fsanitize=address -fno-omit-frame-pointer", + "CMAKE_EXE_LINKER_FLAGS": "-fsanitize=address", + "CMAKE_SHARED_LINKER_FLAGS": "-fsanitize=address", + "CMAKE_INSTALL_PREFIX": "C:/Program Files/Seele" + } + } + ], + "buildPresets": [ + { + "name": "release", + "displayName": "Release (no ASan)", + "configurePreset": "release" + }, + { + "name": "release-asan", + "displayName": "Release (ASan)", + "configurePreset": "release-asan" + }, + { + "name": "debug", + "displayName": "Debug (no ASan)", + "configurePreset": "debug" + }, + { + "name": "debug-asan", + "displayName": "Debug (ASan)", + "configurePreset": "debug-asan" + } + ] +} diff --git a/src/Engine/Graphics/Shader.h b/src/Engine/Graphics/Shader.h index 6b0c239..4cbdfb9 100644 --- a/src/Engine/Graphics/Shader.h +++ b/src/Engine/Graphics/Shader.h @@ -1,6 +1,5 @@ #pragma once #include "CRC.h" -#include "Enums.h" #include "Resources.h" #include "VertexData.h"