From ca463fca9a63ac95156b30573b445d26d3e981b4 Mon Sep 17 00:00:00 2001 From: Wil Shipley Date: Fri, 13 Mar 2015 00:37:02 -0700 Subject: [PATCH] - Rearranged groups, link against C++ lib explicitly. --- workspaces/xcode6/Assimp.xcodeproj/project.pbxproj | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/workspaces/xcode6/Assimp.xcodeproj/project.pbxproj b/workspaces/xcode6/Assimp.xcodeproj/project.pbxproj index 5efc9edfa..e5a0549cd 100644 --- a/workspaces/xcode6/Assimp.xcodeproj/project.pbxproj +++ b/workspaces/xcode6/Assimp.xcodeproj/project.pbxproj @@ -362,7 +362,8 @@ 7CAF8A3096E04CB983B53CC1 /* BlenderIntermediate.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = BlenderIntermediate.h; path = code/BlenderIntermediate.h; sourceTree = SOURCE_ROOT; }; 7DC4B0B5E57F4F4892CC823E /* MemoryIOWrapper.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = MemoryIOWrapper.h; path = code/MemoryIOWrapper.h; sourceTree = SOURCE_ROOT; }; 7E8BA0D338C9433587BC6C35 /* StreamWriter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = StreamWriter.h; path = code/StreamWriter.h; sourceTree = SOURCE_ROOT; }; - 7F29EF981AB26C4900E9D380 /* libz.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.1.dylib; path = ../../../../../../usr/lib/libz.1.dylib; sourceTree = ""; }; + 7F29EF981AB26C4900E9D380 /* libz.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.1.dylib; path = /usr/lib/libz.1.dylib; sourceTree = ""; }; + 7F392D921AB2C7BB00D952EB /* libc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.dylib"; path = "/Users/wjs/Source/UberDwelling/Dwelling Test Apps/Dwelling2DBakeTest/../../../../../../usr/lib/libc++.dylib"; sourceTree = ""; }; 7FF72CB6E99E40E19AE0E64C /* MaterialSystem.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = MaterialSystem.cpp; path = code/MaterialSystem.cpp; sourceTree = SOURCE_ROOT; }; 815702BED5644DD5B242F347 /* TerragenLoader.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = TerragenLoader.h; path = code/TerragenLoader.h; sourceTree = SOURCE_ROOT; }; 8299401C3E4A43A18E887DC1 /* SGSpatialSort.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = SGSpatialSort.h; path = code/SGSpatialSort.h; sourceTree = SOURCE_ROOT; }; @@ -1026,6 +1027,15 @@ name = FBX; sourceTree = ""; }; + 7F392D931AB2C7C200D952EB /* Frameworks */ = { + isa = PBXGroup; + children = ( + 7F29EF981AB26C4900E9D380 /* libz.1.dylib */, + 7F392D921AB2C7BB00D952EB /* libc++.dylib */, + ); + name = Frameworks; + sourceTree = ""; + }; 8438F0F891674542AF8F2302 /* OFFFormat */ = { isa = PBXGroup; children = ( @@ -1191,7 +1201,7 @@ isa = PBXGroup; children = ( 2DC7AE369B84444B9649035D /* assimp */, - 7F29EF981AB26C4900E9D380 /* libz.1.dylib */, + 7F392D931AB2C7C200D952EB /* Frameworks */, AF05BC16567A496BB5DCB2F0 /* Products */, ); sourceTree = "";