Source release v3.0.0-0-g8d3792b-ce + third_party

Change-Id: I399e71ddfffcd436171d1c60283c63ab4658e0b1

platforms/x86-64/settings.gypi

@@ -1,16 +1,9 @@
-# Copyright 2013 Google Inc. All rights reserved.
+# Copyright 2015 Google Inc. All rights reserved.
 {
   # Here you can override global gyp variables with platform-specific values.
-  # See global_config.gypi for a complete list of settings you can override.
+  # See cdm.gyp for a complete list of settings you can override.
   'variables': {
-    'certificate_provision': 'true',
-
-    'company_name': '"www"',
-    'model_name': '"www"',
-    'architecture_name': '"x86-64"',
-    'device_name': '"x86-64 Linux"',
-    'product_name': '"x86-64 cdm"',
-    'buildinfo_data': '"cdm_partner_2.0"',
+    #'oemcrypto_version': 9,
   }, # end variables
 
   # Here you can set platform-specific compiler settings.
@@ -27,6 +20,7 @@
 
     # These are flags passed to the compiler for C++ only.
     'cflags_cc': [
+      '-std=c++11',
     ],
 
     # These are flags passed to the linker.
@@ -78,6 +72,9 @@
           '-O0',
           '-g',
         ],
+        'defines': [
+          '_DEBUG',
+        ],
         'ldflags': [
           '-g',
         ],
@@ -86,6 +83,9 @@
         'cflags': [
           '-O2',
         ],
+        'defines': [
+          'NDEBUG',
+        ],
       },
     }, # end configurations
   }, # end target_defaults