diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-09 20:44:32 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-09 20:44:32 +0000 |
| commit | a37a517b5419c4faf1799b0b2b9b6a559ee6af4d (patch) | |
| tree | 7dd00459f6d3b7c8d865da8a39f960cb42fffe3a | |
| parent | aaa3aec09b3907a4985967a73a1ff76fa3cce97a (diff) | |
Enable 32/64-bit gyp switch on Linux
Linux defaults to 64, other platforms 32. As of this change, only Mac and
Linux are affected by the skia_arch_width flag. Next step is to make Win
work as well.
Review URL: https://codereview.appspot.com/6460066
git-svn-id: http://skia.googlecode.com/svn/trunk@5041 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/common_conditions.gypi | 18 | ||||
| -rw-r--r-- | gyp/common_variables.gypi | 6 |
2 files changed, 23 insertions, 1 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 143e85442b..2b9800f79e 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -111,6 +111,24 @@ '-Wno-unused-parameter', '-Wno-c++11-extensions' ], + 'conditions' : [ + ['skia_arch_width == 64', { + 'cflags': [ + '-m64', + ], + 'ldflags': [ + '-m64', + ], + }], + ['skia_arch_width == 32', { + 'cflags': [ + '-m32', + ], + 'ldflags': [ + '-m32', + ], + }], + ], 'include_dirs' : [ '/usr/include/freetype2', ], diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index e8b8b6dc3d..f738b8a7aa 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -57,6 +57,11 @@ }, { 'os_posix%': 1, }], + ['skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'skia_arch_width%': 64, + }, { + 'skia_arch_width%': 32, + }], ], 'skia_scalar%': 'float', @@ -65,7 +70,6 @@ # Do not turn on 'skia_angle' - it is currently experimental 'skia_angle%': 0, 'skia_arch_type%': 'x86', - 'skia_arch_width%': 32, 'android_make_apk%': 1, 'skia_gpu%': 1, }, |