Merge and build updates for 7.0.0-dp-9

Fraser J. Gordon · Fraser J. Gordon · commit ab97711231f8 · 2014-08-08T11:27:56.000+01:00
diff --git a/engine/Makefile.kernel-common b/engine/Makefile.kernel-common
@@ -11,7 +11,11 @@ CUSTOM_INCLUDES=\
 
 CUSTOM_CCFLAGS=\
 	-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti \
-	-fmessage-length=0 -march=i486 \
+	-fmessage-length=0 \
 	$(KERNEL_CCFLAGS)
 
+ifeq ($(ARCH),i386)
+	CUSTOM_CCFLAGS:=$(CUSTOM_CCFLAGS) -march=i486
+endif
+
 include ../rules/archive.linux.makefile
diff --git a/engine/Makefile.kernel-server b/engine/Makefile.kernel-server
@@ -87,7 +87,11 @@ CUSTOM_INCLUDES=\
 
 CUSTOM_CCFLAGS=\
 	-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-strict-aliasing \
-	-fmessage-length=0 -march=i486
+	-fmessage-length=0
+
+ifeq ($(ARCH),i386)
+	CUSTOM_CCFLAGS:=$(CUSTOM_CCFLAGS) -march=i486
+endif
 
 include/revbuild.h: include/revbuild.h.in ../version ../util/encode_version.pl
 	../util/encode_version.pl
diff --git a/engine/engine-mobile.xcodeproj/project.pbxproj b/engine/engine-mobile.xcodeproj/project.pbxproj
@@ -266,6 +266,7 @@
 		7268ED961848C37D00D10598 /* image_rep_densitymapped.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E8AB9052180E9DCD0050A249 /* image_rep_densitymapped.cpp */; };
 		72CC34B418A9378800BEC655 /* exec-keywords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72FFE3451858840300BA6A23 /* exec-keywords.cpp */; };
 		72CC34B518A9379200BEC655 /* image_rep_resampled.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72FFE3471858845A00BA6A23 /* image_rep_resampled.cpp */; };
+		72CE28951993D7C10003BAE0 /* imageloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E89DBC50198A6F410009651B /* imageloader.cpp */; };
 		7607CF321768D26700ADB512 /* mbliphoneorientation.mm in Sources */ = {isa = PBXBuildFile; fileRef = BE940436175F659F003EAB87 /* mbliphoneorientation.mm */; };
 		7607CF701769BB4D00ADB512 /* exec-interface-aclip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7607CF601769BB4C00ADB512 /* exec-interface-aclip.cpp */; };
 		7607CF711769BB4D00ADB512 /* exec-interface-button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7607CF611769BB4C00ADB512 /* exec-interface-button.cpp */; };
@@ -1758,7 +1759,6 @@
 				E8AB9052180E9DCD0050A249 /* image_rep_densitymapped.cpp */,
 				4D8C6999167A22B500D3CCE7 /* image_rep_encoded.cpp */,
 				4D8C699A167A22B500D3CCE7 /* image_rep_mutable.cpp */,
-				E8BE6E29182966BA00D7C604 /* image_rep_resampled.cpp */,
 				4D8C699B167A22B500D3CCE7 /* imagebitmap.cpp */,
 				E865A51E1695BF3E00C4CBC3 /* imagebitmap.h */,
 				E89DBC50198A6F410009651B /* imageloader.cpp */,
@@ -2294,6 +2294,7 @@
 			files = (
 				72CC34B518A9379200BEC655 /* image_rep_resampled.cpp in Sources */,
 				72CC34B418A9378800BEC655 /* exec-keywords.cpp in Sources */,
+				72CE28951993D7C10003BAE0 /* imageloader.cpp in Sources */,
 				4DE5E7EB174BBE89001AB76D /* uuid.cpp in Sources */,
 				4DABCD9915ECD4700085E214 /* aclip.cpp in Sources */,
 				4DABCD9A15ECD4700085E214 /* answer.cpp in Sources */,
diff --git a/ide b/ide
@@ -1 +1 @@
-Subproject commit b1d01b476c74f0ff7c798386ffa4d1b82e0f97f7
+Subproject commit 312e94b29d1578ed73aa8c9807876e117ccd0184
diff --git a/libexternal/libexternal.xcodeproj/project.pbxproj b/libexternal/libexternal.xcodeproj/project.pbxproj
@@ -116,8 +116,6 @@
 /* Begin PBXProject section */
 		4DF42A350B04860B003F2D95 /* Project object */ = {
 			isa = PBXProject;
-			attributes = {
-			};
 			buildConfigurationList = 4DF42A360B04860B003F2D95 /* Build configuration list for PBXProject "libexternal" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
diff --git a/libfoundation/libfoundation.xcodeproj/project.pbxproj b/libfoundation/libfoundation.xcodeproj/project.pbxproj
@@ -188,8 +188,6 @@
 /* Begin PBXProject section */
 		4DF42A350B04860B003F2D95 /* Project object */ = {
 			isa = PBXProject;
-			attributes = {
-			};
 			buildConfigurationList = 4DF42A360B04860B003F2D95 /* Build configuration list for PBXProject "libfoundation" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
diff --git a/libgraphics/Makefile b/libgraphics/Makefile
@@ -12,6 +12,10 @@ CUSTOM_INCLUDES=./src \
 		../libskia/include/config \
 		../libskia/include/effects
 
-CUSTOM_CCFLAGS=-fno-exceptions -fno-rtti -pthread -march=i486
+CUSTOM_CCFLAGS=-fno-exceptions -fno-rtti -pthread
+
+ifeq ($(ARCH),i386)
+	CUSTOM_CCFLAGS:=$(CUSTOM_CCFLAGS) -march=i486
+endif
 
 include ../rules/archive.linux.makefile
diff --git a/libgraphics/libgraphics.xcodeproj/project.pbxproj b/libgraphics/libgraphics.xcodeproj/project.pbxproj
@@ -158,8 +158,6 @@
 /* Begin PBXProject section */
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
-			attributes = {
-			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "libgraphics" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
diff --git a/version b/version
@@ -1,6 +1,6 @@
-BUILD_REVISION = 10012
+BUILD_REVISION = 10013
 BUILD_MAJOR_VERSION = 7
 BUILD_MINOR_VERSION = 0
 BUILD_POINT_VERSION = 0
-BUILD_SHORT_VERSION = 7.0.0-dp-8
-BUILD_LONG_VERSION = 7.0.0.10012 (DP 8)
+BUILD_SHORT_VERSION = 7.0.0-dp-9
+BUILD_LONG_VERSION = 7.0.0.10013 (DP 9)
