diff --git a/build/BUILD.gn b/build/BUILD.gn index b1209c4..54be4d1 100644 --- a/build/BUILD.gn +++ b/build/BUILD.gn @@ -164,14 +164,6 @@ config("release") { } } -config("third_party_warnings") { - if (is_win) { - cflags = [ - "/wd4242", # tmp:conversion from 'int' to 'uint8_t' - ] - } -} - config("warnings") { if (is_win) { cflags = [ diff --git a/build/android/app/CMakeLists.txt b/build/android/app/CMakeLists.txt index 472f2b4..8b2d3b8 100644 --- a/build/android/app/CMakeLists.txt +++ b/build/android/app/CMakeLists.txt @@ -12,6 +12,7 @@ target_compile_options(common_config INTERFACE -Wno-deprecated-enum-enum-conversion -Wno-unsequenced -Wno-nullability-completeness + -Wno-unused-variable ) target_compile_definitions(common_config INTERFACE diff --git a/src/third_party/BUILD.gn b/src/third_party/BUILD.gn index 58337a9..2ccd775 100644 --- a/src/third_party/BUILD.gn +++ b/src/third_party/BUILD.gn @@ -84,6 +84,8 @@ source_set("third_party") { "GLEW_STATIC", ] + cflags = [] + if (target_os == "linux" || target_os == "win") { sources += [ "glew/glew.c", @@ -103,10 +105,13 @@ source_set("third_party") { "glew/wglew.h", "glslang/glslang/OSDependent/Windows/ossource.cpp", ] + + cflags += [ + "/wd4242", # tmp:conversion from 'int' to 'uint8_t' + ] } configs -= [ "//build:warnings" ] - configs += [ "//build:third_party_warnings" ] deps = [] }