Source release 15.0.0

cdm/cdm.gyp

@@ -27,6 +27,12 @@
     # * none
     'asm_target_arch%': 'none',
 
+    # When building on Windows, we have to use the NASM assembler.  By default
+    # we disable assembly on Windows since this is usually not installed.  You
+    # can override it with these variables.
+    'has_nasm%': 'false',
+    'nasm_path%': 'nasm.exe',
+
     # Override this only if you have an alternative privacy crypto
     # implementation other than the default. This should nearly always be left
     # alone. If set to 'dummy', the CDM will compile, but privacy mode in the
@@ -110,6 +116,9 @@
         '../third_party/jsmn',
         '../util/include',
       ],
+      'defines': [
+        'CORE_UTIL_IMPLEMENTATION',
+      ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../core/include',
@@ -156,7 +165,10 @@
         'license_protocol',
         'metrics_proto',
       ],
-      'defines': ['CDM_IMPLEMENTATION'],
+      'defines': [
+        'CDM_IMPLEMENTATION',
+        'CORE_UTIL_IMPLEMENTATION',
+      ],
       'include_dirs': [
         'include',
       ],
@@ -165,18 +177,11 @@
           'include',
         ],
       },
-      'link_settings': {
-        'libraries': [
-          '-lpthread',
-        ],
-      },
       'sources': [
         'include/cdm.h',
         'include/cdm_version.h',
-        'include/override.h',
         'include/properties_ce.h',
         'src/cdm.cpp',
-        'src/lock.cpp',
         'src/log.cpp',
         'src/properties_ce.cpp',
       ],