From 10114c85bba9c2c0e62aa6361b887717f9f05921 Mon Sep 17 00:00:00 2001 From: Fabian Guerra Soto Date: Mon, 25 Mar 2019 09:25:08 -0700 Subject: [ios, macos, build] Remove DEBUG from logging configuration. (#13933) * [ios, macos] Change the debug flag usage to NDEBUG. * [ios, macos] Add NDEBUG preprocessor macro to ios/macos project conf. --- platform/darwin/src/MGLLoggingConfiguration.h | 2 +- platform/ios/ios.xcodeproj/project.pbxproj | 2 ++ platform/macos/macos.xcodeproj/project.pbxproj | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/darwin/src/MGLLoggingConfiguration.h b/platform/darwin/src/MGLLoggingConfiguration.h index 6782dc60a7..d79336df4c 100644 --- a/platform/darwin/src/MGLLoggingConfiguration.h +++ b/platform/darwin/src/MGLLoggingConfiguration.h @@ -4,7 +4,7 @@ #ifndef MGL_LOGGING_DISABLED #ifndef MGL_LOGGING_ENABLE_DEBUG - #ifdef DEBUG + #ifndef NDEBUG #define MGL_LOGGING_ENABLE_DEBUG 1 #endif #endif diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 535f83728f..a514f4a017 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -3862,6 +3862,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_PREFIX_HEADER = "$SRCROOT/src/Mapbox-Prefix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = ( "$(mbgl_core_INCLUDE_DIRECTORIES)", "$(mbgl_filesource_INCLUDE_DIRECTORIES)", @@ -4296,6 +4297,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_PREFIX_HEADER = "$SRCROOT/src/Mapbox-Prefix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; HEADER_SEARCH_PATHS = ( "$(mbgl_core_INCLUDE_DIRECTORIES)", "$(mbgl_filesource_INCLUDE_DIRECTORIES)", diff --git a/platform/macos/macos.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj index 5d5a94c78a..57c4f198f0 100644 --- a/platform/macos/macos.xcodeproj/project.pbxproj +++ b/platform/macos/macos.xcodeproj/project.pbxproj @@ -2008,6 +2008,7 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_CPP_RTTI = NO; GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = "NDEBUG=1"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; -- cgit v1.2.1