diff options
Diffstat (limited to 'Tools/NoiseSpeedTest')
| -rw-r--r-- | Tools/NoiseSpeedTest/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tools/NoiseSpeedTest/Globals.h | 16 |
2 files changed, 4 insertions, 15 deletions
diff --git a/Tools/NoiseSpeedTest/CMakeLists.txt b/Tools/NoiseSpeedTest/CMakeLists.txt index 1dca070da..86d153e2e 100644 --- a/Tools/NoiseSpeedTest/CMakeLists.txt +++ b/Tools/NoiseSpeedTest/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.0.2) project (NoiseSpeedTest) include(../../SetFlags.cmake) @@ -60,6 +61,8 @@ add_executable(NoiseSpeedTest ${SHARED_HDR} ) +target_link_libraries(NoiseSpeedTest fmt::fmt) + set_target_properties( NoiseSpeedTest PROPERTIES FOLDER Tools diff --git a/Tools/NoiseSpeedTest/Globals.h b/Tools/NoiseSpeedTest/Globals.h index f332942ae..b6b7a4af3 100644 --- a/Tools/NoiseSpeedTest/Globals.h +++ b/Tools/NoiseSpeedTest/Globals.h @@ -22,13 +22,6 @@ #define ALIGN_8 #define ALIGN_16 - #define FORMATSTRING(formatIndex, va_argsIndex) - - // MSVC has its own custom version of zu format - #define SIZE_T_FMT "%Iu" - #define SIZE_T_FMT_PRECISION(x) "%" #x "Iu" - #define SIZE_T_FMT_HEX "%Ix" - #define NORETURN __declspec(noreturn) #elif defined(__GNUC__) @@ -44,12 +37,6 @@ // Some portability macros :) #define stricmp strcasecmp - #define FORMATSTRING(formatIndex, va_argsIndex) - - #define SIZE_T_FMT "%zu" - #define SIZE_T_FMT_PRECISION(x) "%" #x "zu" - #define SIZE_T_FMT_HEX "%zx" - #define NORETURN __attribute((__noreturn__)) #else @@ -69,8 +56,6 @@ #define ALIGN_16 */ - #define FORMATSTRING(formatIndex, va_argsIndex) __attribute__((format (printf, formatIndex, va_argsIndex))) - #endif @@ -191,6 +176,7 @@ typedef unsigned char Byte; // Common headers (without macros): +#include "fmt/format.h" #include "StringUtils.h" #include "OSSupport/CriticalSection.h" #include "OSSupport/Event.h" |