diff --git a/app/win/atom.rc b/app/win/atom.rc new file mode 100644 index 00000000000..d1fcc133a08 Binary files /dev/null and b/app/win/atom.rc differ diff --git a/app/win/resource.h b/app/win/resource.h new file mode 100644 index 00000000000..3ccb12bf00f --- /dev/null +++ b/app/win/resource.h @@ -0,0 +1,14 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by brightray_example.rc + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/atom.gyp b/atom.gyp index 5b92c9395a1..d89a8f10b04 100644 --- a/atom.gyp +++ b/atom.gyp @@ -4,7 +4,6 @@ 'product_name': 'Atom', 'app_sources': [ 'app/atom_main.cc', - '<(libchromiumcontent_src_dir)/content/app/startup_helper_win.cc', ], 'bundle_sources': [ 'browser/mac/atom.icns', @@ -155,6 +154,15 @@ 'app/atom_library_main.cc', 'app/atom_library_main.h', ], + 'conditions': [ + ['OS=="win"', { + 'app_sources': [ + 'app/win/resource.h', + 'app/win/atom.rc', + '<(libchromiumcontent_src_dir)/content/app/startup_helper_win.cc', + ], + }], # OS=="win" + ], 'fix_framework_link_command': [ 'install_name_tool', '-change', @@ -183,9 +191,6 @@ 'sources': [ '<@(app_sources)', ], - 'mac_bundle_resources': [ - '<@(bundle_sources)', - ], 'include_dirs': [ '.', ], @@ -206,6 +211,9 @@ '@executable_path/../Frameworks', ], }, + 'mac_bundle_resources': [ + '<@(bundle_sources)', + ], 'copies': [ { 'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Frameworks', @@ -254,7 +262,31 @@ ], }, ] - }], + }], # OS=="mac" + ['OS=="win"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '<(libchromiumcontent_library_dir)/chromiumcontent.dll', + '<(libchromiumcontent_library_dir)/icudt.dll', + '<(libchromiumcontent_library_dir)/libGLESv2.dll', + ], + }, + { + 'destination': '<(PRODUCT_DIR)/resources/browser', + 'files': [ + 'browser/default_app', + ] + }, + { + 'destination': '<(PRODUCT_DIR)/resources', + 'files': [ + 'node/node.exe', + ] + }, + ], + }], # OS=="win" ], }, { @@ -293,14 +325,29 @@ 'inputs': [ 'script/compile-coffee.py', ], - 'outputs': [ - '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', - ], - 'action': [ - 'python', - 'script/compile-coffee.py', - '<(RULE_INPUT_PATH)', - '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', + 'conditions': [ + ['OS=="mac"', { + 'outputs': [ + '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', + ], + 'action': [ + 'python', + 'script/compile-coffee.py', + '<(RULE_INPUT_PATH)', + '<(PRODUCT_DIR)/<(product_name).app/Contents/Resources/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', + ], + }], # OS=="mac" + ['OS=="win"', { + 'outputs': [ + '<(PRODUCT_DIR)/resources/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', + ], + 'action': [ + 'python', + 'script/compile-coffee.py', + '<(RULE_INPUT_PATH)', + '<(PRODUCT_DIR)/resources/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).js', + ], + }], # OS=="win" ], }, ],