From 67b2aeaae97fbfa3f2d1bc8a2296795dab1bbfeb Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Wed, 13 Feb 2013 13:09:35 -0800 Subject: [PATCH] Remove RESOURCE_PATH macro --- atom.gyp | 2 +- native/atom_application.mm | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/atom.gyp b/atom.gyp index b52c5b3ac..c96574d2b 100644 --- a/atom.gyp +++ b/atom.gyp @@ -25,7 +25,7 @@ 'default_configuration': 'Debug', 'configurations': { 'Debug': { - 'defines': ['DEBUG=1', 'RESOURCE_PATH="$PROJECT_DIR"'], + 'defines': ['DEBUG=1'], 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL' : '0' }, }, 'Release': { diff --git a/native/atom_application.mm b/native/atom_application.mm index 1e36ce37d..48721fc62 100644 --- a/native/atom_application.mm +++ b/native/atom_application.mm @@ -25,10 +25,6 @@ + (NSDictionary *)parseArguments:(char **)argv count:(int)argc { NSMutableDictionary *arguments = [[NSMutableDictionary alloc] init]; - #ifdef RESOURCE_PATH - [arguments setObject:[NSString stringWithUTF8String:RESOURCE_PATH] forKey:@"resource-path"]; - #endif - // Remove non-posix (i.e. -long_argument_with_one_leading_hyphen) added by OS X from the command line int cleanArgc = argc; size_t argvSize = argc * sizeof(char *); @@ -210,12 +206,6 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification { if (!_filesOpened && [self shouldOpenFiles]) { NSString *path = [self.arguments objectForKey:@"path"]; - - // Just a hack to open the Atom src by default when we run from xcode - #ifdef RESOURCE_PATH - if (!path) path = [NSString stringWithUTF8String:RESOURCE_PATH]; - #endif - NSNumber *pid = [self.arguments objectForKey:@"wait"] ? [self.arguments objectForKey:@"pid"] : nil; [self open:path pidToKillWhenWindowCloses:pid]; }