Skip to content

Commit c7bdd2a

Browse files
Merge pull request #805 from Devsh-Graphics-Programming/preprocessor_tweaks
Preprocessor tweaks
2 parents ce9ca3d + 78fe62a commit c7bdd2a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

cmake/adjust/template/windows/msvc.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ if(NBL_REQUEST_SSE_AXV2)
1212
NBL_REQUEST_COMPILE_OPTION_SUPPORT("/arch:AVX2")
1313
endif()
1414

15+
NBL_REQUEST_COMPILE_OPTION_SUPPORT(/Zc:preprocessor)
16+
1517
# Debug
1618
set(NBL_C_DEBUG_COMPILE_OPTIONS
1719
/Ob0 /Od /MP${_NBL_JOBS_AMOUNT_} /fp:fast /Zc:wchar_t /INCREMENTAL

include/nbl/logging_macros.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
#elif !defined(_GIT_INFO_H_INCLUDED_)
44
#error logging macros require git meta info, include "git_info.h"
55
#else
6-
#define NBL_LOG(SEVERITY, FORMAT, ...) NBL_LOG_FUNCTION(FORMAT" [%s][%s - %s:%d]", SEVERITY, __VA_ARGS__, nbl::gtml::nabla_git_info.commitShortHash, __FUNCTION__, __FILE__, __LINE__);
7-
#define NBL_LOG_ERROR(FORMAT, ...) NBL_LOG(nbl::system::ILogger::ELL_ERROR, FORMAT, __VA_ARGS__)
6+
#define NBL_LOG(SEVERITY, FORMAT, ...) NBL_LOG_FUNCTION(FORMAT" [%s][%s - %s:%d]", SEVERITY __VA_OPT__(,) __VA_ARGS__, nbl::gtml::nabla_git_info.commitShortHash, __FUNCTION__, __FILE__, __LINE__);
7+
#define NBL_LOG_ERROR(FORMAT, ...) NBL_LOG(nbl::system::ILogger::ELL_ERROR, FORMAT __VA_OPT__(,) __VA_ARGS__)
88
#endif

0 commit comments

Comments
 (0)