summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorritsuka <[email protected]>2009-08-29 13:27:45 +0000
committerritsuka <[email protected]>2009-08-29 13:27:45 +0000
commitfab46b2a994d8d60980e5474ee8a7ede5e0742ca (patch)
tree8824c2742dff74e5261589f03a63f0e76321bdd9 /macosx
parent5f9fd99f84eb5d5cf582318c180130aa2a46f4f8 (diff)
MacGUI: rename PictureController.mm too
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2790 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx')
-rw-r--r--macosx/HandBrake.xcodeproj/project.pbxproj18
-rw-r--r--macosx/PictureController.m (renamed from macosx/PictureController.mm)0
2 files changed, 14 insertions, 4 deletions
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 06880be55..17ee30598 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -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 */; };
@@ -179,7 +179,7 @@
A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBDVDDetector.h; sourceTree = "<group>"; };
A2A1EC390C76C58400827E0D /* HBDVDDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBDVDDetector.m; sourceTree = "<group>"; };
A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; };
- A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = "<group>"; };
+ A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PictureController.m; sourceTree = "<group>"; };
A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
A2D18AA50FD81C50003C997B /* HBSubtitles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSubtitles.h; sourceTree = "<group>"; };
A2D18AA60FD81C50003C997B /* HBSubtitles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSubtitles.m; sourceTree = "<group>"; };
@@ -346,7 +346,7 @@
4DF3C8CB052889CD00A80101 /* Controller.h */,
4DF3C8CC052889CD00A80101 /* Controller.m */,
A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */,
- A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */,
+ A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.m */,
A22C85EA0D05D35000C10E36 /* HBPresets.h */,
A22C85EB0D05D35000C10E36 /* HBPresets.m */,
4D1FD381073D19CE00E46515 /* HBPreviewController.h */,
@@ -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",
@@ -843,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",
@@ -966,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",
@@ -1089,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",
@@ -1212,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",
@@ -1338,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",
@@ -1464,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",
@@ -1590,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",
@@ -1716,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",
diff --git a/macosx/PictureController.mm b/macosx/PictureController.m
index 307962aeb..307962aeb 100644
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.m