diff options
Diffstat (limited to 'o3d/documentation/documentation.gyp')
| -rw-r--r-- | o3d/documentation/documentation.gyp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/o3d/documentation/documentation.gyp b/o3d/documentation/documentation.gyp index 1d697e0..0c51cdf 100644 --- a/o3d/documentation/documentation.gyp +++ b/o3d/documentation/documentation.gyp @@ -10,6 +10,15 @@ # available. 'jscomp_exists': '<!(python ../build/file_exists.py ' '../../o3d-internal/jscomp/JSCompiler_deploy.jar)', + 'conditions': [ + [ 'OS=="mac"', { + # We need to point to Java 6 explicitly on Mac OS X + 'java_exe%': '/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands/java' + }, { + # OS!="mac" + 'java_exe%': 'java' + }], + ], }, 'includes': [ '../build/common.gypi', @@ -69,7 +78,7 @@ 'action': [ 'python', 'build_docs.py', - 'java', + '<@(java_exe)', '../../third_party', '<(PRODUCT_DIR)/docs', ], |