Fix a bug where the SK_DEBUG=1 was set for the Release config (at least on msvc)...

The bug is caused by the config "Release_Developer" which is getting incorrectly merged by gyp into the "Release" config.

gyp and specifically the function _GetConfigurationAndPlatform in `msvc.py` which is expecting a single _ to separate from the platform (x64)  https://chromium.googlesource.com/external/gyp/+/702ac58e477214c635d9b541932e75a95d349352/pylib/gyp/generator/msvs.py#2645

gyp projects should not use any _ in the configuration name (before the optional platform part)

diff --git a/gyp/common.gypi b/gyp/common.gypi
index 0e3e0dde088dfac8721c9e58b0b682f2f889aac6..48b1819375a09c89303a69a6b6ad61d179510e00 100644 (file)
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -101,7 +101,7 @@
         'configurations': {
           'Debug':   { 'defines': [ 'SK_DEBUG=1' ] },
           'Release': { 'defines': [ 'NDEBUG' ] },
-          'Release_Developer': {
+          'ReleaseDeveloper': {
             'inherit_from': ['Release'],
             'defines': [ 'SK_DEBUG=1' ],
             'conditions': [

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index dbdb2f4632f7dd3ef2d20de3c089822cfbafc5e2..7f6d9b60e6058b6a78b9590184fa17a280730e05 100644 (file)
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -178,8 +178,8 @@
                   },
                 },
               },
-              'Release_Developer_x64': {
-                'inherit_from': ['Release_Developer'],
+              'ReleaseDeveloper_x64': {
+                'inherit_from': ['ReleaseDeveloper'],
                 'msvs_settings': {
                   'VCCLCompilerTool': {
                      # Don't specify /arch. SSE2 is implied by 64bit and specifying it warns.