diff --git a/modules/videoio/include/opencv2/videoio/cap_ios.h b/modules/videoio/include/opencv2/videoio/cap_ios.h index c90ad2e73e..0691420cf7 100644 --- a/modules/videoio/include/opencv2/videoio/cap_ios.h +++ b/modules/videoio/include/opencv2/videoio/cap_ios.h @@ -39,7 +39,7 @@ @class CvAbstractCamera; -@interface CvAbstractCamera : NSObject +CV_EXPORTS @interface CvAbstractCamera : NSObject { UIDeviceOrientation currentDeviceOrientation; @@ -87,7 +87,7 @@ @class CvVideoCamera; -@protocol CvVideoCameraDelegate +CV_EXPORTS @protocol CvVideoCameraDelegate #ifdef __cplusplus // delegate method for processing image frames @@ -96,7 +96,7 @@ @end -@interface CvVideoCamera : CvAbstractCamera +CV_EXPORTS @interface CvVideoCamera : CvAbstractCamera { AVCaptureVideoDataOutput *videoDataOutput; @@ -129,14 +129,14 @@ @class CvPhotoCamera; -@protocol CvPhotoCameraDelegate +CV_EXPORTS @protocol CvPhotoCameraDelegate - (void)photoCamera:(CvPhotoCamera*)photoCamera capturedImage:(UIImage *)image; - (void)photoCameraCancel:(CvPhotoCamera*)photoCamera; @end -@interface CvPhotoCamera : CvAbstractCamera +CV_EXPORTS @interface CvPhotoCamera : CvAbstractCamera { AVCaptureStillImageOutput *stillImageOutput; } diff --git a/platforms/osx/build_framework.py b/platforms/osx/build_framework.py index 2d39be5f9b..64e73c5490 100644 --- a/platforms/osx/build_framework.py +++ b/platforms/osx/build_framework.py @@ -15,10 +15,10 @@ class OSXBuilder(Builder): def getToolchain(self, arch, target): return None - def getBuildCommand(self, arch, target): + def getBuildCommand(self, archs, target): buildcmd = [ "xcodebuild", - "ARCHS=%s" % arch, + "ARCHS=%s" % archs[0], "-sdk", target.lower(), "-configuration", "Release", "-parallelizeTargets", @@ -39,8 +39,8 @@ if __name__ == "__main__": parser.add_argument('--without', metavar='MODULE', default=[], action='append', help='OpenCV modules to exclude from the framework') args = parser.parse_args() - b = OSXBuilder(args.opencv, args.contrib, args.without, + b = OSXBuilder(args.opencv, args.contrib, False, False, args.without, [ - ("x86_64", "MacOSX") + (["x86_64"], "MacOSX") ]) b.build(args.out)