summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-02 17:39:00 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-02 17:39:00 +0000
commit9532c0e367447335be342858d9f218e2d0358b1c (patch)
treea5437f66288a5ef6dc84f09742acf3c2acc3511a /build
parenta7383bde377b99f2cd43ed70d04b86f0db74482b (diff)
downloadchromium_src-9532c0e367447335be342858d9f218e2d0358b1c.zip
chromium_src-9532c0e367447335be342858d9f218e2d0358b1c.tar.gz
chromium_src-9532c0e367447335be342858d9f218e2d0358b1c.tar.bz2
Move a bunch of libs over to gyp on windows.
Review URL: http://codereview.chromium.org/60019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp29
1 files changed, 16 insertions, 13 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 3142a6b..2d9ddff 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -25,6 +25,18 @@
'../media/media.gyp:*',
'../net/net.gyp:*',
'../printing/printing.gyp:*',
+ '../sdch/sdch.gyp:*',
+ '../skia/skia.gyp:*',
+ '../third_party/bzip2/bzip2.gyp:*',
+ '../third_party/icu38/icu38.gyp:*',
+ '../third_party/libjpeg/libjpeg.gyp:*',
+ '../third_party/libpng/libpng.gyp:*',
+ '../third_party/libxml/libxml.gyp:*',
+ '../third_party/libxslt/libxslt.gyp:*',
+ '../third_party/modp_b64/modp_b64.gyp:*',
+ '../third_party/npapi/npapi.gyp:*',
+ '../third_party/sqlite/sqlite.gyp:*',
+ '../third_party/zlib/zlib.gyp:*',
],
'conditions': [
['OS=="linux"', {
@@ -36,24 +48,15 @@
'dependencies': [
'../sandbox/sandbox.gyp:*',
],
+ }, {
+ 'dependencies': [
+ '../third_party/libevent/libevent.gyp:*',
+ ],
}],
['all_gyps', {
'dependencies': [
'../chrome/chrome.gyp:*',
- '../sdch/sdch.gyp:*',
- '../skia/skia.gyp:*',
'../testing/gtest.gyp:*',
- '../third_party/bzip2/bzip2.gyp:*',
- '../third_party/icu38/icu38.gyp:*',
- '../third_party/libevent/libevent.gyp:*',
- '../third_party/libjpeg/libjpeg.gyp:*',
- '../third_party/libpng/libpng.gyp:*',
- '../third_party/libxml/libxml.gyp:*',
- '../third_party/libxslt/libxslt.gyp:*',
- '../third_party/modp_b64/modp_b64.gyp:*',
- '../third_party/npapi/npapi.gyp:*',
- '../third_party/sqlite/sqlite.gyp:*',
- '../third_party/zlib/zlib.gyp:*',
'../webkit/tools/test_shell/test_shell.gyp:*',
'../webkit/webkit.gyp:*',
'temp_gyp/googleurl.gyp:*',