From fcff38c3fa6545e626272173dbb0e13f505a8142 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 8 Jul 2021 01:49:13 -0500 Subject: [PATCH] [buildcore,gbabuildcore] Move GBA specific warning suppression to GBA CMake --- deps/buildcore/base.cmake | 2 -- deps/gbabuildcore/base.cmake | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/buildcore/base.cmake b/deps/buildcore/base.cmake index 625fa8c9..2637125b 100644 --- a/deps/buildcore/base.cmake +++ b/deps/buildcore/base.cmake @@ -47,8 +47,6 @@ if(NOT MSVC) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-variable") - # disable warnings - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") # release build options if (CMAKE_BUILD_TYPE STREQUAL "Release") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") diff --git a/deps/gbabuildcore/base.cmake b/deps/gbabuildcore/base.cmake index b0a951d3..9b0b2450 100644 --- a/deps/gbabuildcore/base.cmake +++ b/deps/gbabuildcore/base.cmake @@ -9,6 +9,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthumb-interwork") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mthumb") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=arm7tdmi") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=arm7tdmi") +# disable warnings +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") set(OX_BARE_METAL ON) set(OX_USE_STDLIB OFF)