Merge 5a098f381b into 003c075108

.gitmodules

@@ -8,3 +8,11 @@
 	path = minivmac
 	url = https://github.com/zydeco/minivmac.git
 	branch = wintergames
+[submodule "UniversalDetector"]
+	path = UniversalDetector
+	url = git@github.com:lieven/universal-detector.git
+	branch = iOS-support
+[submodule "XADMaster"]
+	path = XADMaster
+	url = git@github.com:lieven/XADMaster.git
+	branch = iOS-support

Mini vMac.xcodeproj/project.pbxproj

@@ -154,6 +154,8 @@
 		28F6B4CA1CF1FA7A002D76D0 /* about.plist in Resources */ = {isa = PBXBuildFile; fileRef = 28F6B4C91CF1FA7A002D76D0 /* about.plist */; };
 		28F6B4CF1CF77099002D76D0 /* compat.m in Sources */ = {isa = PBXBuildFile; fileRef = 28F6B4CE1CF77099002D76D0 /* compat.m */; };
 		CA06D3352BA25DC10019B7B7 /* HFSDiskImage.m in Sources */ = {isa = PBXBuildFile; fileRef = CA06D3332BA25DC00019B7B7 /* HFSDiskImage.m */; };
+		CAF128532BA4DED900E39C26 /* libXADMaster.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CAF1282A2BA4DB9300E39C26 /* libXADMaster.a */; };
+		CAF128542BA4DEE000E39C26 /* libUniversalDetector.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CAF1284A2BA4DE2F00E39C26 /* libUniversalDetector.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -192,6 +194,118 @@
 			remoteGlobalIDString = 28C67BD02AC49E46000C7540;
 			remoteInfo = "MacII-512x384";
 		};
+		CAF128272BA4DB9300E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
+			remoteInfo = XADMaster;
+		};
+		CAF128292BA4DB9300E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1B34A97511C2FD0500396C26;
+			remoteInfo = libXADMaster.a;
+		};
+		CAF1282B2BA4DB9300E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1B91CD5E11D97E7C0081E40A;
+			remoteInfo = libXADMaster.win.a;
+		};
+		CAF1282D2BA4DB9300E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1B467B0115CD9A73001AB1DD;
+			remoteInfo = libXADMaster.ios.a;
+		};
+		CAF1282F2BA4DB9300E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1B23DDC01185EBA300620319;
+			remoteInfo = unar;
+		};
+		CAF128312BA4DB9300E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1B91D18F11E1677B0081E40A;
+			remoteInfo = lsar;
+		};
+		CAF128332BA4DB9300E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1B91CDAC11D981E20081E40A;
+			remoteInfo = unar.exe;
+		};
+		CAF128352BA4DB9300E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1B91D2EE11E694860081E40A;
+			remoteInfo = lsar.exe;
+		};
+		CAF128372BA4DB9300E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 73DA3465206B6BF1006ADB42;
+			remoteInfo = XADMasterTests;
+		};
+		CAF128472BA4DE2F00E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF1283F2BA4DE2F00E39C26 /* UniversalDetector.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
+			remoteInfo = UniversalDetector;
+		};
+		CAF128492BA4DE2F00E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF1283F2BA4DE2F00E39C26 /* UniversalDetector.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1B23E0871190F29400620319;
+			remoteInfo = libUniversalDetector.a;
+		};
+		CAF1284B2BA4DE2F00E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF1283F2BA4DE2F00E39C26 /* UniversalDetector.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1B91CBE011D821A70081E40A;
+			remoteInfo = libUniversalDetector.win.a;
+		};
+		CAF1284D2BA4DE2F00E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF1283F2BA4DE2F00E39C26 /* UniversalDetector.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1B467B2615CD9B1F001AB1DD;
+			remoteInfo = libUniversalDetector.ios.a;
+		};
+		CAF1284F2BA4DE2F00E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF1283F2BA4DE2F00E39C26 /* UniversalDetector.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 1B0DDCAB0A2D0AD10009B697;
+			remoteInfo = DetectorTest;
+		};
+		CAF128552BA4DEE800E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 1B34A97411C2FD0500396C26;
+			remoteInfo = libXADMaster.a;
+		};
+		CAF128572BA4DF0600E39C26 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CAF1283F2BA4DE2F00E39C26 /* UniversalDetector.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 1B23E0861190F29400620319;
+			remoteInfo = libUniversalDetector.a;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -374,6 +488,8 @@
 		CA06D3322BA255830019B7B7 /* CodeSigning.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = CodeSigning.xcconfig; sourceTree = "<group>"; };
 		CA06D3332BA25DC00019B7B7 /* HFSDiskImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HFSDiskImage.m; sourceTree = "<group>"; };
 		CA06D3342BA25DC00019B7B7 /* HFSDiskImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HFSDiskImage.h; sourceTree = "<group>"; };
+		CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = XADMaster.xcodeproj; path = XADMaster/XADMaster.xcodeproj; sourceTree = SOURCE_ROOT; };
+		CAF1283F2BA4DE2F00E39C26 /* UniversalDetector.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UniversalDetector.xcodeproj; path = UniversalDetector/UniversalDetector.xcodeproj; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -416,6 +532,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CAF128542BA4DEE000E39C26 /* libUniversalDetector.a in Frameworks */,
+				CAF128532BA4DED900E39C26 /* libXADMaster.a in Frameworks */,
 				28F6B4C01CF07F5C002D76D0 /* liblibhfs.a in Frameworks */,
 				28F6B4C11CF07F5C002D76D0 /* liblibmfs.a in Frameworks */,
 				28F6B4C21CF07F5C002D76D0 /* liblibres.a in Frameworks */,
