External: Upgrade googletest, openal-soft, freetype, cxxopts, ogg, vo…

…rbis, nanosvg, scope-lite and rapidjson
gongminmin · Jan 22, 2024 · baab148 · baab148
1 parent 67a3afd
commit baab148
Show file tree

Hide file tree

Showing 24 changed files with 86 additions and 92 deletions.
diff --git a/Build.py b/Build.py
@@ -952,8 +952,8 @@ def BuildProjects(build_info, compiler_info, project_list, additional_options =
 	if (len(sys.argv) > 1) and (sys.argv[1].lower() == "clean"):
 		clean_dir_list = ["7z/7z", "7z/7zxa", "android_native_app_glue/android_native_app_glue", "assimp/assimp", "boost/assert", "boost/config", "boost/core", "boost/static_assert", "boost/throw_exception",
 			"cxxopts/cxxopts", "d3dcompiler/d3dcompiler", "DirectX-Headers/DirectX-Headers", "dxsdk/dxsdk", "fmt/fmt", "FreeImage/FreeImage", "freetype/freetype", "googletest/googletest",
-			"libogg/libogg", "libvorbis/libvorbis", "NanoRtti/NanoRtti", "nanosvg/nanosvg", "openal-soft/openal-soft", "Python/cpython", "Python/python-cmake-buildsystem", "rapidjson/rapidjson", "rapidxml/rapidxml",
-			"scope-lite/scope-lite", "wpftoolkit/wpftoolkit", "zlib/zlib"]
+			"NanoRtti/NanoRtti", "nanosvg/nanosvg", "ogg/ogg", "openal-soft/openal-soft", "Python/cpython", "Python/python-cmake-buildsystem", "rapidjson/rapidjson", "rapidxml/rapidxml",
+			"scope-lite/scope-lite", "vorbis/vorbis", "wpftoolkit/wpftoolkit", "zlib/zlib"]
 		for dir in clean_dir_list:
 			dir_name = Path("Externals/").joinpath(dir)
 			if dir_name.is_dir():

diff --git a/Build/CMake/Modules/Dependencies.cmake b/Build/CMake/Modules/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(DEPENDENCIES_COMMIT_ID "483ba8da8b2e693dcc3c9056e57a2d4b1ace562f")
+SET(DEPENDENCIES_COMMIT_ID "f0e46c830b1b04d4527f410e92ca193e67dd50ef")
 
 FUNCTION(DOWNLOAD_DEPENDENCY RELATIVE_PATH FILE_ID)
 	SET(DEST ${KLAYGE_ROOT_DIR}/${RELATIVE_PATH})

diff --git a/Externals/.gitignore b/Externals/.gitignore
@@ -14,15 +14,15 @@ fmt/fmt
 FreeImage/FreeImage
 freetype/freetype
 googletest/googletest
-libogg/libogg
-libvorbis/libvorbis
 NanoRtti/NanoRtti
 nanosvg/nanosvg
+ogg/ogg
 openal-soft/openal-soft
 Python/cpython
 Python/python-cmake-buildsystem
 rapidjson/rapidjson
 rapidxml/rapidxml
 scope-lite/scope-lite
+vorbis/vorbis
 wpftoolkit/wpftoolkit
 zlib/zlib
diff --git a/Externals/CMakeLists.txt b/Externals/CMakeLists.txt
@@ -119,12 +119,12 @@ add_subdirectory(Python)
 add_subdirectory(7z)
 add_subdirectory(boost)
 add_subdirectory(fmt)
-add_subdirectory(libogg)
-add_subdirectory(libvorbis)
 add_subdirectory(NanoRtti)
+add_subdirectory(ogg)
 add_subdirectory(rapidjson)
 add_subdirectory(rapidxml)
 add_subdirectory(scope-lite)
+add_subdirectory(vorbis)
 if(KLAYGE_IS_DEV_PLATFORM)
 	add_subdirectory(assimp)
 	add_subdirectory(cxxopts)

