X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FHandBrake.xcodeproj%2Fproject.pbxproj;h=17ee30598fed3d65fe12cdc695e7645f98ceabed;hb=f35d39f9adca67471b72f3e47398855d51481f87;hp=28845e6e092eb0d64d7289ce5b6b41a018f40ac3;hpb=edee669827f671c4393f17b35311b6fb68192f29;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj index 28845e6e..17ee3059 100644 --- a/macosx/HandBrake.xcodeproj/project.pbxproj +++ b/macosx/HandBrake.xcodeproj/project.pbxproj @@ -30,7 +30,7 @@ 4DD93F92082036E8008E1322 /* HBPreviewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D1FD381073D19CE00E46515 /* HBPreviewController.h */; }; 4DD93F97082036E8008E1322 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 4DD93F9A082036E8008E1322 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; settings = {ATTRIBUTES = (); }; }; - 4DD93F9B082036E8008E1322 /* Controller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4DF3C8CC052889CD00A80101 /* Controller.mm */; }; + 4DD93F9B082036E8008E1322 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DF3C8CC052889CD00A80101 /* Controller.m */; }; 4DD93F9E082036E8008E1322 /* HBPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1FD382073D19CE00E46515 /* HBPreviewController.m */; }; 4DD93FA2082036E8008E1322 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 4DD93FA3082036E8008E1322 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DEB2024052B055F00C39CA9 /* IOKit.framework */; }; @@ -51,7 +51,7 @@ A2A1EC310C76C35E00827E0D /* HBDVDDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */; }; A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1EC390C76C58400827E0D /* HBDVDDetector.m */; }; A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */; }; - A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */; }; + A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */; }; A2D0A0AB0D3E5929002D57CB /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; }; A2D0A0BF0D3E596F002D57CB /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; }; A2D18AA70FD81C50003C997B /* HBSubtitles.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D18AA50FD81C50003C997B /* HBSubtitles.h */; }; @@ -160,7 +160,7 @@ 4DDE9724052B7B2B00C39CA9 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; 4DEB2024052B055F00C39CA9 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; 4DF3C8CB052889CD00A80101 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = ""; }; - 4DF3C8CC052889CD00A80101 /* Controller.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = Controller.mm; sourceTree = ""; }; + 4DF3C8CC052889CD00A80101 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = ""; }; 526FBC760B4CA8F40064E04C /* test.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = test.c; path = ../test/test.c; sourceTree = SOURCE_ROOT; }; 593034E90BBA39A100172349 /* ChapterTitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChapterTitles.h; sourceTree = ""; }; 593034EA0BBA39A100172349 /* ChapterTitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChapterTitles.m; sourceTree = ""; }; @@ -179,7 +179,7 @@ A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBDVDDetector.h; sourceTree = ""; }; A2A1EC390C76C58400827E0D /* HBDVDDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBDVDDetector.m; sourceTree = ""; }; A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = ""; }; - A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = ""; }; + A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureController.m; sourceTree = ""; }; A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = ""; }; A2D18AA50FD81C50003C997B /* HBSubtitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitles.h; sourceTree = ""; }; A2D18AA60FD81C50003C997B /* HBSubtitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitles.m; sourceTree = ""; }; @@ -343,14 +343,14 @@ children = ( A2D18AA50FD81C50003C997B /* HBSubtitles.h */, A2D18AA60FD81C50003C997B /* HBSubtitles.m */, - 4DF3C8CC052889CD00A80101 /* Controller.mm */, + 4DF3C8CB052889CD00A80101 /* Controller.h */, + 4DF3C8CC052889CD00A80101 /* Controller.m */, A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */, - A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */, + A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */, A22C85EA0D05D35000C10E36 /* HBPresets.h */, A22C85EB0D05D35000C10E36 /* HBPresets.m */, 4D1FD381073D19CE00E46515 /* HBPreviewController.h */, 4D1FD382073D19CE00E46515 /* HBPreviewController.m */, - 4DF3C8CB052889CD00A80101 /* Controller.h */, 593034E90BBA39A100172349 /* ChapterTitles.h */, 593034EA0BBA39A100172349 /* ChapterTitles.m */, A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */, @@ -610,7 +610,7 @@ files = ( 59CBD2650BBB4D1B004A3BE3 /* ChapterTitles.m in Sources */, 4DD93F9A082036E8008E1322 /* main.mm in Sources */, - 4DD93F9B082036E8008E1322 /* Controller.mm in Sources */, + 4DD93F9B082036E8008E1322 /* Controller.m in Sources */, 4DD93F9E082036E8008E1322 /* HBPreviewController.m in Sources */, A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */, 253886020BFE0A5B0064E995 /* HBOutputRedirect.m in Sources */, @@ -620,7 +620,7 @@ A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */, E37172670C977D340072B384 /* HBImageAndTextCell.m in Sources */, A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */, - A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */, + A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.m in Sources */, A2D18AA80FD81C50003C997B /* HBSubtitles.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -711,6 +711,7 @@ 0DFF0C0D0B6BCEE000549488 /* debug */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = "compiler-default"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", @@ -741,6 +742,7 @@ 0DFF0C0E0B6BCEE000549488 /* standard */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = "compiler-default"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", @@ -779,6 +781,7 @@ EXTERNAL_METHOD = xcode; EXTERNAL_SRC = ..; FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; @@ -842,6 +845,7 @@ 27B4DEB40F65BAB600098046 /* standard.i386 */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = "compiler-default"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", @@ -901,6 +905,7 @@ EXTERNAL_METHOD = xcode; EXTERNAL_SRC = ..; FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; @@ -964,6 +969,7 @@ 27B4DEBA0F65BAB700098046 /* standard.x86_64 */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = "compiler-default"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", @@ -1023,6 +1029,7 @@ EXTERNAL_METHOD = xcode; EXTERNAL_SRC = ..; FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; @@ -1086,6 +1093,7 @@ 27B4DEC00F65BAB800098046 /* standard.ppc */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = "compiler-default"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", @@ -1145,6 +1153,7 @@ EXTERNAL_METHOD = xcode; EXTERNAL_SRC = ..; FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; @@ -1208,6 +1217,7 @@ 27B4DEC60F65BAB900098046 /* standard.ppc64 */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = "compiler-default"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", @@ -1269,6 +1279,7 @@ EXTERNAL_METHOD = xcode; EXTERNAL_SRC = ..; FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1333,6 +1344,7 @@ 27B4DECC0F65BABC00098046 /* debug.i386 */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = "compiler-default"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", @@ -1394,6 +1406,7 @@ EXTERNAL_METHOD = xcode; EXTERNAL_SRC = ..; FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1458,6 +1471,7 @@ 27B4DED20F65BABD00098046 /* debug.x86_64 */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = "compiler-default"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", @@ -1519,6 +1533,7 @@ EXTERNAL_METHOD = xcode; EXTERNAL_SRC = ..; FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1583,6 +1598,7 @@ 27B4DED80F65BABD00098046 /* debug.ppc */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = "compiler-default"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", @@ -1644,6 +1660,7 @@ EXTERNAL_METHOD = xcode; EXTERNAL_SRC = ..; FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1708,6 +1725,7 @@ 27B4DEDE0F65BABD00098046 /* debug.ppc64 */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_C_LANGUAGE_STANDARD = "compiler-default"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( "$(EXTERNAL_BUILD)/contrib/lib/liba52.a", @@ -1892,6 +1910,7 @@ EXTERNAL_METHOD = xcode; EXTERNAL_SRC = ..; FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1922,6 +1941,7 @@ EXTERNAL_METHOD = xcode; EXTERNAL_SRC = ..; FRAMEWORK_SEARCH_PATHS = "$(EXTERNAL_SRC)/macosx"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5;