@@ -581,6 +699,7 @@
 			children = (
 				28F676BF1CD15E0B00FC6FA6 /* Mini vMac */,
 				28F676BE1CD15E0B00FC6FA6 /* Products */,
+				CAF1283B2BA4DBB400E39C26 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -644,6 +763,8 @@
 				28F6B4551CF07C9A002D76D0 /* libhfs */,
 				28F6B4541CF07C8D002D76D0 /* libmfs */,
 				28F6B4531CF07C83002D76D0 /* libres */,
+				CAF1283F2BA4DE2F00E39C26 /* UniversalDetector.xcodeproj */,
+				CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */,
 				28F676C11CD15E0B00FC6FA6 /* main.m */,
 			);
 			name = "Supporting Files";
@@ -717,6 +838,41 @@
 			path = os;
 			sourceTree = "<group>";
 		};
+		CAF1281A2BA4DB9300E39C26 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CAF128282BA4DB9300E39C26 /* XADMaster.framework */,
+				CAF1282A2BA4DB9300E39C26 /* libXADMaster.a */,
+				CAF1282C2BA4DB9300E39C26 /* libXADMaster.win.a */,
+				CAF1282E2BA4DB9300E39C26 /* libXADMaster.ios.a */,
+				CAF128302BA4DB9300E39C26 /* unar */,
+				CAF128322BA4DB9300E39C26 /* lsar */,
+				CAF128342BA4DB9300E39C26 /* unar.exe */,
+				CAF128362BA4DB9300E39C26 /* lsar.exe */,
+				CAF128382BA4DB9300E39C26 /* XADMasterTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		CAF1283B2BA4DBB400E39C26 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		CAF128402BA4DE2F00E39C26 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CAF128482BA4DE2F00E39C26 /* UniversalDetector.framework */,
+				CAF1284A2BA4DE2F00E39C26 /* libUniversalDetector.a */,
+				CAF1284C2BA4DE2F00E39C26 /* libUniversalDetector.win.a */,
+				CAF1284E2BA4DE2F00E39C26 /* libUniversalDetector.ios.a */,
+				CAF128502BA4DE2F00E39C26 /* DetectorTest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -870,6 +1026,8 @@
 			buildRules = (
 			);
 			dependencies = (
+				CAF128582BA4DF0600E39C26 /* PBXTargetDependency */,
+				CAF128562BA4DEE800E39C26 /* PBXTargetDependency */,
 				28C67BF52AC49F8D000C7540 /* PBXTargetDependency */,
 				2872E19E2AC48D770014F276 /* PBXTargetDependency */,
 				289710E11CFB126D0089D463 /* PBXTargetDependency */,
