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
diff --git a/build/gyp_angle b/build/gyp_angle
index 6eb3d4e..2aa38a5 100644
--- a/build/gyp_angle
+++ b/build/gyp_angle
@@ -22,6 +22,10 @@
print 'Updating projects from gyp files...'
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.
args.append('-I' + os.path.join(script_dir, 'common.gypi'))
# Add all.gyp as the main gyp file to be generated.
diff --git a/src/build_angle.gyp b/src/build_angle.gyp
index 1f427f0..b85f846 100644
--- a/src/build_angle.gyp
+++ b/src/build_angle.gyp
@@ -89,6 +89,13 @@
'sources': ['compiler/ossource_win.cpp'],
}, { # else: posix
'sources': ['compiler/ossource_posix.cpp'],
+ 'all_dependent_settings': {
+ 'link_settings': {
+ 'libraries': [
+ '-lpthread',
+ ],
+ },
+ },
}],
],
},
