Skip to content

/ Avocado

Permalink
Browse files
Loading status checks…

externals: Update submodules 

gui: fixes
  • Loading branch information
@JaCzekanski
JaCzekanski committed Dec 5, 2019
1 parent f50c582 commit fb7997fc163238eb70c4e46b255c543833a535d8
1 .clang-format
View file
@@ -8,3 +8,4 @@ AlignTrailingComments: true
BreakBeforeBinaryOperators: All
AlignOperands: true
AllowShortCaseLabelsOnASingleLine: true
SortIncludes: false
2 externals/EventBus
Submodule EventBus updated 7 files
+69 −19 .travis.yml
+1 −1 lib/CMakeLists.txt
+12 −3 lib/include/eventbus/AsyncEventBus.h
+16 −7 lib/src/eventbus/AsyncEventBus.cpp
+2 −1 performance/CMakeLists.txt
+1 −1 performance/benchmark
+0 −2 performance/src/EventBusPerformance.cpp
2 externals/catch
Submodule catch updated 314 files
2 externals/cereal
Submodule cereal updated 139 files
2 externals/filesystem
Submodule filesystem updated 13 files
+16 −0 .appveyor.yml
+29 −6 .travis.yml
+30 −24 CMakeLists.txt
+171 −41 README.md
+3 −1 cmake/GhcHelper.cmake
+17 −16 examples/dir.cpp
+6 −2 examples/du.cpp
+468 −239 include/ghc/filesystem.hpp
+7 −2 include/ghc/fs_std.hpp
+7 −2 include/ghc/fs_std_fwd.hpp
+7 −2 include/ghc/fs_std_impl.hpp
+30 −10 test/CMakeLists.txt
+257 −25 test/filesystem_test.cpp
2 externals/flac
Submodule flac updated 158 files
2 externals/fmt
Submodule fmt updated 51 files
+0 −39 .travis.yml
+8 −13 CMakeLists.txt
+268 −1 ChangeLog.rst
+26 −39 README.rst
+1 −1 doc/_templates/layout.html
+86 −29 doc/api.rst
+1 −1 doc/build.py
+20 −30 doc/index.rst
+9 −8 doc/syntax.rst
+11 −1 doc/usage.rst
+292 −18 include/fmt/chrono.h
+31 −46 include/fmt/color.h
+441 −320 include/fmt/compile.h
+175 −72 include/fmt/core.h
+633 −237 include/fmt/format-inl.h
+591 −597 include/fmt/format.h
+14 −9 include/fmt/ostream.h
+27 −17 include/fmt/posix.h
+14 −18 include/fmt/printf.h
+78 −1 include/fmt/ranges.h
+0 −293 include/fmt/safe-duration-cast.h
+17 −11 src/format.cc
+9 −5 src/posix.cc
+1 −1 support/Vagrantfile
+2 −2 support/cmake/fmt.pc.in
+25 −4 test/CMakeLists.txt
+11 −0 test/assert-test.cc
+3 −1 test/color-test.cc
+31 −228 test/compile-test.cc
+29 −17 test/core-test.cc
+73 −0 test/cuda-test/CMakeLists.txt
+11 −0 test/cuda-test/cpp14.cc
+28 −0 test/cuda-test/cuda-cpp14.cu
+2 −2 test/custom-formatter-test.cc
+5 −5 test/format
+229 −41 test/format-impl-test.cc
+169 −62 test/format-test.cc
+19 −1 test/grisu-test.cc
+28 −26 test/gtest-extra-test.cc
+2 −2 test/gtest-extra.cc
+5 −12 test/gtest-extra.h
+50 −13 test/locale-test.cc
+41 −5 test/ostream-test.cc
+4 −1 test/posix-mock-test.cc
+4 −6 test/posix-test.cc
+21 −20 test/printf-test.cc
+36 −4 test/ranges-test.cc
+2 −1 test/scan.h
+4 −8 test/std-format-test.cc
+5 −0 test/test-assert.h
+6 −0 test/util.cc
2 externals/glm
Submodule glm updated 1248 files
2 externals/imgui
Submodule imgui updated 71 files
+30 −0 .gitattributes
+6 −6 .github/issue_template.md
+0 −0 .github/pull_request_template.md
+241 −0 .github/workflows/build.yml
+0 −34 .travis.yml
+77 −4 docs/CHANGELOG.txt
+536 −0 docs/FAQ.md
+87 −78 docs/FONTS.txt
+50 −145 docs/README.md
+6 −4 docs/TODO.txt
+4 −0 examples/.gitignore
+25 −9 examples/README.txt
+4 −2 examples/example_allegro5/README.md
+1 −1 examples/example_allegro5/main.cpp
+1 −1 examples/example_apple_opengl2/main.mm
+5 −2 examples/example_emscripten/Makefile
+7 −3 examples/example_emscripten/README.md
+1 −1 examples/example_emscripten/main.cpp
+1 −1 examples/example_glfw_metal/main.mm
+3 −3 examples/example_glfw_opengl2/main.cpp
+1 −1 examples/example_glfw_opengl3/main.cpp
+3 −3 examples/example_glfw_vulkan/main.cpp
+1 −1 examples/example_glut_opengl2/main.cpp
+1 −1 examples/example_marmalade/main.cpp
+15 −0 examples/example_null/Makefile
+180 −180 examples/example_sdl_directx11/example_sdl_directx11.vcxproj
+56 −56 examples/example_sdl_directx11/example_sdl_directx11.vcxproj.filters
+3 −1 examples/example_sdl_directx11/main.cpp
+3 −1 examples/example_sdl_opengl2/main.cpp
+3 −1 examples/example_sdl_opengl3/main.cpp
+3 −3 examples/example_sdl_vulkan/main.cpp
+1 −1 examples/example_win32_directx10/main.cpp
+1 −1 examples/example_win32_directx11/main.cpp
+23 −10 examples/example_win32_directx12/main.cpp
+1 −1 examples/example_win32_directx9/main.cpp
+4 −4 examples/imgui_impl_allegro5.cpp
+1 −1 examples/imgui_impl_allegro5.h
+2 −2 examples/imgui_impl_dx10.cpp
+2 −2 examples/imgui_impl_dx10.h
+2 −2 examples/imgui_impl_dx11.cpp
+2 −2 examples/imgui_impl_dx11.h
+26 −14 examples/imgui_impl_dx12.cpp
+4 −3 examples/imgui_impl_dx12.h
+2 −2 examples/imgui_impl_dx9.cpp
+2 −2 examples/imgui_impl_dx9.h
+13 −1 examples/imgui_impl_glfw.cpp
+1 −1 examples/imgui_impl_marmalade.cpp
+1 −1 examples/imgui_impl_marmalade.h
+2 −2 examples/imgui_impl_metal.h
+2 −2 examples/imgui_impl_metal.mm
+2 −2 examples/imgui_impl_opengl2.cpp
+1 −1 examples/imgui_impl_opengl2.h
+36 −21 examples/imgui_impl_opengl3.cpp
+4 −4 examples/imgui_impl_opengl3.h
+1 −1 examples/imgui_impl_osx.h
+13 −9 examples/imgui_impl_osx.mm
+1 −1 examples/imgui_impl_sdl.cpp
+2 −2 examples/imgui_impl_vulkan.cpp
+5 −5 examples/imgui_impl_vulkan.h
+636 −636 examples/libs/usynergy/uSynergy.c
+7 −6 imconfig.h
+530 −555 imgui.cpp
+74 −71 imgui.h
+215 −118 imgui_demo.cpp
+24 −24 imgui_draw.cpp
+213 −106 imgui_internal.h
+261 −224 imgui_widgets.cpp
+1 −1 imstb_textedit.h
+1 −1 imstb_truetype.h
+3 −2 misc/fonts/binary_to_compressed_c.cpp
+2 −2 misc/freetype/imgui_freetype.cpp
2 externals/json
Submodule json updated 231 files
2 externals/magic_enum
Submodule magic_enum updated 12 files
+2 −5 .appveyor.yml
+1 −0 .gitignore
+27 −9 .travis.yml
+1 −1 CMakeLists.txt
+15 −86 README.md
+1 −1 conanfile.py
+70 −0 doc/limitations.md
+295 −0 doc/reference.md
+1 −6 example/example.cpp
+288 −224 include/magic_enum.hpp
+3,125 −767 test/3rdparty/Catch2/catch.hpp
+203 −37 test/test.cpp
24 externals/miniz/miniz.c 100755 → 100644
View file
@@ -1,3 +1,4 @@
#include "miniz.h"
/**************************************************************************
*
* Copyright 2013-2014 RAD Game Tools and Valve Software
@@ -24,7 +25,7 @@
*
**************************************************************************/

#include "miniz.h"


typedef unsigned char mz_validate_uint16[sizeof(mz_uint16) == 2 ? 1 : -1];
typedef unsigned char mz_validate_uint32[sizeof(mz_uint32) == 4 ? 1 : -1];
@@ -82,6 +83,12 @@ mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len)
}
return ~crcu32;
}
#elif defined(USE_EXTERNAL_MZCRC)
/* If USE_EXTERNAL_CRC is defined, an external module will export the
* mz_crc32() symbol for us to use, e.g. an SSE-accelerated version.
* Depending on the impl, it may be necessary to ~ the input/output crc values.
*/
mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len);
#else
/* Faster, but larger CPU cache footprint.
*/
@@ -157,17 +164,17 @@ void mz_free(void *p)
MZ_FREE(p);
}

void *miniz_def_alloc_func(void *opaque, size_t items, size_t size)
MINIZ_EXPORT void *miniz_def_alloc_func(void *opaque, size_t items, size_t size)
{
(void)opaque, (void)items, (void)size;
return MZ_MALLOC(items * size);
}
void miniz_def_free_func(void *opaque, void *address)
MINIZ_EXPORT void miniz_def_free_func(void *opaque, void *address)
{
(void)opaque, (void)address;
MZ_FREE(address);
}
void *miniz_def_realloc_func(void *opaque, void *address, size_t items, size_t size)
MINIZ_EXPORT void *miniz_def_realloc_func(void *opaque, void *address, size_t items, size_t size)
{
(void)opaque, (void)address, (void)items, (void)size;
return MZ_REALLOC(address, items * size);
@@ -654,7 +661,6 @@ const char *mz_error(int err)




#ifdef __cplusplus
extern "C" {
#endif
@@ -2205,7 +2211,7 @@ void tdefl_compressor_free(tdefl_compressor *pComp)
#ifdef __cplusplus
}
#endif
/**************************************************************************
/**************************************************************************
*
* Copyright 2013-2014 RAD Game Tools and Valve Software
* Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
@@ -2945,7 +2951,7 @@ void tinfl_decompressor_free(tinfl_decompressor *pDecomp)
#ifdef __cplusplus
}
#endif
/**************************************************************************
/**************************************************************************
*
* Copyright 2013-2014 RAD Game Tools and Valve Software
* Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
@@ -3044,7 +3050,7 @@ static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream)
#define MZ_FFLUSH fflush
#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
#define MZ_DELETE_FILE remove
#elif defined(__GNUC__) && defined(_LARGEFILE64_SOURCE)
#elif defined(__USE_LARGEFILE64) // gcc, clang
#ifndef MINIZ_NO_TIME
#include <utime.h>
#endif
@@ -4888,7 +4894,7 @@ mz_zip_reader_extract_iter_state* mz_zip_reader_extract_iter_new(mz_zip_archive
if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method)))
{
/* Decompression required, therefore intermediate read buffer required */
pState->read_buf_size = MZ_MIN(pState->file_stat.m_comp_size, MZ_ZIP_MAX_IO_BUF_SIZE);
pState->read_buf_size = MZ_MIN(pState->file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
if (NULL == (pState->pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)pState->read_buf_size)))
{
mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);

0 comments on commit fb7997f

Please sign in to comment.
You can’t perform that action at this time.