diff options
author | Tiger Wang <ziwei.tiger@outlook.com> | 2020-05-16 21:59:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-16 21:59:10 +0200 |
commit | 9e8598fb1ca359143600d6bb2e8b317126a86bcc (patch) | |
tree | 677c51b708937ee8fbcdb2da8e180e874878d77a /Tools | |
parent | Travis: Fix ccache on debug builds (#4741) (diff) | |
download | cuberite-9e8598fb1ca359143600d6bb2e8b317126a86bcc.tar cuberite-9e8598fb1ca359143600d6bb2e8b317126a86bcc.tar.gz cuberite-9e8598fb1ca359143600d6bb2e8b317126a86bcc.tar.bz2 cuberite-9e8598fb1ca359143600d6bb2e8b317126a86bcc.tar.lz cuberite-9e8598fb1ca359143600d6bb2e8b317126a86bcc.tar.xz cuberite-9e8598fb1ca359143600d6bb2e8b317126a86bcc.tar.zst cuberite-9e8598fb1ca359143600d6bb2e8b317126a86bcc.zip |
Diffstat (limited to 'Tools')
-rw-r--r-- | Tools/ProtoProxy/CMakeLists.txt | 1 | ||||
-rw-r--r-- | Tools/QtBiomeVisualiser/Globals.h | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Tools/ProtoProxy/CMakeLists.txt b/Tools/ProtoProxy/CMakeLists.txt index b5b1365a2..e5c261bc8 100644 --- a/Tools/ProtoProxy/CMakeLists.txt +++ b/Tools/ProtoProxy/CMakeLists.txt @@ -21,7 +21,6 @@ function(flatten_files arg1) set(${arg1} "${res}" PARENT_SCOPE) endfunction() -include(../../lib/mbedtls.cmake) add_subdirectory(../../lib/zlib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/lib/zlib) set_exe_flags() diff --git a/Tools/QtBiomeVisualiser/Globals.h b/Tools/QtBiomeVisualiser/Globals.h index d908c0b2c..0b119fcb1 100644 --- a/Tools/QtBiomeVisualiser/Globals.h +++ b/Tools/QtBiomeVisualiser/Globals.h @@ -249,11 +249,6 @@ around it, "(32 KiB)") */ // Pretty much the same as ASSERT() but stays in Release builds #define VERIFY( x) ( !!(x) || ( LOGERROR("Verification failed: %s, file %s, line %i", #x, __FILE__, __LINE__), exit(1), 0)) -// Same as assert but in all Self test builds -#ifdef SELF_TEST - #define assert_test(x) ( !!(x) || (assert(!#x), exit(1), 0)) -#endif - // C++11 has std::shared_ptr in <memory>, included earlier #define SharedPtr std::shared_ptr |