Skip to content
Snippets Groups Projects
Verified Commit 94531e4b authored by Tobias Frisch's avatar Tobias Frisch
Browse files

[#85] Moved all defines out of the source code into cmake

parent 4d228e9f
No related branches found
No related tags found
1 merge request!73Resolve "MinGW - the messy compiler support"
Pipeline #26055 failed
find_package(glfw3 QUIET)
list(APPEND vkcv_definitions GLFW_INCLUDE_VULKAN)
if (glfw3_FOUND)
list(APPEND vkcv_libraries glfw)
......
......@@ -38,3 +38,5 @@ target_include_directories(vkcv_asset_loader SYSTEM BEFORE PRIVATE ${vkcv_asset_
# add the own include directory for public headers
target_include_directories(vkcv_asset_loader BEFORE PUBLIC ${vkcv_asset_loader_include})
target_compile_definitions(vkcv_asset_loader PUBLIC ${vkcv_asset_loader_definitions})
if (EXISTS "${vkcv_asset_loader_lib_path}/stb")
list(APPEND vkcv_asset_loader_includes ${vkcv_asset_loader_lib}/stb)
list(APPEND vkcv_asset_loader_definitions STB_IMAGE_IMPLEMENTATION)
list(APPEND vkcv_asset_loader_definitions STBI_ONLY_JPEG)
list(APPEND vkcv_asset_loader_definitions STBI_ONLY_PNG)
else()
message(WARNING "STB is required..! Update the submodules!")
endif ()
......@@ -3,9 +3,6 @@
#include <string.h> // memcpy(3)
#include <stdlib.h> // calloc(3)
#include <fx/gltf.h>
#define STB_IMAGE_IMPLEMENTATION
#define STBI_ONLY_JPEG
#define STBI_ONLY_PNG
#include <stb_image.h>
#include <vkcv/Logger.hpp>
#include <algorithm>
......
......@@ -10,8 +10,8 @@ else()
list(APPEND vkcv_camera_libraries glm)
list(APPEND vkcv_camera_defines GLM_DEPTH_ZERO_TO_ONE=1)
list(APPEND vkcv_camera_defines GLM_FORCE_LEFT_HANDED=1)
list(APPEND vkcv_camera_defines GLM_DEPTH_ZERO_TO_ONE)
list(APPEND vkcv_camera_defines GLM_FORCE_LEFT_HANDED)
else()
message(WARNING "GLM is required..! Update the submodules!")
endif ()
......
#include <vkcv/Swapchain.hpp>
#include <utility>
#define GLFW_INCLUDE_VULKAN
#include <GLFW/glfw3.h>
namespace vkcv
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment