Remove unnecessary objective-c compiler flags.
Review URL: http://webrtc-codereview.appspot.com/239011
git-svn-id: http://webrtc.googlecode.com/svn/trunk@802 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/src/modules/video_capture/main/source/video_capture.gypi b/src/modules/video_capture/main/source/video_capture.gypi
index e4834ed..20ca8cb 100644
--- a/src/modules/video_capture/main/source/video_capture.gypi
+++ b/src/modules/video_capture/main/source/video_capture.gypi
@@ -251,9 +251,7 @@
}],
['OS=="mac"', {
'xcode_settings': {
- # TODO(andrew): remove this. Shouldn't be needed when required
- # files have proper .mm extensions.
- 'OTHER_CPLUSPLUSFLAGS': '-x objective-c++',
+ # TODO(andrew): CoreAudio and AudioToolbox shouldn't be needed.
'OTHER_LDFLAGS': [
'-framework Foundation -framework AppKit -framework Cocoa -framework OpenGL -framework CoreVideo -framework CoreAudio -framework AudioToolbox',
],
diff --git a/src/modules/video_render/main/source/video_render.gypi b/src/modules/video_render/main/source/video_render.gypi
index 2a154de..2868e6e 100644
--- a/src/modules/video_render/main/source/video_render.gypi
+++ b/src/modules/video_render/main/source/video_render.gypi
@@ -167,9 +167,6 @@
}],
['OS=="mac"', {
'xcode_settings': {
- # TODO(andrew): remove this. It shouldn't be needed when the
- # required files have proper .mm extensions.
- 'OTHER_CPLUSPLUSFLAGS': '-x objective-c++',
'OTHER_LDFLAGS': [
'-framework Foundation -framework AppKit -framework Cocoa -framework OpenGL',
],
diff --git a/src/video_engine/main/test/AutoTest/vie_auto_test.gypi b/src/video_engine/main/test/AutoTest/vie_auto_test.gypi
index 2634c97..fb6a596 100644
--- a/src/video_engine/main/test/AutoTest/vie_auto_test.gypi
+++ b/src/video_engine/main/test/AutoTest/vie_auto_test.gypi
@@ -42,11 +42,11 @@
'interface/vie_autotest_main.h',
'interface/vie_autotest_window_manager_interface.h',
'interface/vie_autotest_windows.h',
-
+
# Helper classes
'helpers/vie_window_creator.cc',
'helpers/vie_file_capture_device.cc',
-
+
# New, fully automated tests
'automated/vie_api_integration_test.cc',
'automated/vie_extended_integration_test.cc',
@@ -135,9 +135,6 @@
}],
['OS=="mac"', {
'xcode_settings': {
- # TODO(andrew): remove this when the issue with Objective-C in
- # vie_autotest_main.cc is worked out.
- 'OTHER_CPLUSPLUSFLAGS': '-x objective-c++',
'OTHER_LDFLAGS': [
'-framework Foundation -framework AppKit -framework Cocoa -framework OpenGL -framework CoreVideo -framework CoreAudio -framework AudioToolbox',
],