Merge pull request #936 from CharlyZhang/master

update the Xcode projects  and make them work

.gitignore

@@ -72,3 +72,4 @@ lib64/assimp-vc120-mtd.pdb
 lib64/assimp-vc120-mtd.ilk
 lib64/assimp-vc120-mtd.exp
 lib64/assimp-vc120-mt.exp
+xcuserdata

samples/SimpleAssimpViewX/SimpleAssimpViewX.xcodeproj/project.pbxproj

@@ -288,9 +288,15 @@
 /* Begin PBXProject section */
 		2A37F4A9FDCFA73011CA2CEA /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+			};
 			buildConfigurationList = 26FC0AA90875C8B900E6366F /* Build configuration list for PBXProject "SimpleAssimpViewX" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 2A37F4AAFDCFA73011CA2CEA /* DisplayLinkAsyncMoviePlayer */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -390,7 +396,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				ONLY_ACTIVE_ARCH = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = SimpleAssimpViewX;
 				VALID_ARCHS = "x86_64 i386";
 				WRAPPER_EXTENSION = app;

workspaces/xcode6/Assimp.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2DC891CA1D2CFA22001E0B0E /* D3MFImporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DC891C61D2CFA22001E0B0E /* D3MFImporter.cpp */; };
+		2DC891CB1D2CFA22001E0B0E /* D3MFOpcPackage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DC891C81D2CFA22001E0B0E /* D3MFOpcPackage.cpp */; };
+		2DC891D01D2CFA75001E0B0E /* C4DImporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DC891CE1D2CFA75001E0B0E /* C4DImporter.cpp */; };
 		7F79242A1AB43E20005A8E5D /* 3DSConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15221A74FC9C4B2AAA7306E3 /* 3DSConverter.cpp */; };
 		7F79242B1AB43E20005A8E5D /* 3DSExporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECCBBF2D75A44335AB93C84A /* 3DSExporter.cpp */; };
 		7F79242C1AB43E20005A8E5D /* 3DSLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02E9476D129940BF84DE6682 /* 3DSLoader.cpp */; };
