| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 | 6 |
| 7 Import('env') | 7 Import('env') |
| 8 | 8 |
| 9 | 9 |
| 10 if env.CrossToolsBuild(): | 10 if env.CrossToolsBuild(): |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 | 38 |
| 39 | 39 |
| 40 sdl_multimedia_srcs = [] | 40 sdl_multimedia_srcs = [] |
| 41 if env.Bit('sdl_sel_universal'): | 41 if env.Bit('sdl_sel_universal'): |
| 42 if env.Bit('host_linux'): | 42 if env.Bit('host_linux'): |
| 43 EnvSDLUpdateLinux(env) | 43 EnvSDLUpdateLinux(env) |
| 44 else: | 44 else: |
| 45 ErrorUnsupportedPlatform(env) | 45 ErrorUnsupportedPlatform(env) |
| 46 | 46 |
| 47 sdl_multimedia_srcs += ['sdl_ppapi_event_translator.cc', | 47 sdl_multimedia_srcs += ['sdl_ppapi_event_translator.cc', |
| 48 'multimedia_sdl.cc', | 48 'primitives_sdl.cc', |
| 49 'multimedia_handler.cc', | 49 'non_standard_pepper_events.cc', |
| 50 'pepper_emu_handler.cc', |
| 50 'pepper_emu_fileio.cc', | 51 'pepper_emu_fileio.cc', |
| 51 'pepper_emu_core.cc', | 52 'pepper_emu_core.cc', |
| 52 'pepper_emu_postmessage.cc', | 53 'pepper_emu_postmessage.cc', |
| 53 ] | 54 ] |
| 54 | 55 |
| 55 | 56 |
| 56 # NOTE: Probably because of GetPluginDir() | 57 # NOTE: Probably because of GetPluginDir() |
| 57 if env.Bit('linux') and env.Bit('target_x86'): | 58 if env.Bit('linux') and env.Bit('target_x86'): |
| 58 env.Append(LIBS=['dl']) | 59 env.Append(LIBS=['dl']) |
| 59 | 60 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 74 'nrd_xfer', | 75 'nrd_xfer', |
| 75 'nacl_base', | 76 'nacl_base', |
| 76 'platform', | 77 'platform', |
| 77 'gio', | 78 'gio', |
| 78 'imc', | 79 'imc', |
| 79 'env_cleanser', | 80 'env_cleanser', |
| 80 'nacl_error_code', | 81 'nacl_error_code', |
| 81 ], | 82 ], |
| 82 FRAMEWORKS=['Cocoa'], | 83 FRAMEWORKS=['Cocoa'], |
| 83 ) | 84 ) |
| OLD | NEW |