diff --git a/codec/build/iOS/common/common.xcodeproj/project.pbxproj b/codec/build/iOS/common/common.xcodeproj/project.pbxproj index d3a4f0fe..5e10134e 100644 --- a/codec/build/iOS/common/common.xcodeproj/project.pbxproj +++ b/codec/build/iOS/common/common.xcodeproj/project.pbxproj @@ -383,8 +383,6 @@ DSTROOT = /tmp/common.dst; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "common/common-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ""; "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = ( APPLE_IOS, @@ -408,8 +406,6 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; DSTROOT = /tmp/common.dst; GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "common/common-Prefix.pch"; "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = ( APPLE_IOS, HAVE_NEON, diff --git a/codec/build/iOS/common/common/common-Prefix.pch b/codec/build/iOS/common/common/common-Prefix.pch deleted file mode 100644 index f3730f46..00000000 --- a/codec/build/iOS/common/common/common-Prefix.pch +++ /dev/null @@ -1,35 +0,0 @@ -/*! - * \copy - * Copyright (c) 2013, Cisco Systems - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifdef __OBJC__ - #import -#endif diff --git a/codec/build/iOS/dec/demo/demo.xcodeproj/project.pbxproj b/codec/build/iOS/dec/demo/demo.xcodeproj/project.pbxproj index c11ea410..5415db54 100644 --- a/codec/build/iOS/dec/demo/demo.xcodeproj/project.pbxproj +++ b/codec/build/iOS/dec/demo/demo.xcodeproj/project.pbxproj @@ -425,8 +425,6 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "demo/demo-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", APPLE_IOS, @@ -449,8 +447,6 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "demo/demo-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = APPLE_IOS; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../../api/svc\"", diff --git a/codec/build/iOS/dec/demo/demo/demo-Prefix.pch b/codec/build/iOS/dec/demo/demo/demo-Prefix.pch deleted file mode 100644 index 29fd3efa..00000000 --- a/codec/build/iOS/dec/demo/demo/demo-Prefix.pch +++ /dev/null @@ -1,46 +0,0 @@ -/*! - * \copy - * Copyright (c) 2013, Cisco Systems - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * Prefix header for all source files of the 'demo' target in the 'demo' project - */ - -#import - -#ifndef __IPHONE_5_0 -#warning "This project uses features only available in iOS SDK 5.0 and later." -#endif - -#ifdef __OBJC__ - #import - #import -#endif - -//For linking welsdec.a -#define _STATIC_LINK_DECODER_LIB_ \ No newline at end of file diff --git a/codec/build/iOS/dec/welsdec/welsdec.xcodeproj/project.pbxproj b/codec/build/iOS/dec/welsdec/welsdec.xcodeproj/project.pbxproj index 15317e43..b578c091 100644 --- a/codec/build/iOS/dec/welsdec/welsdec.xcodeproj/project.pbxproj +++ b/codec/build/iOS/dec/welsdec/welsdec.xcodeproj/project.pbxproj @@ -554,15 +554,18 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; DSTROOT = /tmp/welsdec.dst; GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "welsdec/welsdec-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ""; "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = ( APPLE_IOS, HAVE_NEON, ); "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS; - HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../../../common\""; + HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../../common\"", + "$(SRCROOT)/../../../../decoder/core/inc", + "$(SRCROOT)/../../../../decoder/plus/inc", + "$(SRCROOT)/../../../../api/svc", + ); IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -579,14 +582,17 @@ CLANG_CXX_LIBRARY = "compiler-default"; CODE_SIGN_IDENTITY = "iPhone Developer"; DSTROOT = /tmp/welsdec.dst; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "welsdec/welsdec-Prefix.pch"; "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = ( APPLE_IOS, HAVE_NEON, ); "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS; - HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../../../../common\""; + HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../../common\"", + "$(SRCROOT)/../../../../decoder/core/inc", + "$(SRCROOT)/../../../../decoder/plus/inc", + "$(SRCROOT)/../../../../api/svc", + ); IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/codec/build/iOS/dec/welsdec/welsdec/welsdec-Prefix.pch b/codec/build/iOS/dec/welsdec/welsdec/welsdec-Prefix.pch deleted file mode 100644 index f3730f46..00000000 --- a/codec/build/iOS/dec/welsdec/welsdec/welsdec-Prefix.pch +++ /dev/null @@ -1,35 +0,0 @@ -/*! - * \copy - * Copyright (c) 2013, Cisco Systems - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifdef __OBJC__ - #import -#endif diff --git a/codec/build/iOS/enc/welsenc/welsenc.xcodeproj/project.pbxproj b/codec/build/iOS/enc/welsenc/welsenc.xcodeproj/project.pbxproj index d90c8c6b..b0d1eab4 100644 --- a/codec/build/iOS/enc/welsenc/welsenc.xcodeproj/project.pbxproj +++ b/codec/build/iOS/enc/welsenc/welsenc.xcodeproj/project.pbxproj @@ -629,8 +629,6 @@ DSTROOT = /tmp/welsenc.dst; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "welsenc/welsenc-Prefix.pch"; "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = ( APPLE_IOS, HAVE_NEON, @@ -639,6 +637,9 @@ HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../../common\"", "\"$(SRCROOT)/../../../../processing/interface\"", + "$(SRCROOT)/../../../../encoder/core/inc", + "$(SRCROOT)/../../../../encoder/plus/inc", + "$(SRCROOT)/../../../../api/svc", ); IPHONEOS_DEPLOYMENT_TARGET = 6.1; ONLY_ACTIVE_ARCH = NO; @@ -658,8 +659,6 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; DSTROOT = /tmp/welsenc.dst; GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "welsenc/welsenc-Prefix.pch"; "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = ( APPLE_IOS, HAVE_NEON, @@ -668,6 +667,9 @@ HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../../common\"", "\"$(SRCROOT)/../../../../processing/interface\"", + "$(SRCROOT)/../../../../encoder/core/inc", + "$(SRCROOT)/../../../../encoder/plus/inc", + "$(SRCROOT)/../../../../api/svc", ); IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_LDFLAGS = "-ObjC"; diff --git a/codec/build/iOS/enc/welsenc/welsenc/welsenc-Prefix.pch b/codec/build/iOS/enc/welsenc/welsenc/welsenc-Prefix.pch deleted file mode 100644 index f3730f46..00000000 --- a/codec/build/iOS/enc/welsenc/welsenc/welsenc-Prefix.pch +++ /dev/null @@ -1,35 +0,0 @@ -/*! - * \copy - * Copyright (c) 2013, Cisco Systems - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifdef __OBJC__ - #import -#endif diff --git a/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj b/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj index 4a207c9b..6966e0a0 100644 --- a/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj +++ b/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj @@ -522,11 +522,11 @@ DSTROOT = /tmp/processing.dst; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "processing/processing-Prefix.pch"; HEADER_SEARCH_PATHS = ( /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "\"$(SRCROOT)/../../../common\"", + "$(SRCROOT)/../../src/common", + "$(SRCROOT)/../../interface", ); IPHONEOS_DEPLOYMENT_TARGET = 6.1; ONLY_ACTIVE_ARCH = NO; @@ -546,11 +546,11 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; DSTROOT = /tmp/processing.dst; GCC_C_LANGUAGE_STANDARD = "compiler-default"; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "processing/processing-Prefix.pch"; HEADER_SEARCH_PATHS = ( /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "\"$(SRCROOT)/../../../common\"", + "$(SRCROOT)/../../src/common", + "$(SRCROOT)/../../interface", ); IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_LDFLAGS = "-ObjC"; diff --git a/codec/processing/build/iOS/processing/processing-Prefix.pch b/codec/processing/build/iOS/processing/processing-Prefix.pch deleted file mode 100644 index f3730f46..00000000 --- a/codec/processing/build/iOS/processing/processing-Prefix.pch +++ /dev/null @@ -1,35 +0,0 @@ -/*! - * \copy - * Copyright (c) 2013, Cisco Systems - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifdef __OBJC__ - #import -#endif