@@ -245,6 +248,13 @@
 		2ACC87E846AE4E4A86E1AEF4 /* OptimizeMeshes.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = OptimizeMeshes.cpp; path = code/OptimizeMeshes.cpp; sourceTree = SOURCE_ROOT; };
 		2BE34AF1CE0C4767ACE21597 /* IFCLoader.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = IFCLoader.h; path = code/IFCLoader.h; sourceTree = SOURCE_ROOT; };
 		2C4D504725E540109530E254 /* PlyParser.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = PlyParser.cpp; path = code/PlyParser.cpp; sourceTree = SOURCE_ROOT; };
+		2DC891C61D2CFA22001E0B0E /* D3MFImporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = D3MFImporter.cpp; path = code/D3MFImporter.cpp; sourceTree = "<group>"; };
+		2DC891C71D2CFA22001E0B0E /* D3MFImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = D3MFImporter.h; path = code/D3MFImporter.h; sourceTree = "<group>"; };
+		2DC891C81D2CFA22001E0B0E /* D3MFOpcPackage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = D3MFOpcPackage.cpp; path = code/D3MFOpcPackage.cpp; sourceTree = "<group>"; };
+		2DC891C91D2CFA22001E0B0E /* D3MFOpcPackage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = D3MFOpcPackage.h; path = code/D3MFOpcPackage.h; sourceTree = "<group>"; };
+		2DC891CD1D2CFA75001E0B0E /* ByteSwapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ByteSwapper.h; path = code/ByteSwapper.h; sourceTree = "<group>"; };
+		2DC891CE1D2CFA75001E0B0E /* C4DImporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = C4DImporter.cpp; path = code/C4DImporter.cpp; sourceTree = "<group>"; };
+		2DC891CF1D2CFA75001E0B0E /* C4DImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = C4DImporter.h; path = code/C4DImporter.h; sourceTree = "<group>"; };
 		2DCF6F156A3A4B4C807E5368 /* SmoothingGroups.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = SmoothingGroups.h; path = code/SmoothingGroups.h; sourceTree = SOURCE_ROOT; };
 		2E7FD92FFCF441B0A60FC8B4 /* IFCCurve.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = IFCCurve.cpp; path = code/IFCCurve.cpp; sourceTree = SOURCE_ROOT; };
 		2F34A6A3C4104625A52BF7C2 /* cexport.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = cexport.h; path = include/assimp/cexport.h; sourceTree = SOURCE_ROOT; };
@@ -735,6 +745,8 @@
 		2DC7AE369B84444B9649035D /* assimp */ = {
 			isa = PBXGroup;
 			children = (
+				2DC891CC1D2CFA44001E0B0E /* C4D */,
+				2DC891C51D2CFA01001E0B0E /* 3MF */,
 				DB181885BFCC44F594A1FA01 /* Source Files */,
 				628C9A9A9FA640B9AA1DAC09 /* Common */,
 				874C614E5BEB41419F0EEE1C /* Logging */,
@@ -796,6 +808,26 @@
 			name = assimp;
 			sourceTree = "<group>";
 		};
+		2DC891C51D2CFA01001E0B0E /* 3MF */ = {
+			isa = PBXGroup;
+			children = (
+				2DC891C61D2CFA22001E0B0E /* D3MFImporter.cpp */,
+				2DC891C71D2CFA22001E0B0E /* D3MFImporter.h */,
+				2DC891C81D2CFA22001E0B0E /* D3MFOpcPackage.cpp */,
+				2DC891C91D2CFA22001E0B0E /* D3MFOpcPackage.h */,
+			);
+			name = 3MF;
+			sourceTree = "<group>";
+		};
+		2DC891CC1D2CFA44001E0B0E /* C4D */ = {
+			isa = PBXGroup;
+			children = (
+				2DC891CE1D2CFA75001E0B0E /* C4DImporter.cpp */,
+				2DC891CF1D2CFA75001E0B0E /* C4DImporter.h */,
+			);
+			name = C4D;
+			sourceTree = "<group>";
+		};
 		2E29D94CA6DA405EB4AF90E0 /* STL */ = {
 			isa = PBXGroup;
 			children = (
@@ -877,6 +909,7 @@
 		628C9A9A9FA640B9AA1DAC09 /* Common */ = {
 			isa = PBXGroup;
 			children = (
+				2DC891CD1D2CFA75001E0B0E /* ByteSwapper.h */,
 				A58410FEAA884A2D8D73ACCE /* BaseImporter.cpp */,
 				32170F499DAC4E4595AF6D6B /* BaseImporter.h */,
 				FAB6BC13FCFE40F5801D0972 /* BaseProcess.cpp */,
@@ -1640,6 +1673,7 @@
 				7F79244C1AB43E20005A8E5D /* DefaultIOSystem.cpp in Sources */,
 				7F7A93A81B65D0110094C4DA /* DDLNode.cpp in Sources */,
 				7F79244D1AB43E20005A8E5D /* DefaultLogger.cpp in Sources */,
+				2DC891D01D2CFA75001E0B0E /* C4DImporter.cpp in Sources */,
 				7F79244E1AB43E20005A8E5D /* Exporter.cpp in Sources */,
 				7F79244F1AB43E20005A8E5D /* FBXAnimation.cpp in Sources */,
 				7F7924501AB43E20005A8E5D /* FBXBinaryTokenizer.cpp in Sources */,
@@ -1662,10 +1696,12 @@
 				7F79245F1AB43E20005A8E5D /* FindInstancesProcess.cpp in Sources */,
 				7F7924601AB43E20005A8E5D /* FindInvalidDataProcess.cpp in Sources */,
 				7F7924611AB43E20005A8E5D /* FixNormalsStep.cpp in Sources */,
+				2DC891CA1D2CFA22001E0B0E /* D3MFImporter.cpp in Sources */,
 				7F7924621AB43E20005A8E5D /* GenFaceNormalsProcess.cpp in Sources */,
 				7F7924631AB43E20005A8E5D /* GenVertexNormalsProcess.cpp in Sources */,
 				7F7924641AB43E20005A8E5D /* HMPLoader.cpp in Sources */,
 				7F7924651AB43E20005A8E5D /* IFCBoolean.cpp in Sources */,
+				2DC891CB1D2CFA22001E0B0E /* D3MFOpcPackage.cpp in Sources */,
 				7F7924661AB43E20005A8E5D /* IFCCurve.cpp in Sources */,
 				AFB7F85E1C882F8200D7B6E9 /* glTFImporter.cpp in Sources */,
 				7F7924671AB43E20005A8E5D /* IFCGeometry.cpp in Sources */,
@@ -1787,7 +1823,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++98";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1821,6 +1858,7 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				HEADER_SEARCH_PATHS = "$(SRCROOT)";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1835,7 +1873,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++98";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1868,6 +1907,7 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				HEADER_SEARCH_PATHS = "$(SRCROOT)";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";
@@ -1882,7 +1922,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++98";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1914,6 +1955,7 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				HEADER_SEARCH_PATHS = "$(SRCROOT)";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";
@@ -1928,7 +1970,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++98";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1960,6 +2003,7 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				HEADER_SEARCH_PATHS = "$(SRCROOT)";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";