From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" <mattatobin@localhost.localdomain> Date: Fri, 2 Feb 2018 04:16:08 -0500 Subject: Add m-esr52 at 52.6.0 --- .../trunk/tools/gyp/test/mac/cflags/ccfile.cc | 7 ++ .../tools/gyp/test/mac/cflags/ccfile_withcflags.cc | 7 ++ .../webrtc/trunk/tools/gyp/test/mac/cflags/cfile.c | 7 ++ .../trunk/tools/gyp/test/mac/cflags/cppfile.cpp | 7 ++ .../gyp/test/mac/cflags/cppfile_withcflags.cpp | 7 ++ .../trunk/tools/gyp/test/mac/cflags/cxxfile.cxx | 7 ++ .../gyp/test/mac/cflags/cxxfile_withcflags.cxx | 7 ++ .../webrtc/trunk/tools/gyp/test/mac/cflags/mfile.m | 7 ++ .../trunk/tools/gyp/test/mac/cflags/mmfile.mm | 7 ++ .../tools/gyp/test/mac/cflags/mmfile_withcflags.mm | 7 ++ .../trunk/tools/gyp/test/mac/cflags/test.gyp | 132 +++++++++++++++++++++ 11 files changed, 202 insertions(+) create mode 100644 media/webrtc/trunk/tools/gyp/test/mac/cflags/ccfile.cc create mode 100644 media/webrtc/trunk/tools/gyp/test/mac/cflags/ccfile_withcflags.cc create mode 100644 media/webrtc/trunk/tools/gyp/test/mac/cflags/cfile.c create mode 100644 media/webrtc/trunk/tools/gyp/test/mac/cflags/cppfile.cpp create mode 100644 media/webrtc/trunk/tools/gyp/test/mac/cflags/cppfile_withcflags.cpp create mode 100644 media/webrtc/trunk/tools/gyp/test/mac/cflags/cxxfile.cxx create mode 100644 media/webrtc/trunk/tools/gyp/test/mac/cflags/cxxfile_withcflags.cxx create mode 100644 media/webrtc/trunk/tools/gyp/test/mac/cflags/mfile.m create mode 100644 media/webrtc/trunk/tools/gyp/test/mac/cflags/mmfile.mm create mode 100644 media/webrtc/trunk/tools/gyp/test/mac/cflags/mmfile_withcflags.mm create mode 100644 media/webrtc/trunk/tools/gyp/test/mac/cflags/test.gyp (limited to 'media/webrtc/trunk/tools/gyp/test/mac/cflags') diff --git a/media/webrtc/trunk/tools/gyp/test/mac/cflags/ccfile.cc b/media/webrtc/trunk/tools/gyp/test/mac/cflags/ccfile.cc new file mode 100644 index 000000000..1a54d18ee --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/mac/cflags/ccfile.cc @@ -0,0 +1,7 @@ +#ifdef CFLAG +#error CFLAG should not be set +#endif + +#ifndef CCFLAG +#error CCFLAG should be set +#endif diff --git a/media/webrtc/trunk/tools/gyp/test/mac/cflags/ccfile_withcflags.cc b/media/webrtc/trunk/tools/gyp/test/mac/cflags/ccfile_withcflags.cc new file mode 100644 index 000000000..de078a064 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/mac/cflags/ccfile_withcflags.cc @@ -0,0 +1,7 @@ +#ifndef CFLAG +#error CFLAG should be set +#endif + +#ifndef CCFLAG +#error CCFLAG should be set +#endif diff --git a/media/webrtc/trunk/tools/gyp/test/mac/cflags/cfile.c b/media/webrtc/trunk/tools/gyp/test/mac/cflags/cfile.c new file mode 100644 index 000000000..0af9d0af5 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/mac/cflags/cfile.c @@ -0,0 +1,7 @@ +#ifndef CFLAG +#error CFLAG should be set +#endif + +#ifdef CCFLAG +#error CCFLAG should not be set +#endif diff --git a/media/webrtc/trunk/tools/gyp/test/mac/cflags/cppfile.cpp b/media/webrtc/trunk/tools/gyp/test/mac/cflags/cppfile.cpp new file mode 100644 index 000000000..1a54d18ee --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/mac/cflags/cppfile.cpp @@ -0,0 +1,7 @@ +#ifdef CFLAG +#error CFLAG should not be set +#endif + +#ifndef CCFLAG +#error CCFLAG should be set +#endif diff --git a/media/webrtc/trunk/tools/gyp/test/mac/cflags/cppfile_withcflags.cpp b/media/webrtc/trunk/tools/gyp/test/mac/cflags/cppfile_withcflags.cpp new file mode 100644 index 000000000..de078a064 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/mac/cflags/cppfile_withcflags.cpp @@ -0,0 +1,7 @@ +#ifndef CFLAG +#error CFLAG should be set +#endif + +#ifndef CCFLAG +#error CCFLAG should be set +#endif diff --git a/media/webrtc/trunk/tools/gyp/test/mac/cflags/cxxfile.cxx b/media/webrtc/trunk/tools/gyp/test/mac/cflags/cxxfile.cxx new file mode 100644 index 000000000..1a54d18ee --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/mac/cflags/cxxfile.cxx @@ -0,0 +1,7 @@ +#ifdef CFLAG +#error CFLAG should not be set +#endif + +#ifndef CCFLAG +#error CCFLAG should be set +#endif diff --git a/media/webrtc/trunk/tools/gyp/test/mac/cflags/cxxfile_withcflags.cxx b/media/webrtc/trunk/tools/gyp/test/mac/cflags/cxxfile_withcflags.cxx new file mode 100644 index 000000000..de078a064 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/mac/cflags/cxxfile_withcflags.cxx @@ -0,0 +1,7 @@ +#ifndef CFLAG +#error CFLAG should be set +#endif + +#ifndef CCFLAG +#error CCFLAG should be set +#endif diff --git a/media/webrtc/trunk/tools/gyp/test/mac/cflags/mfile.m b/media/webrtc/trunk/tools/gyp/test/mac/cflags/mfile.m new file mode 100644 index 000000000..0af9d0af5 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/mac/cflags/mfile.m @@ -0,0 +1,7 @@ +#ifndef CFLAG +#error CFLAG should be set +#endif + +#ifdef CCFLAG +#error CCFLAG should not be set +#endif diff --git a/media/webrtc/trunk/tools/gyp/test/mac/cflags/mmfile.mm b/media/webrtc/trunk/tools/gyp/test/mac/cflags/mmfile.mm new file mode 100644 index 000000000..1a54d18ee --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/mac/cflags/mmfile.mm @@ -0,0 +1,7 @@ +#ifdef CFLAG +#error CFLAG should not be set +#endif + +#ifndef CCFLAG +#error CCFLAG should be set +#endif diff --git a/media/webrtc/trunk/tools/gyp/test/mac/cflags/mmfile_withcflags.mm b/media/webrtc/trunk/tools/gyp/test/mac/cflags/mmfile_withcflags.mm new file mode 100644 index 000000000..de078a064 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/mac/cflags/mmfile_withcflags.mm @@ -0,0 +1,7 @@ +#ifndef CFLAG +#error CFLAG should be set +#endif + +#ifndef CCFLAG +#error CCFLAG should be set +#endif diff --git a/media/webrtc/trunk/tools/gyp/test/mac/cflags/test.gyp b/media/webrtc/trunk/tools/gyp/test/mac/cflags/test.gyp new file mode 100644 index 000000000..d330a548f --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/mac/cflags/test.gyp @@ -0,0 +1,132 @@ +# Copyright (c) 2012 Google Inc. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'targets': [ + { + 'target_name': 'mytarget', + 'type': 'shared_library', + 'sources': [ + 'cfile.c', + 'mfile.m', + 'ccfile.cc', + 'cppfile.cpp', + 'cxxfile.cxx', + 'mmfile.mm', + ], + 'xcode_settings': { + # Normally, defines would go in 'defines' instead. This is just for + # testing. + 'OTHER_CFLAGS': [ + '-DCFLAG', + ], + 'OTHER_CPLUSPLUSFLAGS': [ + '-DCCFLAG', + ], + 'GCC_C_LANGUAGE_STANDARD': 'c99', + }, + }, + { + 'target_name': 'mytarget_reuse_cflags', + 'type': 'shared_library', + 'sources': [ + 'cfile.c', + 'mfile.m', + 'ccfile_withcflags.cc', + 'cppfile_withcflags.cpp', + 'cxxfile_withcflags.cxx', + 'mmfile_withcflags.mm', + ], + 'xcode_settings': { + 'OTHER_CFLAGS': [ + '-DCFLAG', + ], + 'OTHER_CPLUSPLUSFLAGS': [ + '$OTHER_CFLAGS', + '-DCCFLAG', + ], + # This is a C-only flag, to check these don't get added to C++ files. + 'GCC_C_LANGUAGE_STANDARD': 'c99', + }, + }, + { + 'target_name': 'mytarget_inherit_cflags', + 'type': 'shared_library', + 'sources': [ + 'cfile.c', + 'mfile.m', + 'ccfile_withcflags.cc', + 'cppfile_withcflags.cpp', + 'cxxfile_withcflags.cxx', + 'mmfile_withcflags.mm', + ], + 'xcode_settings': { + 'OTHER_CFLAGS': [ + '-DCFLAG', + ], + 'OTHER_CPLUSPLUSFLAGS': [ + '$inherited', + '-DCCFLAG', + ], + 'GCC_C_LANGUAGE_STANDARD': 'c99', + }, + }, + { + 'target_name': 'mytarget_inherit_cflags_parens', + 'type': 'shared_library', + 'sources': [ + 'cfile.c', + 'mfile.m', + 'ccfile_withcflags.cc', + 'cppfile_withcflags.cpp', + 'cxxfile_withcflags.cxx', + 'mmfile_withcflags.mm', + ], + 'xcode_settings': { + 'OTHER_CFLAGS': [ + '-DCFLAG', + ], + 'OTHER_CPLUSPLUSFLAGS': [ + '$(inherited)', + '-DCCFLAG', + ], + 'GCC_C_LANGUAGE_STANDARD': 'c99', + }, + }, + { + 'target_name': 'mytarget_inherit_cflags_braces', + 'type': 'shared_library', + 'sources': [ + 'cfile.c', + 'mfile.m', + 'ccfile_withcflags.cc', + 'cppfile_withcflags.cpp', + 'cxxfile_withcflags.cxx', + 'mmfile_withcflags.mm', + ], + 'xcode_settings': { + 'OTHER_CFLAGS': [ + '-DCFLAG', + ], + 'OTHER_CPLUSPLUSFLAGS': [ + '${inherited}', + '-DCCFLAG', + ], + 'GCC_C_LANGUAGE_STANDARD': 'c99', + }, + }, + { + 'target_name': 'ansi_standard', + 'type': 'shared_library', + 'sources': [ + 'cfile.c', + ], + 'xcode_settings': { + 'OTHER_CFLAGS': [ + '-DCFLAG', + ], + 'GCC_C_LANGUAGE_STANDARD': 'ansi', + }, + }, + ], +} -- cgit v1.2.3