Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

Rework a bit appshell gyp files #561

Merged
merged 1 commit into from
Aug 17, 2016
Merged

Rework a bit appshell gyp files #561

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
21 changes: 10 additions & 11 deletions appshell.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
'sources': [
'<@(includes_common)',
'<@(includes_wrapper)',
'<@(appshell_sources_common)',
],
'mac_bundle_resources': [
'<@(appshell_bundle_resources_mac)',
Expand Down Expand Up @@ -200,7 +199,7 @@
],
'copies': [
{
# Add library dependencies to the bundle.
# Add libraries and helper app.
'destination': '<(PRODUCT_DIR)/<(appname).app/Contents/Frameworks',
'files': [
'<(PRODUCT_DIR)/<(appname) Helper.app',
Expand All @@ -209,7 +208,7 @@
],
'postbuilds': [
{
'postbuild_name': 'Add framework',
'postbuild_name': 'Add framework',
'action': [
'cp',
'-Rf',
Expand Down Expand Up @@ -278,7 +277,7 @@
'<@(appshell_sources_mac)',
],
}],
['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
'actions': [
{
'action_name': 'appshell_extensions_js',
Expand Down Expand Up @@ -341,10 +340,6 @@
'files': ['appshell/node-core/'],
},
],
'sources': [
'<@(includes_linux)',
'<@(appshell_sources_linux)',
],
'link_settings': {
'ldflags': [
'<!@(<(pkg-config) --libs-only-other gtk+-2.0 gthread-2.0)',
Expand All @@ -357,6 +352,10 @@
'appshell_extensions_js.o',
],
},
'sources': [
'<@(includes_linux)',
'<@(appshell_sources_linux)',
],
}],
],
},
Expand Down Expand Up @@ -402,7 +401,7 @@
'Debug': {},
},
}],
['OS=="win" and multi_threaded_dll', {
[ 'OS=="win" and multi_threaded_dll', {
'configurations': {
'Common_Base': {
'msvs_configuration_attributes': {
Expand All @@ -426,8 +425,8 @@
},
}
}
}]
]
}],
],
},
],
'conditions': [
Expand Down
56 changes: 30 additions & 26 deletions appshell_paths.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Bring in the autogenerated source file lists.
'deps/cef/cef_paths.gypi',
],
'variables': {
'variables': {
'includes_common': [
'include/base/cef_atomic_ref_count.h',
'include/base/cef_atomicops.h',
Expand Down Expand Up @@ -139,6 +139,8 @@
'libcef_dll/wrapper/libcef_dll_wrapper2.cc',
'<@(autogen_client_side)',
],
'appshell_sources_browser': [
],
'appshell_sources_common': [
'appshell/appshell_extensions.cpp',
'appshell/appshell_extensions.h',
Expand All @@ -162,6 +164,10 @@
'appshell/native_menu_model.h',
'appshell/resource_util.h',
],
'appshell_sources_renderer': [
],
'appshell_sources_resources': [
],
'appshell_sources_win': [
'appshell/appshell_extensions_win.cpp',
'appshell/appshell_node_process_win.cpp',
Expand Down Expand Up @@ -200,6 +206,10 @@
'appshell/res/max-pressed.png',
'appshell/res/min-pressed.png',
'appshell/res/restore-pressed.png',
'<@(appshell_sources_browser)',
'<@(appshell_sources_common)',
'<@(appshell_sources_renderer)',
'<@(appshell_sources_resources)',
],
'appshell_sources_mac': [
'appshell/client_colors_mac.h',
Expand All @@ -223,15 +233,9 @@
'appshell/cefclient_mac.mm',
'appshell/client_handler_mac.mm',
'appshell/resource_util_mac.mm',
],
'appshell_sources_linux': [
'appshell/appshell_extensions_gtk.cpp',
'appshell/appshell_node_process_linux.cpp',
'appshell/client_app_gtk.cpp',
'appshell/cefclient_gtk.cpp',
'appshell/client_handler_gtk.cpp',
'appshell/resource_util_linux.cpp',
],
'<@(appshell_sources_browser)',
'<@(appshell_sources_common)',
],
'appshell_sources_mac_helper': [
'appshell/TrafficLightButton.h',
'appshell/TrafficLightButton.mm',
Expand All @@ -246,28 +250,15 @@
'appshell/FullScreenView.h',
'appshell/FullScreenView.mm',
'appshell/FullScreenViewController.h',
'appshell/FullScreenViewController.mm',
'appshell/appshell_extensions.cpp',
'appshell/appshell_extensions.h',
'appshell/FullScreenViewController.mm',
'appshell/appshell_extensions_mac.mm',
'appshell/appshell_node_process.h',
'appshell/appshell_node_process_internal.h',
'appshell/appshell_node_process.cpp',
'appshell/appshell_node_process_mac.mm',
'appshell/client_app.cpp',
'appshell/client_app.h',
'appshell/client_app_mac.mm',
'appshell/client_app_delegates.cpp',
'appshell/client_handler.cpp',
'appshell/client_handler.h',
'appshell/client_handler_mac.mm',
'appshell/common/client_switches.cc',
'appshell/common/client_switches.h',
'appshell/native_menu_model.cpp',
'appshell/native_menu_model.h',
'appshell/process_helper_mac.cpp',
'appshell/resource_util.h',
'appshell/resource_util_mac.mm',
'<@(appshell_sources_common)',
'<@(appshell_sources_renderer)',
],
'appshell_bundle_resources_mac': [
'appshell/mac/appshell.icns',
Expand Down Expand Up @@ -322,6 +313,18 @@
'appshell/mac/[email protected]',
'appshell/mac/window-fullscreen-inactive.png',
'appshell/mac/[email protected]',
'<@(appshell_sources_resources)',
],
'appshell_sources_linux': [
'appshell/appshell_extensions_gtk.cpp',
'appshell/appshell_node_process_linux.cpp',
'appshell/client_app_gtk.cpp',
'appshell/cefclient_gtk.cpp',
'appshell/client_handler_gtk.cpp',
'appshell/resource_util_linux.cpp',
'<@(appshell_sources_browser)',
'<@(appshell_sources_common)',
'<@(appshell_sources_renderer)',
],
'appshell_bundle_resources_linux': [
'Resources/locales',
Expand All @@ -331,6 +334,7 @@
'appshell/res/appshell256.png',
'Resources/cef.pak',
'Resources/devtools_resources.pak',
'<@(appshell_sources_resources)',
],
'appshell_bundle_libraries_linux': [
'$(BUILDTYPE)/libcef.so',
Expand Down