Update the makefile and gyp for the debugger.
Review URL: https://codereview.appspot.com/6355052
git-svn-id: http://skia.googlecode.com/svn/trunk@4410 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 70b68fd..ee00a34 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -66,7 +66,6 @@
'skia_angle%': 0,
'skia_arch_type%': 'x86',
'skia_arch_width%': 32,
- 'skia_debugger%': 'off',
},
# Re-define all variables defined within the level-2 'variables' dict,
@@ -79,7 +78,6 @@
'skia_angle%': '<(skia_angle)',
'skia_arch_type%': '<(skia_arch_type)',
'skia_arch_width%': '<(skia_arch_width)',
- 'skia_debugger%': '<(skia_debugger)',
},
}
# Local Variables:
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp
index 0789a96..33b0932 100644
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -54,6 +54,9 @@
],
},
}],
+ [ 'skia_os == "mac" and skia_arch_width != 64', {
+ 'error': '<!(skia_arch_width must be 64 bits when building the debugger on mac'
+ }],
[ 'skia_os == "mac"', {
'mac_bundle' : 1,
'include_dirs': [