Changeset 815 in SHVCSoftware for trunk/SHM.xcodeproj/project.pbxproj

Timestamp:

30 Jun 2014, 06:13:06 (10 years ago)

Author:

seregin

Message:

merge with SHM-6-dev branch

Location:

trunk

Files:

• . (modified) (1 prop)
• SHM.xcodeproj/project.pbxproj (modified) (10 diffs)

trunk/SHM.xcodeproj/project.pbxproj

@@ -131 +131 @@
                 71AD603A11EBC28D00F5F1FE /* libTLibEncoder.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6767961911AD626F00421804 /* libTLibEncoder.a */; };
                 71AD603B11EBC29600F5F1FE /* libTLibVideoIO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6767964B11AD629200421804 /* libTLibVideoIO.a */; };
+                C3D5A69A190AD6DA005E0EBE /* TCom3DAsymLUT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3D5A698190AD6DA005E0EBE /* TCom3DAsymLUT.cpp */; };
+                C3D5A69B190AD6DA005E0EBE /* TCom3DAsymLUT.h in Headers */ = {isa = PBXBuildFile; fileRef = C3D5A699190AD6DA005E0EBE /* TCom3DAsymLUT.h */; };
+                C3D5A69E190AD6F8005E0EBE /* TEnc3DAsymLUT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3D5A69C190AD6F8005E0EBE /* TEnc3DAsymLUT.cpp */; };
+                C3D5A69F190AD6F8005E0EBE /* TEnc3DAsymLUT.h in Headers */ = {isa = PBXBuildFile; fileRef = C3D5A69D190AD6F8005E0EBE /* TEnc3DAsymLUT.h */; };
                 DB7795C213F1226500C92469 /* TEncPic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DB7795BE13F1226500C92469 /* TEncPic.cpp */; };
                 DB7795C313F1226500C92469 /* TEncPic.h in Headers */ = {isa = PBXBuildFile; fileRef = DB7795BF13F1226500C92469 /* TEncPic.h */; };
@@ -340 +344 @@
                 7184647513FAE75800747BF9 /* program_options_lite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = program_options_lite.cpp; path = source/Lib/TAppCommon/program_options_lite.cpp; sourceTree = "<group>"; };
                 7184647613FAE75800747BF9 /* program_options_lite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = program_options_lite.h; path = source/Lib/TAppCommon/program_options_lite.h; sourceTree = "<group>"; };
+                C3D5A698190AD6DA005E0EBE /* TCom3DAsymLUT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TCom3DAsymLUT.cpp; path = source/Lib/TLibCommon/TCom3DAsymLUT.cpp; sourceTree = "<group>"; };
+                C3D5A699190AD6DA005E0EBE /* TCom3DAsymLUT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TCom3DAsymLUT.h; path = source/Lib/TLibCommon/TCom3DAsymLUT.h; sourceTree = "<group>"; };
+                C3D5A69C190AD6F8005E0EBE /* TEnc3DAsymLUT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TEnc3DAsymLUT.cpp; path = source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp; sourceTree = "<group>"; };
+                C3D5A69D190AD6F8005E0EBE /* TEnc3DAsymLUT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TEnc3DAsymLUT.h; path = source/Lib/TLibEncoder/TEnc3DAsymLUT.h; sourceTree = "<group>"; };
                 DB7795BE13F1226500C92469 /* TEncPic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TEncPic.cpp; path = source/Lib/TLibEncoder/TEncPic.cpp; sourceTree = "<group>"; };
                 DB7795BF13F1226500C92469 /* TEncPic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TEncPic.h; path = source/Lib/TLibEncoder/TEncPic.h; sourceTree = "<group>"; };
@@ -464 +472 @@
                         isa = PBXGroup;
                         children = (
+                                C3D5A698190AD6DA005E0EBE /* TCom3DAsymLUT.cpp */,
+                                C3D5A699190AD6DA005E0EBE /* TCom3DAsymLUT.h */,
                                 6B635E7516E5EAB60057B313 /* TComUpsampleFilter.h */,
                                 6B635E7616E5EAB60057B313 /* TComUpsampleFilter.cpp */,
@@ -563 +573 @@
                         isa = PBXGroup;
                         children = (
+                                C3D5A69C190AD6F8005E0EBE /* TEnc3DAsymLUT.cpp */,
+                                C3D5A69D190AD6F8005E0EBE /* TEnc3DAsymLUT.h */,
                                 71206CD916066EDD00A354E7 /* SyntaxElementWriter.cpp */,
                                 71206CDA16066EDD00A354E7 /* SyntaxElementWriter.h */,
@@ -670 +682 @@
                                 676795D211AD61FC00421804 /* TComList.h in Headers */,
                                 676795D411AD61FC00421804 /* TComLoopFilter.h in Headers */,
+                                C3D5A69B190AD6DA005E0EBE /* TCom3DAsymLUT.h in Headers */,
                                 676795D611AD61FC00421804 /* TComMotionInfo.h in Headers */,
                                 676795D911AD61FC00421804 /* TComPattern.h in Headers */,
@@ -685 +698 @@
                                 671E0D4C11B6AD8C00F3747B /* ContextModel3DBuffer.h in Headers */,
                                 671E0D4F11B6AD8C00F3747B /* TComBitCounter.h in Headers */,
+                                C3D5A69F190AD6F8005E0EBE /* TEnc3DAsymLUT.h in Headers */,
                                 671E0D5111B6AD8C00F3747B /* TComCABACTables.h in Headers */,
                                 671E0D5211B6AD8C00F3747B /* TComMv.h in Headers */,
@@ -932 +946 @@
                         buildActionMask = 2147483647;
                         files = (
+                                C3D5A69E190AD6F8005E0EBE /* TEnc3DAsymLUT.cpp in Sources */,
                                 676795CE11AD61FC00421804 /* TComBitStream.cpp in Sources */,
                                 676795D011AD61FC00421804 /* TComDataCU.cpp in Sources */,
@@ -939 +954 @@
                                 676795DA11AD61FC00421804 /* TComPic.cpp in Sources */,
                                 676795DC11AD61FC00421804 /* TComPicSym.cpp in Sources */,
+                                C3D5A69A190AD6DA005E0EBE /* TCom3DAsymLUT.cpp in Sources */,
                                 676795DE11AD61FC00421804 /* TComPicYuv.cpp in Sources */,
                                 676795E211AD61FC00421804 /* TComPrediction.cpp in Sources */,
@@ -1098 +1114 @@
                                 HEADER_SEARCH_PATHS = source/Lib;
                                 ONLY_ACTIVE_ARCH = YES;
-                                SDKROOT = macosx;
+                                SDKROOT = macosx10.8;
                         };
                         name = Debug;
@@ -1112 +1128 @@
                                 GCC_WARN_UNUSED_VARIABLE = YES;
                                 HEADER_SEARCH_PATHS = source/Lib;
-                                SDKROOT = macosx;
+                                SDKROOT = macosx10.8;
                         };
                         name = Release;