@@ -979,6 +1137,16 @@
 			mainGroup = 28F676B41CD15E0B00FC6FA6;
 			productRefGroup = 28F676BE1CD15E0B00FC6FA6 /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = CAF128402BA4DE2F00E39C26 /* Products */;
+					ProjectRef = CAF1283F2BA4DE2F00E39C26 /* UniversalDetector.xcodeproj */;
+				},
+				{
+					ProductGroup = CAF1281A2BA4DB9300E39C26 /* Products */;
+					ProjectRef = CAF128192BA4DB9300E39C26 /* XADMaster.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				28F676BC1CD15E0B00FC6FA6 /* Mini vMac */,
@@ -994,6 +1162,107 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		CAF128282BA4DB9300E39C26 /* XADMaster.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = XADMaster.framework;
+			remoteRef = CAF128272BA4DB9300E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF1282A2BA4DB9300E39C26 /* libXADMaster.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libXADMaster.a;
+			remoteRef = CAF128292BA4DB9300E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF1282C2BA4DB9300E39C26 /* libXADMaster.win.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libXADMaster.win.a;
+			remoteRef = CAF1282B2BA4DB9300E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF1282E2BA4DB9300E39C26 /* libXADMaster.ios.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libXADMaster.ios.a;
+			remoteRef = CAF1282D2BA4DB9300E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF128302BA4DB9300E39C26 /* unar */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = unar;
+			remoteRef = CAF1282F2BA4DB9300E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF128322BA4DB9300E39C26 /* lsar */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = lsar;
+			remoteRef = CAF128312BA4DB9300E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF128342BA4DB9300E39C26 /* unar.exe */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = unar.exe;
+			remoteRef = CAF128332BA4DB9300E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF128362BA4DB9300E39C26 /* lsar.exe */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = lsar.exe;
+			remoteRef = CAF128352BA4DB9300E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF128382BA4DB9300E39C26 /* XADMasterTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = XADMasterTests.xctest;
+			remoteRef = CAF128372BA4DB9300E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF128482BA4DE2F00E39C26 /* UniversalDetector.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = UniversalDetector.framework;
+			remoteRef = CAF128472BA4DE2F00E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF1284A2BA4DE2F00E39C26 /* libUniversalDetector.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libUniversalDetector.a;
+			remoteRef = CAF128492BA4DE2F00E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF1284C2BA4DE2F00E39C26 /* libUniversalDetector.win.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libUniversalDetector.win.a;
+			remoteRef = CAF1284B2BA4DE2F00E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF1284E2BA4DE2F00E39C26 /* libUniversalDetector.ios.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libUniversalDetector.ios.a;
+			remoteRef = CAF1284D2BA4DE2F00E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CAF128502BA4DE2F00E39C26 /* DetectorTest */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = DetectorTest;
+			remoteRef = CAF1284F2BA4DE2F00E39C26 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		283422C81CF8EF8C0088B634 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -1375,6 +1644,16 @@
 			target = 28C67BD02AC49E46000C7540 /* MacII-512x384 */;
 			targetProxy = 28C67BF42AC49F8D000C7540 /* PBXContainerItemProxy */;
 		};
+		CAF128562BA4DEE800E39C26 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = libXADMaster.a;
+			targetProxy = CAF128552BA4DEE800E39C26 /* PBXContainerItemProxy */;
+		};
+		CAF128582BA4DF0600E39C26 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = libUniversalDetector.a;
+			targetProxy = CAF128572BA4DF0600E39C26 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */

UniversalDetector

@@ -0,0 +1 @@
+Subproject commit ac12fd86fc8ad3787ce8d0d1c837adf1283968c9

XADMaster

@@ -0,0 +1 @@
+Subproject commit 9820dc15efa5d4353d8a5b43c167cee7bffae17c