浏览代码

fix test compilations for latest nuklear vs latest msvc

Andre Weissflog 4 周之前
父节点
当前提交
7c2e87e84a
共有 3 个文件被更改,包括 813 次插入779 次删除
  1. 4 0
      tests/ext/CMakeLists.txt
  2. 1 0
      tests/ext/nuklear.c
  3. 808 779
      tests/ext/nuklear.h

+ 4 - 0
tests/ext/CMakeLists.txt

@@ -89,3 +89,7 @@ file(COPY ${spineruntimes_dir}/examples/spineboy/export/spineboy.atlas DESTINATI
 file(COPY ${spineruntimes_dir}/examples/spineboy/export/spineboy.png DESTINATION ${CMAKE_BINARY_DIR}/Debug)
 
 add_library(nuklear nuklear.c)
+if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+    # NOTE: must propagate to upstream includers
+    target_compile_options(nuklear PUBLIC /wd5287)
+endif()

+ 1 - 0
tests/ext/nuklear.c

@@ -26,6 +26,7 @@
 #pragma warning(disable:4127)   // conditional expression is constant
 #pragma warning(disable:4100)   // unreferenced formal parameter
 #pragma warning(disable:4701)   // potentially uninitialized local variable used
+#pragma warning(disable:4116)   // unnamed type definition in parentheses`
 #endif
 #include "nuklear.h"
 #if defined(_MSC_VER)

文件差异内容过多而无法显示
+ 808 - 779
tests/ext/nuklear.h


部分文件因为文件数量过多而无法显示