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

Side by Side Diff: third_party/WebKit/JavaScriptCore/JavaScriptCore.scons

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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
OLDNEW
1 # The keys in sources are the paths to the directories 1 # The keys in sources are the paths to the directories
2 # the values are an array of source files in those directories to compile 2 # the values are an array of source files in those directories to compile
3 sources = {} 3 sources = {}
4 sources['API'] = [ 4 sources['API'] = [
5 'API/JSBase.cpp', 5 'API/JSBase.cpp',
6 'API/JSCallbackConstructor.cpp', 6 'API/JSCallbackConstructor.cpp',
7 'API/JSCallbackFunction.cpp', 7 'API/JSCallbackFunction.cpp',
8 'API/JSCallbackObject.cpp', 8 'API/JSCallbackObject.cpp',
9 'API/JSClassRef.cpp', 9 'API/JSClassRef.cpp',
10 'API/JSContextRef.cpp', 10 'API/JSContextRef.cpp',
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 ] 142 ]
143 sources['wtf'] = [ 143 sources['wtf'] = [
144 'wtf/Assertions.cpp', 144 'wtf/Assertions.cpp',
145 'wtf/ByteArray.cpp', 145 'wtf/ByteArray.cpp',
146 'wtf/CurrentTime.cpp', 146 'wtf/CurrentTime.cpp',
147 'wtf/FastMalloc.cpp', 147 'wtf/FastMalloc.cpp',
148 'wtf/HashTable.cpp', 148 'wtf/HashTable.cpp',
149 'wtf/RandomNumber.cpp', 149 'wtf/RandomNumber.cpp',
150 'wtf/RefCountedLeakCounter.cpp', 150 'wtf/RefCountedLeakCounter.cpp',
151 'wtf/Threading.cpp', 151 'wtf/Threading.cpp',
152 'wtf/TypeTraits.cpp',
153 'wtf/dtoa.cpp', 152 'wtf/dtoa.cpp',
154 ] 153 ]
155 sources['wtf/unicode'] = [ 154 sources['wtf/unicode'] = [
156 'wtf/unicode/CollatorDefault.cpp', 155 'wtf/unicode/CollatorDefault.cpp',
157 'wtf/unicode/UTF8.cpp', 156 'wtf/unicode/UTF8.cpp',
158 ] 157 ]
159 sources['wtf/unicode/icu'] = [ 158 sources['wtf/unicode/icu'] = [
160 'wtf/unicode/icu/CollatorICU.cpp', 159 'wtf/unicode/icu/CollatorICU.cpp',
161 ] 160 ]
162 161
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 elif building_on_win32: 302 elif building_on_win32:
304 env.Append(CPPPATH = ['os-win32', WebKitLibraries('include')]) 303 env.Append(CPPPATH = ['os-win32', WebKitLibraries('include')])
305 env.Prepend(LIBPATH = [WebKitLibraries('lib')]) 304 env.Prepend(LIBPATH = [WebKitLibraries('lib')])
306 env.Append(LIBS = ['icuin', 'icuuc', 'user32', 'winmm']) 305 env.Append(LIBS = ['icuin', 'icuuc', 'user32', 'winmm'])
307 306
308 env.Program('jsc', shell_sources) 307 env.Program('jsc', shell_sources)
309 308
310 309
311 310
312 311
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698