diff --git a/config/Libraries.cmake b/config/Libraries.cmake index e04aa3575a34632eb75c929bf4640305cd93e298..ec014f84c820abf4988b070d5b733be08c377319 100644 --- a/config/Libraries.cmake +++ b/config/Libraries.cmake @@ -10,6 +10,8 @@ if(NOT WIN32) list(APPEND vkcv_flags -fopenmp) endif() +list(APPEND vkcv_definitions _USE_MATH_DEFINES) + # some formatted printing set(vkcv_config_msg " - Library: ") diff --git a/modules/camera/CMakeLists.txt b/modules/camera/CMakeLists.txt index 73f2dd1c81be9c6cadf563f7936bfaba8c1d0025..8fa7a9241b55f9c81c650ab9c7f3c63e04403efe 100644 --- a/modules/camera/CMakeLists.txt +++ b/modules/camera/CMakeLists.txt @@ -36,3 +36,4 @@ target_include_directories(vkcv_camera SYSTEM BEFORE PRIVATE ${vkcv_camera_inclu # add the own include directory for public headers target_include_directories(vkcv_camera BEFORE PUBLIC ${vkcv_camera_include} ${vkcv_camera_includes}) +target_compile_definitions(vkcv_camera PUBLIC ${vkcv_camera_defines}) diff --git a/modules/camera/config/GLM.cmake b/modules/camera/config/GLM.cmake index c4d14392ef0ea24243a45b19cd8583d90d3267be..ecf3a190e24d7bd9d6ce764a070a0d3c8424e9cf 100644 --- a/modules/camera/config/GLM.cmake +++ b/modules/camera/config/GLM.cmake @@ -9,6 +9,9 @@ else() add_subdirectory(${vkcv_camera_lib}/glm) 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) else() message(WARNING "GLM is required..! Update the submodules!") endif () diff --git a/modules/camera/include/vkcv/camera/Camera.hpp b/modules/camera/include/vkcv/camera/Camera.hpp index dc9f2dcb3038655f51fb2404abc21f98a2120399..ce32d3f8a0c6ee3e0dd882f24a9ac2d12c14a024 100644 --- a/modules/camera/include/vkcv/camera/Camera.hpp +++ b/modules/camera/include/vkcv/camera/Camera.hpp @@ -1,7 +1,5 @@ #pragma once -#define GLM_DEPTH_ZERO_TO_ONE -#define GLM_FORCE_LEFT_HANDED #include <glm/glm.hpp> #include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_access.hpp> diff --git a/modules/camera/src/vkcv/camera/Camera.cpp b/modules/camera/src/vkcv/camera/Camera.cpp index eb1857968b2284287691c6ed41ba168db30d3f84..18bf94463a0e2c4cb7d64526f4c30835cb451eb2 100644 --- a/modules/camera/src/vkcv/camera/Camera.cpp +++ b/modules/camera/src/vkcv/camera/Camera.cpp @@ -1,6 +1,5 @@ #include "vkcv/camera/Camera.hpp" -#define _USE_MATH_DEFINES #include <math.h> namespace vkcv::camera { diff --git a/modules/gui/CMakeLists.txt b/modules/gui/CMakeLists.txt index ce03f16e1f8d421f5b8e6c2fe913c0da04d34598..3b5202ccfe454f38745c53ac711cc05095ef88a1 100644 --- a/modules/gui/CMakeLists.txt +++ b/modules/gui/CMakeLists.txt @@ -32,3 +32,5 @@ target_include_directories(vkcv_gui SYSTEM BEFORE PRIVATE ${vkcv_gui_includes} $ # add the own include directory for public headers target_include_directories(vkcv_gui BEFORE PUBLIC ${vkcv_gui_include} ${vkcv_imgui_includes}) + +target_compile_definitions(vkcv_gui PUBLIC ${vkcv_gui_defines}) diff --git a/modules/gui/config/ImGui.cmake b/modules/gui/config/ImGui.cmake index da059ce47289cabdc0a8beab6bb404758b68627a..90cdafdeee355af9e63723632572799e135b04da 100644 --- a/modules/gui/config/ImGui.cmake +++ b/modules/gui/config/ImGui.cmake @@ -20,6 +20,8 @@ if (EXISTS "${vkcv_gui_lib_path}/imgui") list(APPEND vkcv_imgui_includes ${vkcv_gui_lib}/imgui/backend) list(APPEND vkcv_gui_include ${vkcv_gui_lib}) + + list(APPEND vkcv_gui_defines IMGUI_DISABLE_WIN32_FUNCTIONS=1) else() message(WARNING "IMGUI is required..! Update the submodules!") endif ()