bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove variable references from cef_path2.gypi to fix VS project generation with GN (issue #1403)

This commit is contained in:
Marshall Greenblatt 2016-07-20 17:19:44 -04:00
parent 88a8dad9c9
commit f2f76a0a20
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cef.gyp
View File

@ -18,6 +18,7 @@
},
'includes': [
# Bring in the source file lists.
'cef_paths.gypi',
'cef_paths2.gypi',
],
'targets': [
@ -37,10 +38,12 @@
],
'sources': [
'<@(includes_common)',
'<@(autogen_cpp_includes)',
'<@(includes_wrapper)',
],
'mac_bundle_resources': [
'<@(cefclient_bundle_resources_mac)',
'<@(cefclient_sources_resources)',
],
'mac_bundle_resources!': [
# TODO(mark): Come up with a fancier way to do this (mac_info_plist?)
@ -97,6 +100,10 @@
'sources': [
'<@(includes_win)',
'<@(cefclient_sources_win)',
'<@(cefclient_sources_browser)',
'<@(cefclient_sources_common)',
'<@(cefclient_sources_renderer)',
'<@(cefclient_sources_resources)',
],
}],
[ 'OS=="mac"', {
@ -162,6 +169,8 @@
'sources': [
'<@(includes_mac)',
'<@(cefclient_sources_mac)',
'<@(cefclient_sources_browser)',
'<@(cefclient_sources_common)',
],
}],
[ '(OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_sysroot==0', {
@ -181,12 +190,15 @@
'sources': [
'<@(includes_linux)',
'<@(cefclient_sources_linux)',
'<@(cefclient_sources_browser)',
'<@(cefclient_sources_common)',
'<@(cefclient_sources_renderer)',
],
'copies': [
{
'destination': '<(PRODUCT_DIR)/files',
'files': [
'<@(cefclient_bundle_resources_linux)',
'<@(cefclient_sources_resources)',
],
},
],
@ -209,6 +221,7 @@
],
'sources': [
'<@(includes_common)',
'<@(autogen_cpp_includes)',
'<@(includes_wrapper)',
'<@(cefsimple_sources_common)',
],
@ -620,10 +633,13 @@
],
'sources': [
'<@(includes_common)',
'<@(autogen_cpp_includes)',
'<@(includes_capi)',
'<@(autogen_capi_includes)',
'<@(includes_wrapper)',
'<@(libcef_dll_wrapper_sources_base)',
'<@(libcef_dll_wrapper_sources_common)',
'<@(autogen_client_side)',
],
'conditions': [
[ 'OS=="mac"', {
@ -660,9 +676,12 @@
],
'sources': [
'<@(includes_common)',
'<@(autogen_cpp_includes)',
'<@(includes_capi)',
'<@(autogen_capi_includes)',
'<@(includes_wrapper)',
'<@(libcef_dll_wrapper_sources_common)',
'<@(autogen_client_side)',
],
'conditions': [
[ 'OS=="mac"', {
@ -1017,6 +1036,7 @@
],
'sources': [
'<@(includes_common)',
'<@(autogen_cpp_includes)',
'libcef/browser/browser_context.cc',
'libcef/browser/browser_context.h',
'libcef/browser/browser_context_impl.cc',
@ -1571,8 +1591,11 @@
],
'sources': [
'<@(includes_common)',
'<@(autogen_cpp_includes)',
'<@(includes_capi)',
'<@(autogen_capi_includes)',
'<@(libcef_sources_common)',
'<@(autogen_library_side)',
],
'postbuilds': [
{
@ -1627,6 +1650,8 @@
},
'sources': [
'<@(cefclient_sources_mac_helper)',
'<@(cefclient_sources_common)',
'<@(cefclient_sources_renderer)',
],
# TODO(mark): Come up with a fancier way to do this. It should only
# be necessary to list helper-Info.plist once, not the three times it
@ -1877,8 +1902,11 @@
],
'sources': [
'<@(includes_common)',
'<@(autogen_cpp_includes)',
'<@(includes_capi)',
'<@(autogen_capi_includes)',
'<@(libcef_sources_common)',
'<@(autogen_library_side)',
],
'conditions': [
['OS=="win"', {

23
cef_paths2.gypi
View File

@ -3,10 +3,6 @@
# can be found in the LICENSE file.
{
'includes': [
# Bring in the autogenerated source file lists.
'cef_paths.gypi',
],
'variables': {
'includes_common': [
'include/base/cef_atomic_ref_count.h',
@ -55,11 +51,9 @@
'include/internal/cef_trace_event_internal.h',
'include/internal/cef_types.h',
'include/internal/cef_types_wrappers.h',
'<@(autogen_cpp_includes)',
],
'includes_capi': [
'include/capi/cef_base_capi.h',
'<@(autogen_capi_includes)',
],
'includes_wrapper': [
'include/wrapper/cef_byte_read_handler.h',
@ -102,7 +96,6 @@
'libcef_dll/transfer_util.cc',
'libcef_dll/transfer_util.h',
'libcef_dll/wrapper_types.h',
'<@(autogen_library_side)',
],
'libcef_dll_wrapper_sources_base': [
'libcef_dll/base/cef_atomicops_x86_gcc.cc',
@ -136,7 +129,6 @@
'libcef_dll/wrapper/cef_zip_archive.cc',
'libcef_dll/wrapper/libcef_dll_wrapper.cc',
'libcef_dll/wrapper/libcef_dll_wrapper2.cc',
'<@(autogen_client_side)',
],
'cefclient_sources_browser': [
'tests/cefclient/browser/binding_test.cc',
@ -274,10 +266,6 @@
'tests/cefclient/resources/win/cefclient.ico',
'tests/cefclient/resources/win/cefclient.rc',
'tests/cefclient/resources/win/small.ico',
'<@(cefclient_sources_browser)',
'<@(cefclient_sources_common)',
'<@(cefclient_sources_renderer)',
'<@(cefclient_sources_resources)',
],
'cefclient_sources_mac': [
'tests/cefclient/browser/browser_window_osr_mac.h',
@ -295,20 +283,15 @@
'tests/cefclient/browser/window_test_runner_mac.h',
'tests/cefclient/browser/window_test_runner_mac.mm',
'tests/cefclient/cefclient_mac.mm',
'<@(cefclient_sources_browser)',
'<@(cefclient_sources_common)',
],
'cefclient_sources_mac_helper': [
'tests/cefclient/process_helper_mac.cc',
'<@(cefclient_sources_common)',
'<@(cefclient_sources_renderer)',
],
'cefclient_bundle_resources_mac': [
'tests/cefclient/resources/mac/cefclient.icns',
'tests/cefclient/resources/mac/English.lproj/InfoPlist.strings',
'tests/cefclient/resources/mac/English.lproj/MainMenu.xib',
'tests/cefclient/resources/mac/Info.plist',
'<@(cefclient_sources_resources)',
],
'cefclient_sources_linux': [
'tests/cefclient/browser/browser_window_osr_gtk.cc',
@ -336,12 +319,6 @@
'tests/cefclient/browser/window_test_runner_views.cc',
'tests/cefclient/browser/window_test_runner_views.h',
'tests/cefclient/cefclient_gtk.cc',
'<@(cefclient_sources_browser)',
'<@(cefclient_sources_common)',
'<@(cefclient_sources_renderer)',
],
'cefclient_bundle_resources_linux': [
'<@(cefclient_sources_resources)',
],
'cefsimple_sources_common': [
'tests/cefsimple/simple_app.cc',