From 30bece8f3095adb00be2cac0e73e326465d2fd36 Mon Sep 17 00:00:00 2001 From: Jens Ayton Date: Sun, 13 Jun 2010 20:25:19 +0000 Subject: [PATCH] Moved Oolite-importer into Mac-specific. git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3532 127b21dd-08f5-0310-b4b7-95ae10353056 --- Oolite.xcodeproj/project.pbxproj | 82 ++++++++++++++++---------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/Oolite.xcodeproj/project.pbxproj b/Oolite.xcodeproj/project.pbxproj index 8d8198fc..398bcec7 100644 --- a/Oolite.xcodeproj/project.pbxproj +++ b/Oolite.xcodeproj/project.pbxproj @@ -396,6 +396,7 @@ 1A3D03161173536C005BF5E6 /* OOMultiTextureMaterial.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D03141173536C005BF5E6 /* OOMultiTextureMaterial.m */; }; 1A3D034A11736EDA005BF5E6 /* OOMaterialConvenienceCreators.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3D034811736EDA005BF5E6 /* OOMaterialConvenienceCreators.h */; }; 1A3D034B11736EDA005BF5E6 /* OOMaterialConvenienceCreators.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D034911736EDA005BF5E6 /* OOMaterialConvenienceCreators.m */; }; + 1A3E019B11C574C2000FF226 /* Oolite.mdimporter in Copy MDImporter */ = {isa = PBXBuildFile; fileRef = 1A3E019611C574AC000FF226 /* Oolite.mdimporter */; }; 1A43234E0BCFC9BB00F65914 /* OOOpenGLExtensionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43234A0BCFC9BB00F65914 /* OOOpenGLExtensionManager.h */; }; 1A43234F0BCFC9BB00F65914 /* OOOpenGLExtensionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A43234B0BCFC9BB00F65914 /* OOOpenGLExtensionManager.m */; }; 1A43A0CC0CB91D2C00D0E239 /* OOJSPlanet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43A0CA0CB91D2C00D0E239 /* OOJSPlanet.h */; }; @@ -535,7 +536,6 @@ 1A8A394F0B96229C007D20B8 /* NSFileManagerOOExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8A394D0B96229C007D20B8 /* NSFileManagerOOExtensions.h */; }; 1A8A3A380B962AEF007D20B8 /* NSScannerOOExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8A3A360B962AEF007D20B8 /* NSScannerOOExtensions.h */; }; 1A8A3A390B962AEF007D20B8 /* NSScannerOOExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A8A3A370B962AEF007D20B8 /* NSScannerOOExtensions.m */; }; - 1A8A3D1B0B9B03A500AB7625 /* Oolite.mdimporter in Copy MDImporter */ = {isa = PBXBuildFile; fileRef = 1A5BF2770916D47300BF238F /* Oolite.mdimporter */; }; 1A8BB8EA0E8311F900122974 /* OONullTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8BB8E80E8311F900122974 /* OONullTexture.h */; }; 1A8BB8EB0E8311F900122974 /* OONullTexture.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A8BB8E90E8311F900122974 /* OONullTexture.m */; }; 1A8C981D117A380800D8AB7E /* OOCombinedEmissionMapGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C97E5117A1A2F00D8AB7E /* OOCombinedEmissionMapGenerator.m */; }; @@ -754,6 +754,20 @@ remoteGlobalIDString = 8D5B49B6048680CD000E48DA; remoteInfo = DebugOXP; }; + 1A3E019511C574AC000FF226 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1A3E018E11C574AC000FF226 /* Oolite-importer.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1A1AB1C60909BF46001039FA /* Oolite.mdimporter */; + remoteInfo = "Oolite-importer"; + }; + 1A3E01A811C574E1000FF226 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1A3E018E11C574AC000FF226 /* Oolite-importer.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D57630D048677EA00EA77CD /* Oolite-importer */; + remoteInfo = "Oolite-importer"; + }; 1A4FB2370C8D6A7500DC8E1F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1A6B50370C8B42480035DFCC /* libjs.xcodeproj */; @@ -768,20 +782,6 @@ remoteGlobalIDString = D2AAC045055464E500DB518D; remoteInfo = libjs; }; - 1A5BF2760916D47300BF238F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1A5BF2720916D47300BF238F /* Oolite-importer.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1A1AB1C60909BF46001039FA; - remoteInfo = "Oolite-importer"; - }; - 1A5BF3070916D8F700BF238F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1A5BF2720916D47300BF238F /* Oolite-importer.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8D57630D048677EA00EA77CD; - remoteInfo = "Oolite-importer"; - }; 1A71E6F60BCE343400CD5C13 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -1136,7 +1136,7 @@ dstPath = Contents/Library/Spotlight; dstSubfolderSpec = 1; files = ( - 1A8A3D1B0B9B03A500AB7625 /* Oolite.mdimporter in Copy MDImporter */, + 1A3E019B11C574C2000FF226 /* Oolite.mdimporter in Copy MDImporter */, ); name = "Copy MDImporter"; runOnlyForDeploymentPostprocessing = 0; @@ -1559,6 +1559,7 @@ 1A3D03141173536C005BF5E6 /* OOMultiTextureMaterial.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOMultiTextureMaterial.m; sourceTree = ""; }; 1A3D034811736EDA005BF5E6 /* OOMaterialConvenienceCreators.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOMaterialConvenienceCreators.h; sourceTree = ""; }; 1A3D034911736EDA005BF5E6 /* OOMaterialConvenienceCreators.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOMaterialConvenienceCreators.m; sourceTree = ""; }; + 1A3E018E11C574AC000FF226 /* Oolite-importer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Oolite-importer.xcodeproj"; path = "Mac-specific/Oolite-importer/Oolite-importer.xcodeproj"; sourceTree = ""; }; 1A43234A0BCFC9BB00F65914 /* OOOpenGLExtensionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOOpenGLExtensionManager.h; sourceTree = ""; }; 1A43234B0BCFC9BB00F65914 /* OOOpenGLExtensionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOOpenGLExtensionManager.m; sourceTree = ""; }; 1A43A0CA0CB91D2C00D0E239 /* OOJSPlanet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOJSPlanet.h; sourceTree = ""; }; @@ -1596,7 +1597,6 @@ 1A572FE40D84B6A3003D4A26 /* oolite-constrictor-AI.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = "oolite-constrictor-AI.plist"; sourceTree = ""; }; 1A5A798D105044DD00A8F4B5 /* OOPrefixHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOPrefixHeader.h; sourceTree = ""; }; 1A5AA3220C0098AF0029C78A /* OOOpenGL.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOOpenGL.m; sourceTree = ""; }; - 1A5BF2720916D47300BF238F /* Oolite-importer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Oolite-importer.xcodeproj"; path = "Oolite-importer/Oolite-importer.xcodeproj"; sourceTree = ""; }; 1A5DB1E80BBD8F0000D57389 /* OOConstToString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOConstToString.h; sourceTree = ""; }; 1A5DB1E90BBD8F0000D57389 /* OOConstToString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOConstToString.m; sourceTree = ""; }; 1A5DBA9A0BC000DC00D57389 /* OOJavaScriptEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOJavaScriptEngine.h; sourceTree = ""; }; @@ -2443,6 +2443,14 @@ path = Scripts; sourceTree = ""; }; + 1A3E018F11C574AC000FF226 /* Products */ = { + isa = PBXGroup; + children = ( + 1A3E019611C574AC000FF226 /* Oolite.mdimporter */, + ); + name = Products; + sourceTree = ""; + }; 1A43A0D10CB91D3600D0E239 /* Entities */ = { isa = PBXGroup; children = ( @@ -2478,19 +2486,11 @@ isa = PBXGroup; children = ( 1A01BCDF11C569DF0011197F /* Oolite-docktile.xcodeproj */, - 1A5BF2720916D47300BF238F /* Oolite-importer.xcodeproj */, + 1A3E018E11C574AC000FF226 /* Oolite-importer.xcodeproj */, ); name = Extras; sourceTree = ""; }; - 1A5BF2730916D47300BF238F /* Products */ = { - isa = PBXGroup; - children = ( - 1A5BF2770916D47300BF238F /* Oolite.mdimporter */, - ); - name = Products; - sourceTree = ""; - }; 1A5DBA980BC000DC00D57389 /* Scripting */ = { isa = PBXGroup; children = ( @@ -3382,10 +3382,10 @@ buildRules = ( ); dependencies = ( - 1A5BF3080916D8F700BF238F /* PBXTargetDependency */, 1A71E6F70BCE343400CD5C13 /* PBXTargetDependency */, 1A4FB4D00C8E130E00DC8E1F /* PBXTargetDependency */, 1A01BCE911C569F80011197F /* PBXTargetDependency */, + 1A3E01A911C574E1000FF226 /* PBXTargetDependency */, ); name = Oolite; productInstallPath = "$(HOME)/Applications"; @@ -3438,8 +3438,8 @@ ProjectRef = 1A01BCDF11C569DF0011197F /* Oolite-docktile.xcodeproj */; }, { - ProductGroup = 1A5BF2730916D47300BF238F /* Products */; - ProjectRef = 1A5BF2720916D47300BF238F /* Oolite-importer.xcodeproj */; + ProductGroup = 1A3E018F11C574AC000FF226 /* Products */; + ProjectRef = 1A3E018E11C574AC000FF226 /* Oolite-importer.xcodeproj */; }, ); projectRoot = ""; @@ -3466,6 +3466,13 @@ remoteRef = 1A3042F310C16DA60056219D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 1A3E019611C574AC000FF226 /* Oolite.mdimporter */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = Oolite.mdimporter; + remoteRef = 1A3E019511C574AC000FF226 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 1A4FB2380C8D6A7500DC8E1F /* libmozjs_for_oolite.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -3473,13 +3480,6 @@ remoteRef = 1A4FB2370C8D6A7500DC8E1F /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1A5BF2770916D47300BF238F /* Oolite.mdimporter */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = Oolite.mdimporter; - remoteRef = 1A5BF2760916D47300BF238F /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -3761,16 +3761,16 @@ name = DebugOXP; targetProxy = 1A274D2410C1EE02004CDDF5 /* PBXContainerItemProxy */; }; + 1A3E01A911C574E1000FF226 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "Oolite-importer"; + targetProxy = 1A3E01A811C574E1000FF226 /* PBXContainerItemProxy */; + }; 1A4FB4D00C8E130E00DC8E1F /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = libjs; targetProxy = 1A4FB4CF0C8E130E00DC8E1F /* PBXContainerItemProxy */; }; - 1A5BF3080916D8F700BF238F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "Oolite-importer"; - targetProxy = 1A5BF3070916D8F700BF238F /* PBXContainerItemProxy */; - }; 1A71E6F70BCE343400CD5C13 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 1A71E6F20BCE340C00CD5C13 /* libpng-custom */;