From 6cf1744c826cc0fa091d30cfb451f0c2de1c4892 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 29 Mar 2012 15:24:13 -0700 Subject: [PATCH] Release build uses the bundle resource as the load path --- Atom.xcodeproj/project.pbxproj | 1 - Atom/src/Atom.mm | 11 ++++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Atom.xcodeproj/project.pbxproj b/Atom.xcodeproj/project.pbxproj index 122a47d2d..0ea955686 100644 --- a/Atom.xcodeproj/project.pbxproj +++ b/Atom.xcodeproj/project.pbxproj @@ -865,7 +865,6 @@ GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_OPTIMIZATION_LEVEL = 3; GCC_PREPROCESSOR_DEFINITIONS = ( - "PROJECT_DIR=\"\\\"$PROJECT_DIR\\\"\"", "\"CHROMIUM_BUILD\"", "\"ENABLE_REMOTING=1\"", "\"ENABLE_P2P_APIS=1\"", diff --git a/Atom/src/Atom.mm b/Atom/src/Atom.mm index b3f2449ed..b9acc466a 100755 --- a/Atom/src/Atom.mm +++ b/Atom/src/Atom.mm @@ -81,7 +81,6 @@ callback(context, global); context->Exit(); - } - (CefRefPtr)atomContext { @@ -108,8 +107,14 @@ CefRefPtr atom = CefV8Value::CreateObject(NULL); global->SetValue("atom", atom, V8_PROPERTY_ATTRIBUTE_NONE); - - CefRefPtr loadPath = CefV8Value::CreateString(PROJECT_DIR); + +#ifdef DEBUG + char path[] = PROJECT_DIR; +#else + const char *path = [[[NSBundle mainBundle] resourcePath] UTF8String]; +#endif + + CefRefPtr loadPath = CefV8Value::CreateString(path); atom->SetValue("loadPath", loadPath, V8_PROPERTY_ATTRIBUTE_NONE); }]; }