diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2018-01-03 18:41:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 18:41:16 +0100 |
| commit | 757231cc6e777b8f4717d1467ef7efa01c7fde15 (patch) | |
| tree | 6d1021761ad1c492700fe17560cb79520e508d60 /Tools/MCADefrag | |
| parent | Concrete mixing (#4096) (diff) | |
| download | cuberite-757231cc6e777b8f4717d1467ef7efa01c7fde15.tar cuberite-757231cc6e777b8f4717d1467ef7efa01c7fde15.tar.gz cuberite-757231cc6e777b8f4717d1467ef7efa01c7fde15.tar.bz2 cuberite-757231cc6e777b8f4717d1467ef7efa01c7fde15.tar.lz cuberite-757231cc6e777b8f4717d1467ef7efa01c7fde15.tar.xz cuberite-757231cc6e777b8f4717d1467ef7efa01c7fde15.tar.zst cuberite-757231cc6e777b8f4717d1467ef7efa01c7fde15.zip | |
Diffstat (limited to '')
| -rw-r--r-- | Tools/MCADefrag/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tools/MCADefrag/Globals.h | 16 | ||||
| -rw-r--r-- | Tools/MCADefrag/MCADefrag.cpp | 1 |
3 files changed, 4 insertions, 16 deletions
diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt index 42d6f7381..3243bf1eb 100644 --- a/Tools/MCADefrag/CMakeLists.txt +++ b/Tools/MCADefrag/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.0.2) project (MCADefrag) # Without this, the MSVC variable isn't defined for MSVC builds ( https://www.cmake.org/pipermail/cmake/2011-November/047130.html ) @@ -92,4 +93,4 @@ add_executable(MCADefrag ${SHARED_OSS_HDR} ) -target_link_libraries(MCADefrag zlib) +target_link_libraries(MCADefrag zlib fmt::fmt) diff --git a/Tools/MCADefrag/Globals.h b/Tools/MCADefrag/Globals.h index 4fe9db648..f8fd68b6a 100644 --- a/Tools/MCADefrag/Globals.h +++ b/Tools/MCADefrag/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 @@ -190,6 +175,7 @@ typedef unsigned char Byte; // Common headers (without macros): +#include "fmt/format.h" #include "StringUtils.h" #include "OSSupport/CriticalSection.h" #include "OSSupport/Event.h" diff --git a/Tools/MCADefrag/MCADefrag.cpp b/Tools/MCADefrag/MCADefrag.cpp index 82f5ab807..c7886da35 100644 --- a/Tools/MCADefrag/MCADefrag.cpp +++ b/Tools/MCADefrag/MCADefrag.cpp @@ -6,6 +6,7 @@ #include "Globals.h" #include "MCADefrag.h" #include "Logger.h" +#include "LoggerSimple.h" #include "LoggerListeners.h" #include "zlib/zlib.h" |