Changeset 112562 in webkit for trunk/Source/JavaScriptCore/Configurations

Timestamp:

Mar 29, 2012, 12:37:43 PM (13 years ago)

Author:

[email protected]

Message:

Don't use a flattened framework path when building on OS X

Reviewed by Mark Rowe.

• Configurations/ToolExecutable.xcconfig: Use REAL_PLATFORM_NAME

to select different INSTALL_PATH values.

File:

• trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig (modified) (2 diffs)

trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig

@@ -1 @@
-// Copyright (C) 2011 Apple Inc. All rights reserved.
+// Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -22 +22 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-INSTALL_PATH = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources;
+INSTALL_PATH = $(INSTALL_PATH_$(REAL_PLATFORM_NAME));
+INSTALL_PATH_iphoneos = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources;
+INSTALL_PATH_iphonesimulator = $(INSTALL_PATH_iphoneos);
+INSTALL_PATH_macosx = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Versions/A/Resources;
 PRODUCT_NAME = $(TARGET_NAME);