mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-20 23:48:05 +03:00
Rename atom folder to native
This commit is contained in:
parent
f84f9c5dd2
commit
e8aa1524c7
64
atom.gyp
64
atom.gyp
@ -24,7 +24,7 @@
|
||||
'default_configuration': 'Debug',
|
||||
'configurations': {
|
||||
'Debug': {
|
||||
'xcode_config_file': 'atom/mac/debug.xcconfig',
|
||||
'xcode_config_file': 'native/mac/debug.xcconfig',
|
||||
'defines': ['RESOURCE_PATH="$RESOURCE_PATH"'],
|
||||
},
|
||||
'Release': {
|
||||
@ -53,29 +53,29 @@
|
||||
'sources': [
|
||||
'<@(includes_common)',
|
||||
'<@(includes_wrapper)',
|
||||
'atom/main_mac.mm',
|
||||
'atom/atom_application.h',
|
||||
'atom/atom_application.mm',
|
||||
'atom/atom_cef_app.h',
|
||||
'atom/atom_cef_app.mm',
|
||||
'atom/atom_window_controller.h',
|
||||
'atom/atom_window_controller.mm',
|
||||
'atom/atom_cef_client_mac.mm',
|
||||
'atom/atom_cef_client.cpp',
|
||||
'atom/atom_cef_client.h',
|
||||
'atom/util.h',
|
||||
'atom/native_handler.mm',
|
||||
'atom/native_handler.h',
|
||||
'atom/path_watcher.mm',
|
||||
'atom/path_watcher.h',
|
||||
'native/main_mac.mm',
|
||||
'native/atom_application.h',
|
||||
'native/atom_application.mm',
|
||||
'native/atom_cef_app.h',
|
||||
'native/atom_cef_app.mm',
|
||||
'native/atom_window_controller.h',
|
||||
'native/atom_window_controller.mm',
|
||||
'native/atom_cef_client_mac.mm',
|
||||
'native/atom_cef_client.cpp',
|
||||
'native/atom_cef_client.h',
|
||||
'native/util.h',
|
||||
'native/native_handler.mm',
|
||||
'native/native_handler.h',
|
||||
'native/path_watcher.mm',
|
||||
'native/path_watcher.h',
|
||||
],
|
||||
'mac_bundle_resources': [
|
||||
'atom/mac/atom.icns',
|
||||
'atom/mac/English.lproj/MainMenu.xib',
|
||||
'atom/mac/English.lproj/AtomWindow.xib',
|
||||
'native/mac/atom.icns',
|
||||
'native/mac/English.lproj/MainMenu.xib',
|
||||
'native/mac/English.lproj/AtomWindow.xib',
|
||||
],
|
||||
'xcode_settings': {
|
||||
'INFOPLIST_FILE': 'atom/mac/info.plist',
|
||||
'INFOPLIST_FILE': 'native/mac/info.plist',
|
||||
'OTHER_LDFLAGS': ['-Wl,-headerpad_max_install_names'], # Necessary to avoid an "install_name_tool: changing install names or rpaths can't be redone" error.
|
||||
},
|
||||
'conditions': [
|
||||
@ -270,17 +270,17 @@
|
||||
],
|
||||
},
|
||||
'sources': [
|
||||
'atom/atom_cef_app.h',
|
||||
'atom/atom_cef_app.mm',
|
||||
'atom/atom_cef_client_mac.mm',
|
||||
'atom/process_helper_mac.cpp',
|
||||
'atom/atom_cef_client.cpp',
|
||||
'atom/atom_cef_client.h',
|
||||
'atom/util.h',
|
||||
'atom/native_handler.mm',
|
||||
'atom/native_handler.h',
|
||||
'atom/path_watcher.mm',
|
||||
'atom/path_watcher.h',
|
||||
'native/atom_cef_app.h',
|
||||
'native/atom_cef_app.mm',
|
||||
'native/atom_cef_client_mac.mm',
|
||||
'native/process_helper_mac.cpp',
|
||||
'native/atom_cef_client.cpp',
|
||||
'native/atom_cef_client.h',
|
||||
'native/util.h',
|
||||
'native/native_handler.mm',
|
||||
'native/native_handler.h',
|
||||
'native/path_watcher.mm',
|
||||
'native/path_watcher.h',
|
||||
],
|
||||
# TODO(mark): For now, don't put any resources into this app. Its
|
||||
# resources directory will be a symbolic link to the browser app's
|
||||
@ -289,7 +289,7 @@
|
||||
['exclude', '.*'],
|
||||
],
|
||||
'xcode_settings': {
|
||||
'INFOPLIST_FILE': 'atom/mac/helper-info.plist',
|
||||
'INFOPLIST_FILE': 'native/mac/helper-info.plist',
|
||||
'OTHER_LDFLAGS': ['-Wl,-headerpad_max_install_names'], # Necessary to avoid an "install_name_tool: changing install names or rpaths can't be redone" error.
|
||||
},
|
||||
'postbuilds': [
|
||||
|
@ -1,8 +1,8 @@
|
||||
#import "include/cef_application_mac.h"
|
||||
#import "atom/atom_cef_client.h"
|
||||
#import "atom/atom_application.h"
|
||||
#import "atom/atom_window_controller.h"
|
||||
#import "atom/atom_cef_app.h"
|
||||
#import "native/atom_cef_client.h"
|
||||
#import "native/atom_application.h"
|
||||
#import "native/atom_window_controller.h"
|
||||
#import "native/atom_cef_app.h"
|
||||
|
||||
@implementation AtomApplication
|
||||
|
@ -7,7 +7,7 @@
|
||||
#include "include/cef_path_util.h"
|
||||
#include "include/cef_process_util.h"
|
||||
#include "include/cef_runnable.h"
|
||||
#include "atom/atom_cef_client.h"
|
||||
#include "native/atom_cef_client.h"
|
||||
|
||||
AtomCefClient::AtomCefClient(){
|
||||
|
@ -9,7 +9,7 @@
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include "include/cef_client.h"
|
||||
#include "atom/util.h"
|
||||
#include "native/util.h"
|
||||
|
||||
|
||||
// AtomCefClient implementation.
|
@ -1,4 +1,4 @@
|
||||
#import <AppKit/AppKit.h>
|
||||
#import "include/cef_browser.h"
|
||||
#import "include/cef_frame.h"
|
||||
#import "atom/atom_cef_client.h"
|
||||
#import "native/atom_cef_client.h"
|
@ -1,6 +1,6 @@
|
||||
#import "include/cef_application_mac.h"
|
||||
#import "atom/atom_cef_client.h"
|
||||
#import "atom/atom_window_controller.h"
|
||||
#import "native/atom_cef_client.h"
|
||||
#import "native/atom_window_controller.h"
|
||||
|
||||
@implementation AtomWindowController
|
||||
|
@ -1,5 +1,5 @@
|
||||
#import "include/cef_application_mac.h"
|
||||
#import "atom/atom_application.h"
|
||||
#import "native/atom_application.h"
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
@autoreleasepool {
|
Loading…
Reference in New Issue
Block a user