| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 Import('env') | 5 Import('env') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 | 8 |
| 9 | 9 |
| 10 cygwin = env.Dir('$CHROME_SRC_DIR/third_party/cygwin/bin') | 10 cygwin = env.Dir('$CHROME_SRC_DIR/third_party/cygwin/bin') |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 if env['PLATFORM'] == 'win32': | 124 if env['PLATFORM'] == 'win32': |
| 125 env.Append( | 125 env.Append( |
| 126 CPPPATH = [ | 126 CPPPATH = [ |
| 127 # Windows workarounds to not having pthread.h and sched.h | 127 # Windows workarounds to not having pthread.h and sched.h |
| 128 '$WEBKIT_DIR/build/JavaScriptCore', | 128 '$WEBKIT_DIR/build/JavaScriptCore', |
| 129 # Windows workarounds to not having stdint.h | 129 # Windows workarounds to not having stdint.h |
| 130 '$JAVASCRIPTCORE_DIR/os-win32', | 130 '$JAVASCRIPTCORE_DIR/os-win32', |
| 131 ], | 131 ], |
| 132 CPPDEFINES = [ | 132 CPPDEFINES = [ |
| 133 'CRASH=__debugbreak', | 133 'CRASH=__debugbreak', |
| 134 '_WIN32_WINNT=0x0600', | |
| 135 'WINVER=0x0600', | |
| 136 ], | 134 ], |
| 137 CCFLAGS = [ | 135 CCFLAGS = [ |
| 138 '/TP', | 136 '/TP', |
| 139 | 137 |
| 140 '/Wp64', | 138 '/Wp64', |
| 141 | 139 |
| 142 '/wd4127', | 140 '/wd4127', |
| 143 '/wd4355', | 141 '/wd4355', |
| 144 '/wd4510', | 142 '/wd4510', |
| 145 '/wd4512', | 143 '/wd4512', |
| (...skipping 22 matching lines...) Expand all Loading... |
| 168 '$WTF_DIR/gtk/MainThreadGtk.cpp', | 166 '$WTF_DIR/gtk/MainThreadGtk.cpp', |
| 169 '$WTF_DIR/ThreadingPthreads.cpp', | 167 '$WTF_DIR/ThreadingPthreads.cpp', |
| 170 ]) | 168 ]) |
| 171 | 169 |
| 172 # Re-add the include path for glib.h because it got lost when cloning the | 170 # Re-add the include path for glib.h because it got lost when cloning the |
| 173 # environment. | 171 # environment. |
| 174 env.ParseConfig('pkg-config --cflags --libs glib-2.0') | 172 env.ParseConfig('pkg-config --cflags --libs glib-2.0') |
| 175 | 173 |
| 176 | 174 |
| 177 env.ChromeStaticLibrary('WTF', wtf_inputs) | 175 env.ChromeStaticLibrary('WTF', wtf_inputs) |
| OLD | NEW |