GYP changed to extract D3DX9 DLL into product dir.
This is so ANGLE will find it. Also added ANGLE as a Chrome dependency. There must be a better way to detect whether there is a directxsdk directory in third_party. I'm open to ideas. TEST=try, check d3dx9 is copied to product dir when building chrome, check ANGLE initializes BUG=45898 Review URL: http://codereview.chromium.org/2843060 git-svn-id: http://src.chromium.org/svn/trunk/src/build@53076 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
09e30fd56c
Коммит
973f7766bf
2
all.gyp
2
all.gyp
|
@ -26,6 +26,7 @@
|
||||||
'../skia/skia.gyp:*',
|
'../skia/skia.gyp:*',
|
||||||
'../testing/gmock.gyp:*',
|
'../testing/gmock.gyp:*',
|
||||||
'../testing/gtest.gyp:*',
|
'../testing/gtest.gyp:*',
|
||||||
|
'../third_party/angle/src/build_angle.gyp:*',
|
||||||
'../third_party/bzip2/bzip2.gyp:*',
|
'../third_party/bzip2/bzip2.gyp:*',
|
||||||
'../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
|
'../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
|
||||||
'../third_party/cld/cld.gyp:*',
|
'../third_party/cld/cld.gyp:*',
|
||||||
|
@ -264,7 +265,6 @@
|
||||||
'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
|
'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
|
||||||
'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
|
'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
|
||||||
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
|
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
|
||||||
'../third_party/angle/src/build_angle.gyp:*',
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
#!/usr/bin/env python
|
||||||
|
# Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
||||||
|
# Use of this source code is governed by a BSD-style license that can be
|
||||||
|
# found in the LICENSE file.
|
||||||
|
|
||||||
|
import os.path
|
||||||
|
import sys
|
||||||
|
|
||||||
|
sys.stdout.write(str(os.path.isdir(sys.argv[1])))
|
||||||
|
sys.exit(0)
|
Загрузка…
Ссылка в новой задаче