diff --git a/Externals/cxxopts/CMakeLists.txt b/Externals/cxxopts/CMakeLists.txt
@@ -1,6 +1,8 @@
-UpdateExternalLib("cxxopts" "https://github.com/jarro2783/cxxopts.git" "302302b30839505703d37fb82f536c53cf9172fa")
+UpdateExternalLib("cxxopts" "https://github.com/jarro2783/cxxopts.git" "eb787304d67ec22f7c3a184ee8b4c481d04357fd")
 
 set(CXXOPTS_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 set(CXXOPTS_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(CXXOPTS_ENABLE_INSTALL OFF CACHE BOOL "" FORCE)
+set(CXXOPTS_USE_UNICODE_HELP OFF CACHE BOOL "" FORCE)
 
-add_subdirectory(cxxopts)
+add_subdirectory(cxxopts EXCLUDE_FROM_ALL)
diff --git a/Externals/freetype/CMakeLists.txt b/Externals/freetype/CMakeLists.txt
@@ -1,4 +1,4 @@
-UpdateExternalLib("freetype" "https://git.savannah.nongnu.org/r/freetype/freetype2.git/" "6a2b3e4007e794bfc6c91030d0ed987f925164a8")
+UpdateExternalLib("freetype" "https://git.savannah.nongnu.org/r/freetype/freetype2.git/" "920c5502cc3ddda88f6c7d85ee834ac611bb11cc")
 
 SET(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 set(SKIP_INSTALL_ALL ON CACHE BOOL "" FORCE)
@@ -12,7 +12,7 @@ SET(CMAKE_DISABLE_FIND_PACKAGE_BZip2 TRUE CACHE BOOL "" FORCE)
 SET(CMAKE_DISABLE_FIND_PACKAGE_PNG TRUE CACHE BOOL "" FORCE)
 SET(CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz TRUE CACHE BOOL "" FORCE)
 
-ADD_SUBDIRECTORY(freetype)
+add_subdirectory(freetype EXCLUDE_FROM_ALL)
 
 if(KLAYGE_COMPILER_CLANGCL)
 	target_compile_options(freetype

diff --git a/Externals/googletest/CMakeLists.txt b/Externals/googletest/CMakeLists.txt
@@ -1,12 +1,12 @@
-UpdateExternalLib("googletest" "https://github.com/google/googletest.git" "e649993a402d96afe25fbf3413749adf0f2947f6")
+UpdateExternalLib("googletest" "https://github.com/google/googletest.git" "f8d7d77c06936315286eb55f8de22cd23c188571")
 
 set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
 set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
 set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 set(gtest_disable_pthreads ON CACHE BOOL "" FORCE)
 set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 
-ADD_SUBDIRECTORY(googletest)
+add_subdirectory(googletest EXCLUDE_FROM_ALL)
 
 SET_TARGET_PROPERTIES(gtest PROPERTIES
 	FOLDER "Externals/googletest"

diff --git a/Externals/libogg/CMakeLists.txt b/Externals/libogg/CMakeLists.txt
diff --git a/Externals/libvorbis/CMakeLists.txt b/Externals/libvorbis/CMakeLists.txt
diff --git a/Externals/nanosvg/CMakeLists.txt b/Externals/nanosvg/CMakeLists.txt
@@ -1,4 +1,4 @@
-UpdateExternalLib("nanosvg" "https://github.com/memononen/nanosvg.git" "3e403ec72a9145cbbcc6c63d94a4caf079aafec2")
+UpdateExternalLib("nanosvg" "https://github.com/memononen/nanosvg.git" "93ce879dc4c04a3ef1758428ec80083c38610b1f")
 
 add_library(nanosvg INTERFACE)
 target_include_directories(nanosvg

diff --git a/Externals/ogg/CMakeLists.txt b/Externals/ogg/CMakeLists.txt
@@ -0,0 +1,14 @@
+UpdateExternalLib("ogg" "https://github.com/xiph/ogg.git" "e1774cd77f471443541596e09078e78fdc342e4f")
+
+SET(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+SET(BUILD_TESTING OFF CACHE BOOL "" FORCE)
+SET(BUILD_FRAMEWORK OFF CACHE BOOL "" FORCE)
+set(INSTALL_DOCS OFF CACHE BOOL "" FORCE)
+set(INSTALL_PKG_CONFIG_MODUL OFF CACHE BOOL "" FORCE)
+set(INSTALL_CMAKE_PACKAGE_MODULE OFF CACHE BOOL "" FORCE)
+
+add_subdirectory(ogg EXCLUDE_FROM_ALL)
+
+SET_TARGET_PROPERTIES(ogg PROPERTIES
+	FOLDER "Externals/ogg"
+)
diff --git a/Externals/openal-soft/CMakeLists.txt b/Externals/openal-soft/CMakeLists.txt
@@ -1,4 +1,4 @@
-UpdateExternalLib("openal-soft" "https://github.com/kcat/openal-soft.git" "c0cbe602ce66481a822ba16856052a47154f5cc5")
+UpdateExternalLib("openal-soft" "https://github.com/kcat/openal-soft.git" "d3875f333fb6abe2f39d82caca329414871ae53b")
 
 if(KLAYGE_PLATFORM_WINDOWS)
 	if(KLAYGE_PLATFORM_WINDOWS_DESKTOP)
@@ -29,6 +29,7 @@ set(ALSOFT_INSTALL_CONFIG OFF CACHE BOOL "" FORCE)
 set(ALSOFT_INSTALL_HRTF_DEFS OFF CACHE BOOL "" FORCE)
 set(ALSOFT_INSTALL_AMBDEC_PRESETS OFF CACHE BOOL "" FORCE)
 set(ALSOFT_EMBED_HRTF_DATA ON CACHE BOOL "" FORCE)
+set(ALSOFT_UPDATE_BUILD_VERSION OFF CACHE BOOL "" FORCE)
 
 if(KLAYGE_COMPILER_MSVC)
 	set(HAVE___RESTRICT FALSE)
@@ -51,7 +52,7 @@ if(KLAYGE_PLATFORM_ANDROID OR KLAYGE_PLATFORM_IOS)
 	set(LIBTYPE "STATIC")
 endif()
 
-add_subdirectory(openal-soft)
+add_subdirectory(openal-soft EXCLUDE_FROM_ALL)
 
 if(KLAYGE_COMPILER_CLANGCL)
 	target_compile_options(OpenAL
@@ -89,4 +90,4 @@ set_target_properties(OpenAL PROPERTIES
 	PREFIX "${prefix}"
 )
 
-set_target_properties("build_version" "common" "OpenAL" PROPERTIES FOLDER "Externals/openal-soft")
+set_target_properties("common" "OpenAL" PROPERTIES FOLDER "Externals/openal-soft")
diff --git a/Externals/rapidjson/CMakeLists.txt b/Externals/rapidjson/CMakeLists.txt
@@ -1,4 +1,4 @@
-UpdateExternalLib("rapidjson" "https://github.com/Tencent/rapidjson.git" "0ccdbf364c577803e2a751f5aededce935314313")
+UpdateExternalLib("rapidjson" "https://github.com/Tencent/rapidjson.git" "6089180ecb704cb2b136777798fa1be303618975")
 
 add_library(rapidjson INTERFACE)
 target_include_directories(rapidjson

diff --git a/Externals/scope-lite/CMakeLists.txt b/Externals/scope-lite/CMakeLists.txt
@@ -1,8 +1,8 @@
-UpdateExternalLib("scope-lite" "https://github.com/martinmoene/scope-lite.git" "9adce0d39e0e0d3f3d370a523cb33a057af8c91c")
+UpdateExternalLib("scope-lite" "https://github.com/martinmoene/scope-lite.git" "59ecb62742d371d9347a2c2c6b0baeb98d683b6d")
 
 set(SCOPE_LITE_OPT_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 set(SCOPE_LITE_OPT_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(SCOPE_LITE_OPT_SELECT_NONSTD ON CACHE BOOL "" FORCE)
 set(SCOPE_LITE_OPT_SELECT_STD OFF CACHE BOOL "" FORCE)
 
-add_subdirectory(scope-lite)
+add_subdirectory(scope-lite EXCLUDE_FROM_ALL)
diff --git a/Externals/vorbis/CMakeLists.txt b/Externals/vorbis/CMakeLists.txt
@@ -0,0 +1,15 @@
+UpdateExternalLib("vorbis" "https://github.com/xiph/vorbis.git" "0657aee69dec8508a0011f47f3b69d7538e9d262")
+
+SET(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+SET(BUILD_FRAMEWORK OFF CACHE BOOL "" FORCE)
+set(INSTALL_CMAKE_PACKAGE_MODULE OFF CACHE BOOL "" FORCE)
+
+# To make libvorbis enable to find libogg
+set(CMAKE_DISABLE_FIND_PACKAGE_Ogg FALSE CACHE BOOL "" FORCE)
+set(OGG_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../ogg/ogg/include")
+set(OGG_LIBRARY ogg)
+add_library(Ogg::ogg ALIAS ogg)
+
+add_subdirectory(vorbis EXCLUDE_FROM_ALL)
+
+set_target_properties("vorbis" "vorbisfile" "vorbisenc" PROPERTIES FOLDER "Externals/vorbis")
diff --git a/KFL/src/Base/JsonDom.cpp b/KFL/src/Base/JsonDom.cpp
@@ -37,18 +37,8 @@
 
 #include <variant>
 
-#if defined(KLAYGE_COMPILER_MSVC)
-#pragma warning(push)
-#if (_MSC_VER >= 1929)
-#pragma warning(disable : 5054) // Operator '|': deprecated between enumerations of different types
-#endif
-#pragma warning(disable : 6313) // Incorrect operator: zero-valued flag cannot be tested with bitwise-and
-#endif
 #include <rapidjson/document.h>
 #include <rapidjson/prettywriter.h>
-#if defined(KLAYGE_COMPILER_MSVC)
-#pragma warning(pop)
-#endif
 
 #include <KFL/JsonDom.hpp>
 #include <KFL/XMLDom.hpp>

diff --git a/KlayGE/Core/CMakeLists.txt b/KlayGE/Core/CMakeLists.txt
@@ -1,5 +1,5 @@
 DOWNLOAD_DEPENDENCY("KlayGE/klayge_logo.png" "bfdd6d15f5698d09f72306d1a54ec78c7d50c8dd")
-DOWNLOAD_DEPENDENCY("KlayGE/media/Fonts/gkai00mp.kfont" "25ed05b2f28159840523d44f98bbb4034999c1c1")
+DOWNLOAD_DEPENDENCY("KlayGE/media/Fonts/gkai00mp.kfont" "c83154adfe69df5a0bfaac91217b31710046dfb1")
 DOWNLOAD_DEPENDENCY("KlayGE/media/Models/AmbientLightProxy.glb" "B0F65861730C3538A9E615AB0D38AEBF06CD759A")
 DOWNLOAD_DEPENDENCY("KlayGE/media/Models/CameraProxy.glb" "092269909F3B26457616D1AC0B9E59E029B66EFE")
 DOWNLOAD_DEPENDENCY("KlayGE/media/Models/DirectionalLightProxy.glb" "20FC54C4570C3655065E1CDF0877D1C08E1D637F")

diff --git a/KlayGE/Tests/src/KlayGETests.hpp b/KlayGE/Tests/src/KlayGETests.hpp
@@ -1,21 +1,7 @@
 #ifndef KLAYGE_TESTS_HPP
 #define KLAYGE_TESTS_HPP
 
-#if defined(KLAYGE_COMPILER_MSVC)
-#pragma warning(disable : 6326) // Potential comparison of a constant with another constant.
-#endif
-
-#if defined(KLAYGE_COMPILER_CLANGCL)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wshift-sign-overflow"
-#if (KLAYGE_COMPILER_VERSION >= 160)
-#pragma clang diagnostic ignored "-Wdeprecated" // Ignore out-of-line definition of constexpr
-#endif
-#endif
 #include <gtest/gtest.h>
-#if defined(KLAYGE_COMPILER_CLANGCL)
-#pragma warning(pop)
-#endif
 
 #include <KlayGE/GraphicsBuffer.hpp>
 #include <KlayGE/Texture.hpp>

diff --git a/KlayGE/Tools/src/Cooker/Cooker.cpp b/KlayGE/Tools/src/Cooker/Cooker.cpp
@@ -53,14 +53,17 @@
 #if (_MSC_VER >= 1937)
 #pragma warning(disable : 5267) // Ignore implicit copy constructor definition
 #endif
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-fallthrough" // Ignore fallthrough in switch-case
+#if (KLAYGE_COMPILER_VERSION >= 160)
 #pragma clang diagnostic ignored "-Wdeprecated-copy-with-dtor" // Ignore deprecated destructor
 #endif
+#endif
 #include <cxxopts.hpp>
 #if defined(KLAYGE_COMPILER_MSVC)
 #pragma warning(pop)
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic pop
 #endif
 

diff --git a/KlayGE/Tools/src/FxmlJit/FxmlJit.cpp b/KlayGE/Tools/src/FxmlJit/FxmlJit.cpp
@@ -50,14 +50,17 @@
 #if (_MSC_VER >= 1937)
 #pragma warning(disable : 5267) // Ignore implicit copy constructor definition
 #endif
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-fallthrough" // Ignore fallthrough in switch-case
+#if (KLAYGE_COMPILER_VERSION >= 160)
 #pragma clang diagnostic ignored "-Wdeprecated-copy-with-dtor" // Ignore deprecated destructor
 #endif
+#endif
 #include <cxxopts.hpp>
 #if defined(KLAYGE_COMPILER_MSVC)
 #pragma warning(pop)
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic pop
 #endif
 

diff --git a/KlayGE/Tools/src/ImposterGen/ImposterGen.cpp b/KlayGE/Tools/src/ImposterGen/ImposterGen.cpp
@@ -56,14 +56,17 @@
 #if (_MSC_VER >= 1937)
 #pragma warning(disable : 5267) // Ignore implicit copy constructor definition
 #endif
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-fallthrough" // Ignore fallthrough in switch-case
+#if (KLAYGE_COMPILER_VERSION >= 160)
 #pragma clang diagnostic ignored "-Wdeprecated-copy-with-dtor" // Ignore deprecated destructor
 #endif
+#endif
 #include <cxxopts.hpp>
 #if defined(KLAYGE_COMPILER_MSVC)
 #pragma warning(pop)
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic pop
 #endif
 

diff --git a/KlayGE/Tools/src/KFontGen/KFontGen.cpp b/KlayGE/Tools/src/KFontGen/KFontGen.cpp
@@ -55,14 +55,17 @@
 #if (_MSC_VER >= 1937)
 #pragma warning(disable : 5267) // Ignore implicit copy constructor definition
 #endif
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-fallthrough" // Ignore fallthrough in switch-case
+#if (KLAYGE_COMPILER_VERSION >= 160)
 #pragma clang diagnostic ignored "-Wdeprecated-copy-with-dtor" // Ignore deprecated destructor
 #endif
+#endif
 #include <cxxopts.hpp>
 #if defined(KLAYGE_COMPILER_MSVC)
 #pragma warning(pop)
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic pop
 #endif
 

diff --git a/KlayGE/Tools/src/Tex2JTML/Tex2JTML.cpp b/KlayGE/Tools/src/Tex2JTML/Tex2JTML.cpp
@@ -55,14 +55,17 @@
 #if (_MSC_VER >= 1937)
 #pragma warning(disable : 5267) // Ignore implicit copy constructor definition
 #endif
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-fallthrough" // Ignore fallthrough in switch-case
+#if (KLAYGE_COMPILER_VERSION >= 160)
 #pragma clang diagnostic ignored "-Wdeprecated-copy-with-dtor" // Ignore deprecated destructor
 #endif
+#endif
 #include <cxxopts.hpp>
 #if defined(KLAYGE_COMPILER_MSVC)
 #pragma warning(pop)
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic pop
 #endif
 

diff --git a/KlayGE/Tools/src/VectorTexGen/VectorTexGen.cpp b/KlayGE/Tools/src/VectorTexGen/VectorTexGen.cpp
@@ -53,32 +53,30 @@
 #if (_MSC_VER >= 1937)
 #pragma warning(disable : 5267) // Ignore implicit copy constructor definition
 #endif
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wimplicit-fallthrough" // Ignore fallthrough in switch-case
+#if (KLAYGE_COMPILER_VERSION >= 160)
 #pragma clang diagnostic ignored "-Wdeprecated-copy-with-dtor" // Ignore deprecated destructor
 #endif
+#endif
 #include <cxxopts.hpp>
 #if defined(KLAYGE_COMPILER_MSVC)
 #pragma warning(pop)
-#elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
+#elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic pop
 #endif
 
 #if defined(KLAYGE_COMPILER_MSVC)
 #pragma warning(push)
-#pragma warning(disable : 4244) // Conversion from doubel to int64
+#pragma warning(disable : 4244) // Conversion from doubel to float
 #pragma warning(disable : 4456) // Declaration of 'name' hides previous local declaration
 #pragma warning(disable : 4702) // Unreachable code
-#pragma warning(disable : 6001) // Using uninitialized memory '*grad->stops'
-#pragma warning(disable : 6031) // Return value ignored: 'sscanf'
-#pragma warning(disable : 6246) // Local declaration of 'name' hides declaration of the same name in outer scope
-#pragma warning(disable : 6308) // 'realloc' might return null pointer
-#pragma warning(disable : 6385) // Reading invalid data from 'grad->stops'
-#pragma warning(disable : 6386) // Buffer overrun while writing to 'grad->stops'
 #elif defined(KLAYGE_COMPILER_CLANGCL)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wcast-qual"
 #pragma clang diagnostic ignored "-Wdeprecated-declarations" // Ignore deprecated function calls
+#pragma clang diagnostic ignored "-Wfloat-conversion" // Ignore converting float to unsigned int
 #pragma clang diagnostic ignored "-Wshadow"
 #if (KLAYGE_COMPILER_VERSION >= 160)
 #pragma clang diagnostic ignored "-Wreserved-identifier" // Ignore reserved '_'
@@ -93,7 +91,7 @@
 #endif
 #if defined(KLAYGE_COMPILER_MSVC)
 #pragma warning(push)
-#pragma warning(disable : 6308) // 'realloc' might return null pointer
+#pragma warning(disable : 4244) // Conversion from doubel to float
 #elif defined(KLAYGE_COMPILER_CLANGCL) && (KLAYGE_COMPILER_VERSION >= 160)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wreserved-identifier" // Ignore reserved '_'