diff options
Diffstat (limited to 'src/plugins/platforms/pepper/pepper.js.pri')
-rw-r--r-- | src/plugins/platforms/pepper/pepper.js.pri | 52 |
1 files changed, 41 insertions, 11 deletions
diff --git a/src/plugins/platforms/pepper/pepper.js.pri b/src/plugins/platforms/pepper/pepper.js.pri index 0b3a557f81..43472e3a76 100644 --- a/src/plugins/platforms/pepper/pepper.js.pri +++ b/src/plugins/platforms/pepper/pepper.js.pri @@ -2,8 +2,12 @@ PPAPI_CPP_SOURCE= $$(NACL_SDK_ROOT)/src/ppapi_cpp SOURCES += \ $${PPAPI_CPP_SOURCE}/array_output.cc \ - $${PPAPI_CPP_SOURCE}/audio.cc \ + $${PPAPI_CPP_SOURCE}/audio_buffer.cc \ $${PPAPI_CPP_SOURCE}/audio_config.cc \ + $${PPAPI_CPP_SOURCE}/audio_encoder.cc \ + $${PPAPI_CPP_SOURCE}/audio.cc \ + $${PPAPI_CPP_SOURCE}/compositor_layer.cc \ + $${PPAPI_CPP_SOURCE}/compositor.cc \ $${PPAPI_CPP_SOURCE}/core.cc \ $${PPAPI_CPP_SOURCE}/cursor_control_dev.cc \ $${PPAPI_CPP_SOURCE}/directory_entry.cc \ @@ -14,14 +18,16 @@ SOURCES += \ $${PPAPI_CPP_SOURCE}/font_dev.cc \ $${PPAPI_CPP_SOURCE}/fullscreen.cc \ $${PPAPI_CPP_SOURCE}/graphics_2d.cc \ - $${PPAPI_CPP_SOURCE}/graphics_3d.cc \ $${PPAPI_CPP_SOURCE}/graphics_3d_client.cc \ + $${PPAPI_CPP_SOURCE}/graphics_3d.cc \ $${PPAPI_CPP_SOURCE}/host_resolver.cc \ $${PPAPI_CPP_SOURCE}/image_data.cc \ $${PPAPI_CPP_SOURCE}/input_event.cc \ - $${PPAPI_CPP_SOURCE}/instance.cc \ $${PPAPI_CPP_SOURCE}/instance_handle.cc \ + $${PPAPI_CPP_SOURCE}/instance.cc \ $${PPAPI_CPP_SOURCE}/lock.cc \ + $${PPAPI_CPP_SOURCE}/media_stream_audio_track.cc \ + $${PPAPI_CPP_SOURCE}/media_stream_video_track.cc \ $${PPAPI_CPP_SOURCE}/memory_dev.cc \ $${PPAPI_CPP_SOURCE}/message_loop.cc \ $${PPAPI_CPP_SOURCE}/module.cc \ @@ -38,7 +44,6 @@ SOURCES += \ $${PPAPI_CPP_SOURCE}/rect.cc \ $${PPAPI_CPP_SOURCE}/resource.cc \ $${PPAPI_CPP_SOURCE}/scriptable_object_deprecated.cc \ - $${PPAPI_CPP_SOURCE}/selection_dev.cc \ $${PPAPI_CPP_SOURCE}/simple_thread.cc \ $${PPAPI_CPP_SOURCE}/tcp_socket.cc \ $${PPAPI_CPP_SOURCE}/text_input_controller.cc \ @@ -47,17 +52,18 @@ SOURCES += \ $${PPAPI_CPP_SOURCE}/url_loader.cc \ $${PPAPI_CPP_SOURCE}/url_request_info.cc \ $${PPAPI_CPP_SOURCE}/url_response_info.cc \ - $${PPAPI_CPP_SOURCE}/var.cc \ - $${PPAPI_CPP_SOURCE}/var_array.cc \ $${PPAPI_CPP_SOURCE}/var_array_buffer.cc \ + $${PPAPI_CPP_SOURCE}/var_array.cc \ $${PPAPI_CPP_SOURCE}/var_dictionary.cc \ - $${PPAPI_CPP_SOURCE}/view.cc \ + $${PPAPI_CPP_SOURCE}/var.cc \ + $${PPAPI_CPP_SOURCE}/video_decoder.cc \ + $${PPAPI_CPP_SOURCE}/video_encoder.cc \ + $${PPAPI_CPP_SOURCE}/video_frame.cc \ $${PPAPI_CPP_SOURCE}/view_dev.cc \ - $${PPAPI_CPP_SOURCE}/websocket.cc \ + $${PPAPI_CPP_SOURCE}/view.cc \ $${PPAPI_CPP_SOURCE}/websocket_api.cc \ - $${PPAPI_CPP_SOURCE}/zoom_dev.cc \ - $${PPAPI_CPP_SOURCE}/media_stream_video_track.cc \ - $${PPAPI_CPP_SOURCE}/video_frame.cc \ + $${PPAPI_CPP_SOURCE}/websocket.cc + # libppapi (stub) SOURCES += \ @@ -65,8 +71,32 @@ SOURCES += \ # rest of libppapi is implemented in JavasScript and added to the build # with '--pre-js' at link time. +!emscripten { +# Emscripten provides a better GLES2 API directly than pepper.js +# TODO Consider adding back this when pepper.js has better GLES2 support # OpenGL PPAPI_GLES_SOURCE= $$(NACL_SDK_ROOT)/src/ppapi_gles2 SOURCES +=\ $${PPAPI_GLES_SOURCE}/gles2.c \ $${PPAPI_GLES_SOURCE}/gl2ext_ppapi.c \ + +} + +OTHER_FILES += \ + $$PWD/3rdparty/pepper.js/audio.js \ + $$PWD/3rdparty/pepper.js/base.js \ + $$PWD/3rdparty/pepper.js/common.js \ + $$PWD/3rdparty/pepper.js/file.js \ + $$PWD/3rdparty/pepper.js/gles.js \ + $$PWD/3rdparty/pepper.js/gles_ext.js \ + $$PWD/3rdparty/pepper.js/graphics_2d.js \ + $$PWD/3rdparty/pepper.js/graphics_3d.js \ + $$PWD/3rdparty/pepper.js/input_events.js \ + $$PWD/3rdparty/pepper.js/loadnacl.js \ + $$PWD/3rdparty/pepper.js/mouse_lock.js \ + $$PWD/3rdparty/pepper.js/ppapi_preamble.js \ + $$PWD/3rdparty/pepper.js/testing.js \ + $$PWD/3rdparty/pepper.js/url_loader.js \ + $$PWD/3rdparty/pepper.js/view.js \ + $$PWD/3rdparty/pepper.js/web_socket.js \ + $$PWD/3rdparty/pepper.js/LICENSE |