summaryrefslogtreecommitdiffstats
path: root/o3d/build
diff options
context:
space:
mode:
Diffstat (limited to 'o3d/build')
-rw-r--r--o3d/build/all.gyp1
-rw-r--r--o3d/build/nacl.gyp4
2 files changed, 3 insertions, 2 deletions
diff --git a/o3d/build/all.gyp b/o3d/build/all.gyp
index 6ca0803..43ea2ae 100644
--- a/o3d/build/all.gyp
+++ b/o3d/build/all.gyp
@@ -23,6 +23,7 @@
'../converter/converter.gyp:*',
'../core/core.gyp:*',
'../import/import.gyp:*',
+ '../tests/tests.gyp:*',
'../plugin/idl/idl.gyp:*',
'../plugin/plugin.gyp:*',
'../serializer/serializer.gyp:*',
diff --git a/o3d/build/nacl.gyp b/o3d/build/nacl.gyp
index 99ed5ec..8b84e89 100644
--- a/o3d/build/nacl.gyp
+++ b/o3d/build/nacl.gyp
@@ -34,7 +34,7 @@
'dummy_file_that_never_gets_built_so_scons_always_runs',
],
'action': [
- 'python',
+ 'C:/Python24/python.exe',
'<@(_inputs)',
'--output="<(nacl_output_dir)"',
'--configuration="<(CONFIGURATION)"',
@@ -43,7 +43,7 @@
],
},
],
- 'direct_dependent_settings': {
+ 'all_dependent_settings': {
'include_dirs': [
'<(nacldir)',
],