diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-07 01:53:36 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-07 01:53:36 +0000 |
| commit | daefca3e87d6d36f0e6a58e3b0ff60917f285acb (patch) | |
| tree | bbb7a69c597c2d57b6427391ebbee4bf075c8025 /o3d/samples | |
| parent | 75f9c5ec2b230df2fae6dd6f372eb1eb8562ff01 (diff) | |
| download | chromium_src-daefca3e87d6d36f0e6a58e3b0ff60917f285acb.zip chromium_src-daefca3e87d6d36f0e6a58e3b0ff60917f285acb.tar.gz chromium_src-daefca3e87d6d36f0e6a58e3b0ff60917f285acb.tar.bz2 | |
linux: 64-bit
This CL enables a 64-bit of linux. Set target_arch='x64' in the gyp defines to enable.
- fixes a few 64-bit issues
- fixes some linux build issues on scons vs make
- add rules to build 64-bit version
Review URL: http://codereview.chromium.org/376010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples')
| -rw-r--r-- | o3d/samples/samples_gen.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/o3d/samples/samples_gen.py b/o3d/samples/samples_gen.py index cb999c1..94ca89d 100644 --- a/o3d/samples/samples_gen.py +++ b/o3d/samples/samples_gen.py @@ -99,6 +99,7 @@ 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") @@ -112,16 +113,10 @@ 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(" '<(_inputs)',\n") + output_file.write(" '../o3d_assets/samples/%s',\n" % asset['path']) output_file.write(" '<(_outputs)',\n") output_file.write(" ],\n") output_file.write(" },\n") |