From 1d615c357614d339c0d81fd787bf2aa271d5ea0d Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Wed, 16 May 2012 15:08:16 -0700 Subject: [PATCH] Preprocessor can't distinguish between a macro that is defined with a value, and one that is simply defined. So I removed the LOAD_RESOURCES_FROM_DIR from the release build --- Atom.xcodeproj/project.pbxproj | 3 +-- Atom/src/Atom.mm | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Atom.xcodeproj/project.pbxproj b/Atom.xcodeproj/project.pbxproj index f149117c9..bc3f9d849 100644 --- a/Atom.xcodeproj/project.pbxproj +++ b/Atom.xcodeproj/project.pbxproj @@ -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,6 @@ GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_OPTIMIZATION_LEVEL = 3; GCC_PREPROCESSOR_DEFINITIONS = ( - "\"LOAD_RESOURCES_FROM_DIR=$LOAD_RESOURCES_FROM_DIR\"", "\"CHROMIUM_BUILD\"", "\"ENABLE_REMOTING=1\"", "\"ENABLE_P2P_APIS=1\"", diff --git a/Atom/src/Atom.mm b/Atom/src/Atom.mm index ad3a0eaea..7b563e796 100755 --- a/Atom/src/Atom.mm +++ b/Atom/src/Atom.mm @@ -113,9 +113,9 @@ CefRefPtr atom = CefV8Value::CreateObject(NULL, NULL); global->SetValue("atom", atom, V8_PROPERTY_ATTRIBUTE_NONE); -#define STR_VALUE(arg) #arg -#if defined(LOAD_RESOURCES_FROM_DIR) - char path[] = STR_VALUE(LOAD_RESOURCES_FROM_DIR); + +#ifdef LOAD_RESOURCES_FROM_DIR + char path[] = LOAD_RESOURCES_FROM_DIR; #else const char *path = [[[NSBundle mainBundle] resourcePath] UTF8String]; #endif