From df90fb7f7516b70ad5a12b45f5aa397bfde2a201 Mon Sep 17 00:00:00 2001 From: Ales Pergl Date: Tue, 4 Jul 2017 19:58:02 +0200 Subject: [PATCH] Enabled true debug mode --- brightray/brightray.gypi | 22 +++++++++++++++++++--- vendor/libchromiumcontent | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi index c0dc92b98c16..83406e4c8e0b 100644 --- a/brightray/brightray.gypi +++ b/brightray/brightray.gypi @@ -92,8 +92,6 @@ 'Common_Base': { 'abstract': 1, 'defines': [ - # We are using Release version libchromiumcontent: - 'NDEBUG', # Needed by gin: 'V8_USE_EXTERNAL_STARTUP_DATA', # From skia_for_chromium_defines.gypi: @@ -189,6 +187,7 @@ # Use this instead of "NDEBUG" to determine whether we are in # Debug build, because "NDEBUG" is already used by Chromium. 'DEBUG', + '_DEBUG', # Require when using libchromiumcontent. 'COMPONENT_BUILD', 'GURL_DLL', @@ -198,15 +197,32 @@ ], 'msvs_settings': { 'VCCLCompilerTool': { - 'RuntimeLibrary': '2', # /MD (nondebug DLL) + 'RuntimeLibrary': '3', # /MDd (debug DLL) 'Optimization': '0', # 0 = /Od # See http://msdn.microsoft.com/en-us/library/8wtf2dfz(VS.71).aspx 'BasicRuntimeChecks': '3', # 3 = all checks enabled, 0 = off }, + 'VCLinkerTool': { + 'OptimizeReferences': 2, # /OPT:REF + 'EnableCOMDATFolding': 2, # /OPT:ICF + }, }, + 'conditions': [ + ['OS=="linux"', { + 'defines': [ + '_GLIBCXX_DEBUG', + ], + 'cflags': [ + '-g', + ], + }], # OS=="linux" + ], }, # Debug_Base 'Release_Base': { 'abstract': 1, + 'defines': [ + 'NDEBUG', + ], 'msvs_settings': { 'VCCLCompilerTool': { 'RuntimeLibrary': '2', # /MD (nondebug DLL) diff --git a/vendor/libchromiumcontent b/vendor/libchromiumcontent index 8cfd08f84e41..7d889fde3b5c 160000 --- a/vendor/libchromiumcontent +++ b/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 8cfd08f84e415f3c8e5fde061f8e17400ef8aa7f +Subproject commit 7d889fde3b5c7083c554675c97142547d7605057