| OLD | NEW |
| 1 # Copyright 2008 the V8 project authors. All rights reserved. | 1 # Copyright 2008 the V8 project authors. All rights reserved. |
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
| 4 # met: | 4 # met: |
| 5 # | 5 # |
| 6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
| 9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
| 10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 'os:linux': { | 149 'os:linux': { |
| 150 'LIBS': ['pthread'], | 150 'LIBS': ['pthread'], |
| 151 }, | 151 }, |
| 152 'os:macos': { | 152 'os:macos': { |
| 153 'LIBS': ['pthread'], | 153 'LIBS': ['pthread'], |
| 154 }, | 154 }, |
| 155 'os:freebsd': { | 155 'os:freebsd': { |
| 156 'LIBS': ['pthread'], | 156 'LIBS': ['pthread'], |
| 157 }, | 157 }, |
| 158 'os:win32': { | 158 'os:win32': { |
| 159 'LIBS': ['winmm'], | 159 'LIBS': ['winmm', 'ws2_32'], |
| 160 }, | 160 }, |
| 161 }, | 161 }, |
| 162 'msvc': { | 162 'msvc': { |
| 163 'all': { | 163 'all': { |
| 164 'LIBS': ['winmm'] | 164 'LIBS': ['winmm', 'ws2_32'] |
| 165 } | 165 } |
| 166 } | 166 } |
| 167 } | 167 } |
| 168 | 168 |
| 169 | 169 |
| 170 JSCRE_EXTRA_FLAGS = { | 170 JSCRE_EXTRA_FLAGS = { |
| 171 'gcc': { | 171 'gcc': { |
| 172 'all': { | 172 'all': { |
| 173 'CPPDEFINES': ['SUPPORT_UTF8', 'NO_RECURSE', 'SUPPORT_UCP'], | 173 'CPPDEFINES': ['SUPPORT_UTF8', 'NO_RECURSE', 'SUPPORT_UCP'], |
| 174 'WARNINGFLAGS': ['-w'] | 174 'WARNINGFLAGS': ['-w'] |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 'os:linux': { | 212 'os:linux': { |
| 213 'LIBS': ['pthread'], | 213 'LIBS': ['pthread'], |
| 214 }, | 214 }, |
| 215 'os:macos': { | 215 'os:macos': { |
| 216 'LIBS': ['pthread'], | 216 'LIBS': ['pthread'], |
| 217 }, | 217 }, |
| 218 'os:freebsd': { | 218 'os:freebsd': { |
| 219 'LIBS': ['execinfo', 'pthread'] | 219 'LIBS': ['execinfo', 'pthread'] |
| 220 }, | 220 }, |
| 221 'os:win32': { | 221 'os:win32': { |
| 222 'LIBS': ['winmm'] | 222 'LIBS': ['winmm', 'ws2_32'] |
| 223 }, | 223 }, |
| 224 'wordsize:64': { | 224 'wordsize:64': { |
| 225 'CCFLAGS': ['-m32'], | 225 'CCFLAGS': ['-m32'], |
| 226 'LINKFLAGS': ['-m32'] | 226 'LINKFLAGS': ['-m32'] |
| 227 }, | 227 }, |
| 228 }, | 228 }, |
| 229 'msvc': { | 229 'msvc': { |
| 230 'all': { | 230 'all': { |
| 231 'CPPDEFINES': ['_HAS_EXCEPTIONS=0'], | 231 'CPPDEFINES': ['_HAS_EXCEPTIONS=0'], |
| 232 'LIBS': ['winmm'] | 232 'LIBS': ['winmm', 'ws2_32'] |
| 233 }, | 233 }, |
| 234 'library:shared': { | 234 'library:shared': { |
| 235 'CPPDEFINES': ['USING_V8_SHARED'] | 235 'CPPDEFINES': ['USING_V8_SHARED'] |
| 236 } | 236 } |
| 237 } | 237 } |
| 238 } | 238 } |
| 239 | 239 |
| 240 | 240 |
| 241 SAMPLE_FLAGS = { | 241 SAMPLE_FLAGS = { |
| 242 'all': { | 242 'all': { |
| 243 'CPPPATH': [join(abspath('.'), 'include')], | 243 'CPPPATH': [join(abspath('.'), 'include')], |
| 244 'LIBS': ['$LIBRARY'], | 244 'LIBS': ['$LIBRARY'], |
| 245 }, | 245 }, |
| 246 'gcc': { | 246 'gcc': { |
| 247 'all': { | 247 'all': { |
| 248 'LIBPATH': ['.'] | 248 'LIBPATH': ['.'] |
| 249 }, | 249 }, |
| 250 'os:linux': { | 250 'os:linux': { |
| 251 'LIBS': ['pthread'], | 251 'LIBS': ['pthread'], |
| 252 }, | 252 }, |
| 253 'os:macos': { | 253 'os:macos': { |
| 254 'LIBS': ['pthread'], | 254 'LIBS': ['pthread'], |
| 255 }, | 255 }, |
| 256 'os:freebsd': { | 256 'os:freebsd': { |
| 257 'LIBS': ['execinfo', 'pthread'] | 257 'LIBS': ['execinfo', 'pthread'] |
| 258 }, | 258 }, |
| 259 'os:win32': { | 259 'os:win32': { |
| 260 'LIBS': ['winmm'] | 260 'LIBS': ['winmm', 'ws2_32'] |
| 261 }, | 261 }, |
| 262 'wordsize:64': { | 262 'wordsize:64': { |
| 263 'CCFLAGS': ['-m32'], | 263 'CCFLAGS': ['-m32'], |
| 264 'LINKFLAGS': ['-m32'] | 264 'LINKFLAGS': ['-m32'] |
| 265 }, | 265 }, |
| 266 'mode:release': { | 266 'mode:release': { |
| 267 'CCFLAGS': ['-O2'] | 267 'CCFLAGS': ['-O2'] |
| 268 }, | 268 }, |
| 269 'mode:debug': { | 269 'mode:debug': { |
| 270 'CCFLAGS': ['-g', '-O0'] | 270 'CCFLAGS': ['-g', '-O0'] |
| 271 } | 271 } |
| 272 }, | 272 }, |
| 273 'msvc': { | 273 'msvc': { |
| 274 'all': { | 274 'all': { |
| 275 'CCFLAGS': ['/nologo'], | 275 'CCFLAGS': ['/nologo'], |
| 276 'LINKFLAGS': ['/nologo'], | 276 'LINKFLAGS': ['/nologo'], |
| 277 'LIBS': ['winmm'] | 277 'LIBS': ['winmm', 'ws2_32'] |
| 278 }, | 278 }, |
| 279 'library:shared': { | 279 'library:shared': { |
| 280 'CPPDEFINES': ['USING_V8_SHARED'] | 280 'CPPDEFINES': ['USING_V8_SHARED'] |
| 281 }, | 281 }, |
| 282 'prof:on': { | 282 'prof:on': { |
| 283 'LINKFLAGS': ['/MAP'] | 283 'LINKFLAGS': ['/MAP'] |
| 284 }, | 284 }, |
| 285 'mode:release': { | 285 'mode:release': { |
| 286 'CCFLAGS': ['/O2'], | 286 'CCFLAGS': ['/O2'], |
| 287 'LINKFLAGS': ['/OPT:REF', '/OPT:ICF', '/LTCG'], | 287 'LINKFLAGS': ['/OPT:REF', '/OPT:ICF', '/LTCG'], |
| (...skipping 26 matching lines...) Expand all Loading... |
| 314 'os:linux': { | 314 'os:linux': { |
| 315 'LIBS': ['pthread'], | 315 'LIBS': ['pthread'], |
| 316 }, | 316 }, |
| 317 'os:macos': { | 317 'os:macos': { |
| 318 'LIBS': ['pthread'], | 318 'LIBS': ['pthread'], |
| 319 }, | 319 }, |
| 320 'os:freebsd': { | 320 'os:freebsd': { |
| 321 'LIBS': ['pthread'], | 321 'LIBS': ['pthread'], |
| 322 }, | 322 }, |
| 323 'os:win32': { | 323 'os:win32': { |
| 324 'LIBS': ['winmm'], | 324 'LIBS': ['winmm', 'ws2_32'], |
| 325 }, | 325 }, |
| 326 }, | 326 }, |
| 327 'msvc': { | 327 'msvc': { |
| 328 'all': { | 328 'all': { |
| 329 'LIBS': ['winmm'] | 329 'LIBS': ['winmm', 'ws2_32'] |
| 330 } | 330 } |
| 331 } | 331 } |
| 332 } | 332 } |
| 333 | 333 |
| 334 | 334 |
| 335 SUFFIXES = { | 335 SUFFIXES = { |
| 336 'release': '', | 336 'release': '', |
| 337 'debug': '_g' | 337 'debug': '_g' |
| 338 } | 338 } |
| 339 | 339 |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 679 # version of scons. Also, there's a bug in some revisions that | 679 # version of scons. Also, there's a bug in some revisions that |
| 680 # doesn't allow this flag to be set, so we swallow any exceptions. | 680 # doesn't allow this flag to be set, so we swallow any exceptions. |
| 681 # Lovely. | 681 # Lovely. |
| 682 try: | 682 try: |
| 683 SetOption('warn', 'no-deprecated') | 683 SetOption('warn', 'no-deprecated') |
| 684 except: | 684 except: |
| 685 pass | 685 pass |
| 686 | 686 |
| 687 | 687 |
| 688 Build() | 688 Build() |
| OLD | NEW |