diff options
Diffstat (limited to 'JavaScriptGlue')
| -rw-r--r-- | JavaScriptGlue/ChangeLog | 19 | ||||
| -rw-r--r-- | JavaScriptGlue/Configurations/Base.xcconfig | 2 | ||||
| -rw-r--r-- | JavaScriptGlue/Configurations/DebugRelease.xcconfig | 9 | ||||
| -rw-r--r-- | JavaScriptGlue/Configurations/Version.xcconfig | 4 |
4 files changed, 27 insertions, 7 deletions
diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog index 9be5063..c74b808 100644 --- a/JavaScriptGlue/ChangeLog +++ b/JavaScriptGlue/ChangeLog @@ -1,8 +1,21 @@ -2009-02-03 Mark Rowe <mrowe@apple.com> +2009-03-13 Mark Rowe <mrowe@apple.com> - Merge r40345. + Rubber-stamped by Dan Bernstein. + + Take advantage of the ability of recent versions of Xcode to easily switch the active + architecture. + + * Configurations/DebugRelease.xcconfig: + +2009-02-24 Mark Rowe <mrowe@apple.com> + + Rubber-stamped by Dan Bernstein. + + <rdar://problem/6407844> JavaScriptGlue should use -Os rather than -O2 + + * Configurations/Base.xcconfig: - 2009-01-28 Sam Weinig <sam@webkit.org> +2009-01-28 Sam Weinig <sam@webkit.org> Reviewed by Gavin Barraclough. diff --git a/JavaScriptGlue/Configurations/Base.xcconfig b/JavaScriptGlue/Configurations/Base.xcconfig index 0494d8e..c7eee79 100644 --- a/JavaScriptGlue/Configurations/Base.xcconfig +++ b/JavaScriptGlue/Configurations/Base.xcconfig @@ -40,7 +40,7 @@ DEBUG_DEFINES_normal = NDEBUG; DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT)); GCC_OPTIMIZATION_LEVEL = $(GCC_OPTIMIZATION_LEVEL_$(CURRENT_VARIANT)); -GCC_OPTIMIZATION_LEVEL_normal = 2; +GCC_OPTIMIZATION_LEVEL_normal = s; GCC_OPTIMIZATION_LEVEL_debug = 0; STRIP_INSTALLED_PRODUCT = $(STRIP_INSTALLED_PRODUCT_$(CURRENT_VARIANT)); diff --git a/JavaScriptGlue/Configurations/DebugRelease.xcconfig b/JavaScriptGlue/Configurations/DebugRelease.xcconfig index cbb2933..a9c39aa 100644 --- a/JavaScriptGlue/Configurations/DebugRelease.xcconfig +++ b/JavaScriptGlue/Configurations/DebugRelease.xcconfig @@ -1,5 +1,12 @@ #include "Base.xcconfig" -ARCHS = $(NATIVE_ARCH); + +ARCHS = $(ARCHS_$(MAC_OS_X_VERSION_MAJOR)); +ARCHS_ = $(ARCHS_1040); +ARCHS_1040 = $(NATIVE_ARCH); +ARCHS_1050 = $(NATIVE_ARCH); +ARCHS_1060 = $(ARCHS_STANDARD_32_64_BIT); + +ONLY_ACTIVE_ARCH = YES; MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR)); MACOSX_DEPLOYMENT_TARGET_ = 10.4; diff --git a/JavaScriptGlue/Configurations/Version.xcconfig b/JavaScriptGlue/Configurations/Version.xcconfig index 16a349c..ab0aa9b 100644 --- a/JavaScriptGlue/Configurations/Version.xcconfig +++ b/JavaScriptGlue/Configurations/Version.xcconfig @@ -1,5 +1,5 @@ -MAJOR_VERSION = 528; -MINOR_VERSION = 15; +MAJOR_VERSION = 530; +MINOR_VERSION = 5; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); |