github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

better LOAD_RESOURCES_FROM_DIR macro detection in atom.mm

Browse Source
This commit is contained in:
Corey Johnson
2012-05-16 14:31:51 -07:00
parent 295f2ac19a
commit e20d2dd9cb
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Atom.xcodeproj/project.pbxproj
View File

@@ -1056,7 +1056,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"LOAD_RESOURCES_FROM_DIR=\"\\\"$LOAD_RESOURCES_FROM_DIR\\\"\"",
"\"LOAD_RESOURCES_FROM_DIR=$LOAD_RESOURCES_FROM_DIR\"",
"\"ENABLE_REMOTING=1\"",
"\"ENABLE_P2P_APIS=1\"",
"\"ENABLE_CONFIGURATION_POLICY\"",
@@ -1092,7 +1092,7 @@
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PREPROCESSOR_DEFINITIONS = (
"LOAD_RESOURCES_FROM_DIR=\"\\\"$LOAD_RESOURCES_FROM_DIR\\\"\"",
"\"LOAD_RESOURCES_FROM_DIR=$LOAD_RESOURCES_FROM_DIR\"",
"\"CHROMIUM_BUILD\"",
"\"ENABLE_REMOTING=1\"",
"\"ENABLE_P2P_APIS=1\"",

7
Atom/src/Atom.mm
View File

@@ -112,9 +112,10 @@
CefRefPtr<CefV8Value> atom = CefV8Value::CreateObject(NULL, NULL);
global->SetValue("atom", atom, V8_PROPERTY_ATTRIBUTE_NONE);
#ifdef LOAD_RESOURCES_FROM_DIR
char path[] = LOAD_RESOURCES_FROM_DIR;
#define STR_VALUE(arg) #arg
#if defined(LOAD_RESOURCES_FROM_DIR)
char path[] = STR_VALUE(LOAD_RESOURCES_FROM_DIR);
#else
const char *path = [[[NSBundle mainBundle] resourcePath] UTF8String];
#endif