From f978cb456c49766328108b2be5b4897679e69b18 Mon Sep 17 00:00:00 2001 From: ritsuka Date: Sat, 20 Dec 2014 18:57:52 +0000 Subject: MacGui: rearrange files in the project and disabled NSZombie. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6630 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/HandBrake.xcodeproj/project.pbxproj | 76 +++++++++++----------- .../xcschemes/HandBrake [DEBUG].xcscheme | 5 -- 2 files changed, 38 insertions(+), 43 deletions(-) diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 671ab14d6..14361e830 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -133,14 +133,14 @@ A932E26C1988334B0047D13E /* AudioDefaults.xib in Resources */ = {isa = PBXBuildFile; fileRef = A932E26A1988334B0047D13E /* AudioDefaults.xib */; }; A932E26F198833920047D13E /* HBAudioDefaultsController.m in Sources */ = {isa = PBXBuildFile; fileRef = A932E26E198833920047D13E /* HBAudioDefaultsController.m */; }; A932E273198834130047D13E /* HBAudioDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = A932E272198834130047D13E /* HBAudioDefaults.m */; }; - A93E0ED31972957000FD67FB /* HBVideoController.m in Sources */ = {isa = PBXBuildFile; fileRef = A93E0ED11972957000FD67FB /* HBVideoController.m */; }; - A93E0ED71972958C00FD67FB /* Video.xib in Resources */ = {isa = PBXBuildFile; fileRef = A93E0ED51972958C00FD67FB /* Video.xib */; }; - A9523937199A6AAE00588AEF /* HBFilters.m in Sources */ = {isa = PBXBuildFile; fileRef = A9523936199A6AAE00588AEF /* HBFilters.m */; }; - A955128A1A320A6F001BFC6F /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A95512881A320A12001BFC6F /* libjansson.a */; }; - A955128B1A320B02001BFC6F /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A95512881A320A12001BFC6F /* libjansson.a */; }; - A967E4BA1A16768200DF1DFC /* EncodeCanceled@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A967E4B91A16768200DF1DFC /* EncodeCanceled@2x.png */; }; - A971281F1A2C75180088C076 /* HBTitle.m in Sources */ = {isa = PBXBuildFile; fileRef = A971281E1A2C75180088C076 /* HBTitle.m */; }; - A98C29C41977B10600AF5DED /* HBLanguagesSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = A98C29C31977B10600AF5DED /* HBLanguagesSelection.m */; }; + A93E0ED31972957000FD67FB /* HBVideoController.m in Sources */ = {isa = PBXBuildFile; fileRef = A93E0ED11972957000FD67FB /* HBVideoController.m */; }; + A93E0ED71972958C00FD67FB /* Video.xib in Resources */ = {isa = PBXBuildFile; fileRef = A93E0ED51972958C00FD67FB /* Video.xib */; }; + A9523937199A6AAE00588AEF /* HBFilters.m in Sources */ = {isa = PBXBuildFile; fileRef = A9523936199A6AAE00588AEF /* HBFilters.m */; }; + A955128A1A320A6F001BFC6F /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A95512881A320A12001BFC6F /* libjansson.a */; }; + A955128B1A320B02001BFC6F /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A95512881A320A12001BFC6F /* libjansson.a */; }; + A967E4BA1A16768200DF1DFC /* EncodeCanceled@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A967E4B91A16768200DF1DFC /* EncodeCanceled@2x.png */; }; + A971281F1A2C75180088C076 /* HBTitle.m in Sources */ = {isa = PBXBuildFile; fileRef = A971281E1A2C75180088C076 /* HBTitle.m */; }; + A98C29C41977B10600AF5DED /* HBLanguagesSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = A98C29C31977B10600AF5DED /* HBLanguagesSelection.m */; }; A9935213196F38A70069C6B7 /* ChaptersTitles.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9935211196F38A70069C6B7 /* ChaptersTitles.xib */; }; A9AA447A1970664A00D7DEFC /* HBUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = A9AA44791970664A00D7DEFC /* HBUtilities.m */; }; A9BB0F2719A0ECE40079F1C1 /* HBHUDButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BB0F2619A0ECE40079F1C1 /* HBHUDButtonCell.m */; }; @@ -373,13 +373,13 @@ A932E272198834130047D13E /* HBAudioDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioDefaults.m; sourceTree = ""; }; A93E0ED01972957000FD67FB /* HBVideoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBVideoController.h; sourceTree = ""; }; A93E0ED11972957000FD67FB /* HBVideoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBVideoController.m; sourceTree = ""; }; - A93E0ED61972958C00FD67FB /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Video.xib; sourceTree = ""; }; - A9523935199A6AAE00588AEF /* HBFilters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBFilters.h; sourceTree = ""; }; - A9523936199A6AAE00588AEF /* HBFilters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBFilters.m; sourceTree = ""; }; - A95512881A320A12001BFC6F /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = external/contrib/lib/libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; - A967E4B91A16768200DF1DFC /* EncodeCanceled@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeCanceled@2x.png"; sourceTree = ""; }; - A971281D1A2C75180088C076 /* HBTitle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBTitle.h; sourceTree = ""; }; - A971281E1A2C75180088C076 /* HBTitle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBTitle.m; sourceTree = ""; }; + A93E0ED61972958C00FD67FB /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Video.xib; sourceTree = ""; }; + A9523935199A6AAE00588AEF /* HBFilters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBFilters.h; sourceTree = ""; }; + A9523936199A6AAE00588AEF /* HBFilters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBFilters.m; sourceTree = ""; }; + A95512881A320A12001BFC6F /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = external/contrib/lib/libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; + A967E4B91A16768200DF1DFC /* EncodeCanceled@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "EncodeCanceled@2x.png"; sourceTree = ""; }; + A971281D1A2C75180088C076 /* HBTitle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBTitle.h; sourceTree = ""; }; + A971281E1A2C75180088C076 /* HBTitle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBTitle.m; sourceTree = ""; }; A98C29C21977B10600AF5DED /* HBLanguagesSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBLanguagesSelection.h; sourceTree = ""; }; A98C29C31977B10600AF5DED /* HBLanguagesSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBLanguagesSelection.m; sourceTree = ""; }; A9935212196F38A70069C6B7 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = ChaptersTitles.xib; sourceTree = ""; }; @@ -488,13 +488,13 @@ 27D6C76B14B102DA00B785E4 /* libtheora.a in Frameworks */, 27D6C76D14B102DA00B785E4 /* libvorbis.a in Frameworks */, 27D6C76F14B102DA00B785E4 /* libvorbisenc.a in Frameworks */, - 22DD2C4B177B95DA00EF50D3 /* libvpx.a in Frameworks */, - 27D6C77114B102DA00B785E4 /* libx264.a in Frameworks */, - 27D6C77314B102DA00B785E4 /* libxml2.a in Frameworks */, - A955128B1A320B02001BFC6F /* libjansson.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; + 22DD2C4B177B95DA00EF50D3 /* libvpx.a in Frameworks */, + 27D6C77114B102DA00B785E4 /* libx264.a in Frameworks */, + 27D6C77314B102DA00B785E4 /* libxml2.a in Frameworks */, + A955128B1A320B02001BFC6F /* libjansson.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 273F203614ADBC200021BE6D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -528,13 +528,13 @@ 27D6C76A14B102DA00B785E4 /* libtheora.a in Frameworks */, 27D6C76C14B102DA00B785E4 /* libvorbis.a in Frameworks */, 27D6C76E14B102DA00B785E4 /* libvorbisenc.a in Frameworks */, - 22DD2C4A177B94DB00EF50D3 /* libvpx.a in Frameworks */, - 27D6C77014B102DA00B785E4 /* libx264.a in Frameworks */, - 27D6C77214B102DA00B785E4 /* libxml2.a in Frameworks */, - A955128A1A320A6F001BFC6F /* libjansson.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; + 22DD2C4A177B94DB00EF50D3 /* libvpx.a in Frameworks */, + 27D6C77014B102DA00B785E4 /* libx264.a in Frameworks */, + 27D6C77214B102DA00B785E4 /* libxml2.a in Frameworks */, + A955128A1A320A6F001BFC6F /* libjansson.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -560,13 +560,13 @@ 27D6C73C14B102DA00B785E4 /* libtheora.a */, 27D6C73D14B102DA00B785E4 /* libvorbis.a */, 27D6C73E14B102DA00B785E4 /* libvorbisenc.a */, - 22DD2C49177B94DB00EF50D3 /* libvpx.a */, - 27D6C73F14B102DA00B785E4 /* libx264.a */, - 27D6C74014B102DA00B785E4 /* libxml2.a */, - A95512881A320A12001BFC6F /* libjansson.a */, - ); - name = "Static Libraries"; - sourceTree = ""; + 22DD2C49177B94DB00EF50D3 /* libvpx.a */, + 27D6C73F14B102DA00B785E4 /* libx264.a */, + 27D6C74014B102DA00B785E4 /* libxml2.a */, + A95512881A320A12001BFC6F /* libjansson.a */, + ); + name = "Static Libraries"; + sourceTree = ""; }; 271BA4C914B1238E00BC1D2C /* Support */ = { isa = PBXGroup; @@ -857,6 +857,8 @@ A9DEC8761A23C88D00C79B48 /* HBVideo.m */, A9DEC8781A23C89E00C79B48 /* HBPicture.h */, A9DEC8791A23C89E00C79B48 /* HBPicture.m */, + A9523935199A6AAE00588AEF /* HBFilters.h */, + A9523936199A6AAE00588AEF /* HBFilters.m */, A932E271198834130047D13E /* HBAudioDefaults.h */, A932E272198834130047D13E /* HBAudioDefaults.m */, A9F4728B1976BAA70009EC65 /* HBSubtitlesDefaults.h */, @@ -865,8 +867,6 @@ 273F209214ADBE670021BE6D /* HBAudio.m */, A90A0CAD1988D57200DA65CE /* HBAudioTrackPreset.h */, A90A0CAE1988D57200DA65CE /* HBAudioTrackPreset.m */, - A9523935199A6AAE00588AEF /* HBFilters.h */, - A9523936199A6AAE00588AEF /* HBFilters.m */, A9AA447D1970729300D7DEFC /* HBPreviewGenerator.h */, A9D1E41618262364002F6424 /* HBPreviewGenerator.m */, 273F209714ADBE670021BE6D /* HBDVDDetector.h */, diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme index 9dc1fa481..3ec110ffa 100644 --- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme +++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake [DEBUG].xcscheme @@ -72,11 +72,6 @@ - -