Title: [112562] trunk/Source/_javascript_Core
- Revision
- 112562
- Author
- [email protected]
- Date
- 2012-03-29 12:37:43 -0700 (Thu, 29 Mar 2012)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (112561 => 112562)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-29 19:29:53 UTC (rev 112561)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-29 19:37:43 UTC (rev 112562)
@@ -1,3 +1,12 @@
+2012-03-29 David Kilzer <[email protected]>
+
+ 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.
+
2012-03-29 Kevin Ollivier <[email protected]>
[wx] Unreviewed build fix, add Win-specific sources
Modified: trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig (112561 => 112562)
--- trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2012-03-29 19:29:53 UTC (rev 112561)
+++ trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2012-03-29 19:37:43 UTC (rev 112562)
@@ -1,4 +1,4 @@
-// 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
// modification, are permitted provided that the following conditions
@@ -21,7 +21,10 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Resources;
+INSTALL_PATH = $(INSTALL_PATH_$(REAL_PLATFORM_NAME));
+INSTALL_PATH_iphoneos = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Resources;
+INSTALL_PATH_iphonesimulator = $(INSTALL_PATH_iphoneos);
+INSTALL_PATH_macosx = $(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/Versions/A/Resources;
PRODUCT_NAME = $(TARGET_NAME);
SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
