Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(764)

Side by Side Diff: webkit/build/JavaScriptCore/SConscript

Issue 17010: Chromium side of merge 39453:39501.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « WEBKIT_MERGE_REVISION ('k') | webkit/build/JavaScriptCore/WTF.vcproj » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 wtf_inputs = [ 148 wtf_inputs = [
149 '$WTF_DIR/Assertions.cpp', 149 '$WTF_DIR/Assertions.cpp',
150 '$WTF_DIR/dtoa.cpp', 150 '$WTF_DIR/dtoa.cpp',
151 '$WTF_DIR/FastMalloc.cpp', 151 '$WTF_DIR/FastMalloc.cpp',
152 '$WTF_DIR/HashTable.cpp', 152 '$WTF_DIR/HashTable.cpp',
153 '$WTF_DIR/MainThread.cpp', 153 '$WTF_DIR/MainThread.cpp',
154 '$WTF_DIR/RandomNumber.cpp', 154 '$WTF_DIR/RandomNumber.cpp',
155 '$WTF_DIR/RefCountedLeakCounter.cpp', 155 '$WTF_DIR/RefCountedLeakCounter.cpp',
156 '$WTF_DIR/TCSystemAlloc.cpp', 156 '$WTF_DIR/TCSystemAlloc.cpp',
157 '$WTF_DIR/Threading.cpp',
157 '$WTF_DIR/unicode/UTF8.cpp', 158 '$WTF_DIR/unicode/UTF8.cpp',
158 '$WTF_DIR/unicode/icu/CollatorICU.cpp', 159 '$WTF_DIR/unicode/icu/CollatorICU.cpp',
159 ] 160 ]
160 161
161 if env.Bit('windows'): 162 if env.Bit('windows'):
162 wtf_inputs.extend([ 163 wtf_inputs.extend([
163 '$WTF_DIR/ThreadingWin.cpp', 164 '$WTF_DIR/ThreadingWin.cpp',
164 ]) 165 ])
165 elif env.Bit('linux'): 166 elif env.Bit('linux'):
166 wtf_inputs.extend([ 167 wtf_inputs.extend([
167 '$WTF_DIR/gtk/MainThreadGtk.cpp', 168 '$WTF_DIR/gtk/MainThreadGtk.cpp',
168 '$WTF_DIR/ThreadingPthreads.cpp', 169 '$WTF_DIR/ThreadingPthreads.cpp',
169 ]) 170 ])
170 171
171 # Re-add the include path for glib.h because it got lost when cloning the 172 # Re-add the include path for glib.h because it got lost when cloning the
172 # environment. 173 # environment.
173 env.ParseConfig('pkg-config --cflags --libs glib-2.0') 174 env.ParseConfig('pkg-config --cflags --libs glib-2.0')
174 175
175 176
176 env.ChromeLibrary('WTF', wtf_inputs) 177 env.ChromeLibrary('WTF', wtf_inputs)
177 178
178 env.ChromeMSVSProject('$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', 179 env.ChromeMSVSProject('$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj',
179 guid='{AA8A5A85-592B-4357-BC60-E0E91E026AF6}') 180 guid='{AA8A5A85-592B-4357-BC60-E0E91E026AF6}')
OLDNEW
« no previous file with comments | « WEBKIT_MERGE_REVISION ('k') | webkit/build/JavaScriptCore/WTF.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698