| OLD | NEW |
| 1 # Copyright 2008, Google Inc. | 1 # Copyright 2008, Google Inc. |
| 2 # All rights reserved. | 2 # All rights reserved. |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 env_stray.Append(CPPDEFINES = ["U_COMMON_IMPLEMENTATION"]) | 347 env_stray.Append(CPPDEFINES = ["U_COMMON_IMPLEMENTATION"]) |
| 348 stray_object_files = [env_stray.Object(i) for i in common_implementation_files] | 348 stray_object_files = [env_stray.Object(i) for i in common_implementation_files] |
| 349 | 349 |
| 350 | 350 |
| 351 # On Windows the ICU data is built into a DLL. On Linux, install the .dat file. | 351 # On Windows the ICU data is built into a DLL. On Linux, install the .dat file. |
| 352 if env['PLATFORM'] == 'win32': | 352 if env['PLATFORM'] == 'win32': |
| 353 icu_data = env.Install('$OBJ_ROOT', 'icudt38.dll') | 353 icu_data = env.Install('$OBJ_ROOT', 'icudt38.dll') |
| 354 else: | 354 else: |
| 355 icu_data = env.Install('$OBJ_ROOT', 'source/data/in/icudt38l.dat') | 355 icu_data = env.Install('$OBJ_ROOT', 'source/data/in/icudt38l.dat') |
| 356 | 356 |
| 357 icu_lib = env.ChromeStaticLibrary('icuuc', cpp_object_files + | 357 icu_lib = env.ChromeStaticLibrary('icu', cpp_object_files + |
| 358 c_object_files + | 358 c_object_files + |
| 359 stray_object_files) | 359 stray_object_files) |
| 360 | 360 |
| 361 # The ICU library isn't useful without the data properly installed. | 361 # The ICU library isn't useful without the data properly installed. |
| 362 env.Requires(icu_lib, icu_data) | 362 env.Requires(icu_lib, icu_data) |
| OLD | NEW |