Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

WIP : to get comments #6

Closed
wants to merge 1 commit into from
Closed

WIP : to get comments #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions base/message_loop.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
#include <gdk/gdkx.h>
#endif

/*
#if defined(TOOLKIT_EFL)
// RijuTODO#include <Ecore.h>
#endif
*/

namespace base {

namespace {
Expand Down
2 changes: 1 addition & 1 deletion build/build_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#define OS_LINUX 1
// Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined.
#if !defined(TOOLKIT_VIEWS)
#define TOOLKIT_GTK
#define TOOLKIT_EFL //Riju
#endif
#elif defined(_WIN32)
#define OS_WIN 1
Expand Down
44 changes: 44 additions & 0 deletions build/linux/system.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,50 @@
}],
],
},
{
'target_name': 'efl',
'type': 'none',
'toolsets': ['host', 'target'],
'variables': {
'efl_packages': 'eina evas ecore ecore-evas ecore-file ecore-imf ecore-input ecore-x edje',
},
'conditions': [
['_toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
'<!@(<(pkg-config) --cflags <(efl_packages))',
],
},
'link_settings': {
'ldflags': [
'<!@(<(pkg-config) --libs-only-L --libs-only-other <(efl_packages))',
],
'libraries': [
'<!@(<(pkg-config) --libs-only-l <(efl_packages))',
],
},
}, {
'direct_dependent_settings': {
'cflags': [
'<!@(pkg-config --cflags <(efl_packages))',
],
},
'link_settings': {
'ldflags': [
'<!@(pkg-config --libs-only-L --libs-only-other <(efl_packages))',
],
'libraries': [
'<!@(pkg-config --libs-only-l <(efl_packages))',
],
},
}],
['use_x11==1', {
'link_settings': {
'libraries': [ '-lXtst' ]
}
}],
],
},
{
'target_name': 'pangocairo',
'type': 'none',
Expand Down
11 changes: 11 additions & 0 deletions content/content_browser.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,6 +1154,17 @@
'../dbus/dbus.gyp:dbus',
],
}],
['toolkit_uses_efl == 1', {
'dependencies': [
'../build/linux/system.gyp:dbus',
# For FcLangSetAdd call in render_sandbox_host_linux.cc
'../build/linux/system.gyp:fontconfig',
'../build/linux/system.gyp:efl',
# For XShm* in backing_store_x.cc
'../build/linux/system.gyp:x11',
'../dbus/dbus.gyp:dbus',
],
}],
['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:udev',
Expand Down
5 changes: 5 additions & 0 deletions content/content_renderer.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,11 @@
'../build/linux/system.gyp:gtk',
],
}],
['toolkit_uses_efl == 1', {
'dependencies': [
'../build/linux/system.gyp:efl',
],
}],
['OS=="mac"', {
'sources!': [
'common/process_watcher_posix.cc',
Expand Down
10 changes: 10 additions & 0 deletions content/content_shell.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,16 @@
'<(DEPTH)/build/linux/system.gyp:gtk',
],
}], # toolkit_uses_gtk
['OS == "win" or (toolkit_uses_efl == 1 and selinux == 0)', {
'dependencies': [
'../sandbox/sandbox.gyp:sandbox',
],
}], # OS=="win" or (toolkit_uses_efl == 1 and selinux == 0)
['toolkit_uses_efl == 1', {
'dependencies': [
'<(DEPTH)/build/linux/system.gyp:efl',
],
}], # toolkit_uses_efl
['OS=="mac"', {
'product_name': '<(content_shell_product_name)',
'dependencies!': [
Expand Down
5 changes: 5 additions & 0 deletions content/content_tests.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@
'../sandbox/sandbox.gyp:sandbox',
],
}],
['OS == "win" or (toolkit_uses_efl == 1 and selinux == 0)', {
'dependencies': [
'../sandbox/sandbox.gyp:sandbox',
],
}],
['enable_webrtc==1', {
'sources': [
'renderer/media/mock_media_stream_dependency_factory.cc',
Expand Down