diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 18:16:17 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 18:16:17 +0000 |
| commit | 67df047cd552d944f52f28fcb3fd7889e8030f66 (patch) | |
| tree | e12c551541ef1a56617c986386417c2b0ecbc4fe | |
| parent | 17a00eba8e19d37e7e94891551a2bea85deebcab (diff) | |
| download | chromium_src-67df047cd552d944f52f28fcb3fd7889e8030f66.zip chromium_src-67df047cd552d944f52f28fcb3fd7889e8030f66.tar.gz chromium_src-67df047cd552d944f52f28fcb3fd7889e8030f66.tar.bz2 | |
Fix pyautolib so that it builds on Windows in multi-dll mode.
BUG=56736
TEST=none
Review URL: http://codereview.chromium.org/5794006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69281 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome_tests.gypi | 3 | ||||
| -rw-r--r-- | third_party/swig/README.chromium | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 37f27a2..2eeacb0 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -3246,8 +3246,7 @@ }, ]}, # 'targets' ], # OS=="win" - ['OS=="mac" or (OS=="win" and component=="static_library") ' - 'or (OS=="linux" and target_arch==python_arch)', { + ['OS=="mac" or OS=="win" or (OS=="linux" and target_arch==python_arch)', { 'targets': [ { # Documentation: http://dev.chromium.org/developers/testing/pyauto diff --git a/third_party/swig/README.chromium b/third_party/swig/README.chromium index ac42927..9a205e1 100644 --- a/third_party/swig/README.chromium +++ b/third_party/swig/README.chromium @@ -12,5 +12,6 @@ languages need to access the underlying C/C++ code. Local Modifications: - Removed all non-python bindings from Lib/. - Edit Lib/python/pyruntime.swg to include Python.h without the _DEBUG macro to -avoid requiring python<ver>_d.lib since we do not intend to debug python. +avoid requiring python<ver>_d.lib since we do not intend to debug python. Also +disable a MSVC warning about mixing headers with and without _DEBUG. |