Commit c6be2264 by kbr@chromium.org

Added missing depth argument to GYP which causes the top-level

Makefile to be generated into the correct directory on Linux. Added missing library for clients of translator (the samples, in particular). Built all ANGLE targets on Linux and Windows to test these changes. BUG=none TEST=none Review URL: http://codereview.appspot.com/4556072 git-svn-id: https://angleproject.googlecode.com/svn/trunk@664 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 87891f74
...@@ -22,6 +22,10 @@ if __name__ == '__main__': ...@@ -22,6 +22,10 @@ if __name__ == '__main__':
print 'Updating projects from gyp files...' print 'Updating projects from gyp files...'
sys.stdout.flush() sys.stdout.flush()
# Set the depth to get the top-level Makefile generated into the
# correct directory. This only has an effect on Linux.
args.append('--depth');
args.append('./trunk');
# Add common.gypi to the include path. # Add common.gypi to the include path.
args.append('-I' + os.path.join(script_dir, 'common.gypi')) args.append('-I' + os.path.join(script_dir, 'common.gypi'))
# Add all.gyp as the main gyp file to be generated. # Add all.gyp as the main gyp file to be generated.
......
...@@ -89,6 +89,13 @@ ...@@ -89,6 +89,13 @@
'sources': ['compiler/ossource_win.cpp'], 'sources': ['compiler/ossource_win.cpp'],
}, { # else: posix }, { # else: posix
'sources': ['compiler/ossource_posix.cpp'], 'sources': ['compiler/ossource_posix.cpp'],
'all_dependent_settings': {
'link_settings': {
'libraries': [
'-lpthread',
],
},
},
}], }],
], ],
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment