diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-07 02:47:52 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-07 02:47:52 +0000 |
| commit | 7978508d53990b762518d993a1f42dbd3dfc429a (patch) | |
| tree | 3ca60b437795532555867dd8be567458dc1c1245 /o3d/samples/samples_gen.py | |
| parent | fc6fb7fbf9aca6b58f8c99a08a6c376b95bbc1a3 (diff) | |
| download | chromium_src-7978508d53990b762518d993a1f42dbd3dfc429a.zip chromium_src-7978508d53990b762518d993a1f42dbd3dfc429a.tar.gz chromium_src-7978508d53990b762518d993a1f42dbd3dfc429a.tar.bz2 | |
Revert "linux: 64-bit"
This reverts svn://chrome-svn/chrome/trunk/src/o3d@31356
Review URL: http://codereview.chromium.org/372043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/samples_gen.py')
| -rw-r--r-- | o3d/samples/samples_gen.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/o3d/samples/samples_gen.py b/o3d/samples/samples_gen.py index 94ca89d..cb999c1 100644 --- a/o3d/samples/samples_gen.py +++ b/o3d/samples/samples_gen.py @@ -99,7 +99,6 @@ for asset in assets: output_file.write(" {\n") output_file.write(" 'action_name': '%s',\n" % name) output_file.write(" 'inputs': [\n") - output_file.write(" '<(PRODUCT_DIR)/o3dConverter',\n") output_file.write(" '../o3d_assets/samples/%s',\n" % asset['path']) output_file.write(" ],\n") output_file.write(" 'outputs': [\n") @@ -113,10 +112,16 @@ for asset in assets: output_file.write(" '../samples/%s',\n" % output) output_file.write(" ],\n") output_file.write(" 'action': [\n") + if sys.platform[:5] == 'linux': + output_file.write(" 'LD_LIBRARY_PATH=<(PRODUCT_DIR):" + ":<(PRODUCT_DIR)/lib" + ":../../<(glewdir)/lib" + ":../../<<(PRODUCT_DIR)/lib" + "',\n") output_file.write(" '<(PRODUCT_DIR)/o3dConverter',\n") output_file.write(" '--no-condition',\n") output_file.write(" '--up-axis=%s',\n" % asset['up']) - output_file.write(" '../o3d_assets/samples/%s',\n" % asset['path']) + output_file.write(" '<(_inputs)',\n") output_file.write(" '<(_outputs)',\n") output_file.write(" ],\n") output_file.write(" },\n") |