remove ARC feature test from implementation, add it to env conditiona…

…l section of ofConstants.h
openframeworks · Mar 17, 2022 · 96f11b8 · 96f11b8
1 parent cbef3f2
commit 96f11b8
Show file tree

Hide file tree

Showing 30 changed files with 9 additions and 116 deletions.
diff --git a/addons/ofxiOS/src/core/ofxiOSAppDelegate.mm b/addons/ofxiOS/src/core/ofxiOSAppDelegate.mm
@@ -33,10 +33,6 @@
 
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 #import "ofxiOSViewController.h"
 #import "ofxiOSGLKViewController.h"
 #import "ofxiOSExternalDisplay.h"

diff --git a/addons/ofxiOS/src/core/ofxiOSEAGLView.mm b/addons/ofxiOS/src/core/ofxiOSEAGLView.mm
@@ -13,10 +13,6 @@
 #include <TargetConditionals.h>
 #import <GameController/GameController.h>
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 static ofxiOSEAGLView * _instanceRef = nil;
 
 @interface ofxiOSEAGLView() {

diff --git a/addons/ofxiOS/src/core/ofxiOSGLKView.mm b/addons/ofxiOS/src/core/ofxiOSGLKView.mm
@@ -13,10 +13,6 @@
 #include <TargetConditionals.h>
 #import <GameController/GameController.h>
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 static ofxiOSGLKView * _instanceRef = nil;
 
 @interface ofxiOSGLKView() {

diff --git a/addons/ofxiOS/src/core/ofxiOSGLKViewController.mm b/addons/ofxiOS/src/core/ofxiOSGLKViewController.mm
@@ -8,10 +8,6 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 #import "ofxiOSGLKViewController.h"
 
 #include "ofxiOSGLKView.h"

diff --git a/addons/ofxiOS/src/core/ofxiOSViewController.mm b/addons/ofxiOS/src/core/ofxiOSViewController.mm
@@ -6,10 +6,6 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 #import <QuartzCore/QuartzCore.h>
 
 #include "ofxiOSViewController.h"

diff --git a/addons/ofxiOS/src/gl/EAGLKView.m b/addons/ofxiOS/src/gl/EAGLKView.m
@@ -12,10 +12,6 @@
 #import "ES1Renderer.h"
 #import "ES2Renderer.h"
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 @interface EAGLKView() {
     BOOL bInit;
 }

diff --git a/addons/ofxiOS/src/gl/EAGLView.m b/addons/ofxiOS/src/gl/EAGLView.m
@@ -30,10 +30,6 @@
  * ***********************************************************************/ 
 
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 #import <QuartzCore/QuartzCore.h>
 
 #include <TargetConditionals.h>

diff --git a/addons/ofxiOS/src/gl/ES1Renderer.m b/addons/ofxiOS/src/gl/ES1Renderer.m
@@ -2,10 +2,6 @@
 
 #import "ES1Renderer.h"
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 @implementation ES1Renderer
 
 // Create an OpenGL ES 1.1 context

diff --git a/addons/ofxiOS/src/gl/ES2Renderer.m b/addons/ofxiOS/src/gl/ES2Renderer.m
@@ -2,10 +2,6 @@
 
 #import "ES2Renderer.h"
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 @implementation ES2Renderer
 
 // Create an OpenGL ES 2.0 context

diff --git a/addons/ofxiOS/src/sound/AVSoundPlayer.m b/addons/ofxiOS/src/sound/AVSoundPlayer.m
@@ -7,10 +7,6 @@
 #import "AVSoundPlayer.h"
 #include <TargetConditionals.h>
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 @interface AVSoundPlayer() {
     BOOL bMultiPlay;
 }

diff --git a/addons/ofxiOS/src/sound/SoundInputStream.m b/addons/ofxiOS/src/sound/SoundInputStream.m
@@ -17,10 +17,6 @@
 #import "SoundInputStream.h"
 #import <AVFoundation/AVFoundation.h>
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 typedef struct {
 	AudioBufferList * bufferList;
 	AudioUnit remoteIO;

diff --git a/addons/ofxiOS/src/sound/SoundOutputStream.m b/addons/ofxiOS/src/sound/SoundOutputStream.m
@@ -16,10 +16,6 @@
 
 #import "SoundOutputStream.h"
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 static OSStatus soundOutputStreamRenderCallback(void *inRefCon,
                                                 AudioUnitRenderActionFlags *ioActionFlags,
                                                 const AudioTimeStamp *inTimeStamp,

diff --git a/addons/ofxiOS/src/sound/SoundStream.m b/addons/ofxiOS/src/sound/SoundStream.m
@@ -8,10 +8,6 @@
 #import "SoundStream.h"
 #import <AVFoundation/AVFoundation.h>
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 @interface SoundStream() {
     //
 }

diff --git a/addons/ofxiOS/src/sound/ofxiOSSoundPlayer.mm b/addons/ofxiOS/src/sound/ofxiOSSoundPlayer.mm
@@ -9,10 +9,6 @@
 #include "ofLog.h"
 #import "AVSoundPlayer.h"
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 using namespace std;
 
 ofxiOSSoundPlayer::ofxiOSSoundPlayer() {

diff --git a/addons/ofxiOS/src/sound/ofxiOSSoundStream.mm b/addons/ofxiOS/src/sound/ofxiOSSoundStream.mm
@@ -15,10 +15,6 @@
 #import "SoundOutputStream.h"
 #import <AVFoundation/AVFoundation.h>
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 using namespace std;
 
 //------------------------------------------------------------------------------

diff --git a/addons/ofxiOS/src/sound/ofxiOSSoundStreamDelegate.mm b/addons/ofxiOS/src/sound/ofxiOSSoundStreamDelegate.mm
@@ -8,10 +8,6 @@
 #include "ofLog.h"
 #include "ofSoundBuffer.h"
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 @interface ofxiOSSoundStreamDelegate() {
 	std::function<void(ofSoundBuffer &)> inCallback;
 	std::function<void(ofSoundBuffer &)> outCallback;

diff --git a/addons/ofxiOS/src/utils/ofxiOSCoreLocation.mm b/addons/ofxiOS/src/utils/ofxiOSCoreLocation.mm
@@ -22,10 +22,6 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 //C++ class implementations
 
 //--------------------------------------------------------------

diff --git a/addons/ofxiOS/src/utils/ofxiOSCoreMotion.mm b/addons/ofxiOS/src/utils/ofxiOSCoreMotion.mm
@@ -1,10 +1,6 @@
 
 #include "ofxiOSCoreMotion.h"
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 ofxiOSCoreMotion::ofxiOSCoreMotion() {
 
     motionManager = [[CMMotionManager alloc] init];

diff --git a/addons/ofxiOS/src/utils/ofxiOSExtras.mm b/addons/ofxiOS/src/utils/ofxiOSExtras.mm
@@ -34,10 +34,6 @@
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 #import "ofxiOSAppDelegate.h"
 #import "ofxiOSViewController.h"
 #import "ofxiOSGLKViewController.h"

diff --git a/addons/ofxiOS/src/utils/ofxiOSImagePicker.mm b/addons/ofxiOS/src/utils/ofxiOSImagePicker.mm
@@ -15,10 +15,6 @@
 
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 //C++ class implementations
 
 //--------------------------------------------------------------

diff --git a/addons/ofxiOS/src/utils/ofxiOSKeyboard.mm b/addons/ofxiOS/src/utils/ofxiOSKeyboard.mm
@@ -15,10 +15,6 @@
 
 using namespace std;
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 //C++ class implementations
 
 //--------------------------------------------------------------

diff --git a/addons/ofxiOS/src/utils/ofxiOSMapKit.mm b/addons/ofxiOS/src/utils/ofxiOSMapKit.mm
@@ -33,10 +33,6 @@
 
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 #include "ofxiOSMapKitDelegate.h"
 #include "ofxiOSExtras.h"
 #include "ofAppRunner.h"

diff --git a/addons/ofxiOS/src/utils/ofxiOSMapKitDelegate.mm b/addons/ofxiOS/src/utils/ofxiOSMapKitDelegate.mm
@@ -32,10 +32,6 @@
 
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 #include "ofxiOSMapKitDelegate.h"
 #include "ofxiOSMapKit.h"
 #include "ofLog.h"

diff --git a/addons/ofxiOS/src/video/AVFoundationVideoGrabber.mm b/addons/ofxiOS/src/video/AVFoundationVideoGrabber.mm
@@ -7,10 +7,6 @@
 
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 #include "ofxiOSExtras.h"
 #include "ofAppRunner.h"
 #include "ofLog.h"

diff --git a/addons/ofxiOS/src/video/AVFoundationVideoPlayer.m b/addons/ofxiOS/src/video/AVFoundationVideoPlayer.m
@@ -9,10 +9,6 @@
 
 #define IS_OS_6_OR_LATER    ([[[UIDevice currentDevice] systemVersion] floatValue] >= 6.0)
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 /* Asset keys */
 NSString * const kTracksKey         = @"tracks";
 NSString * const kPlayableKey		= @"playable";

diff --git a/addons/ofxiOS/src/video/ofxiOSVideoPlayer.mm b/addons/ofxiOS/src/video/ofxiOSVideoPlayer.mm
@@ -7,10 +7,6 @@
 
 using namespace std;
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 CVOpenGLESTextureCacheRef _videoTextureCache = NULL;
 CVOpenGLESTextureRef _videoTextureRef = NULL;
 

diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h
@@ -196,6 +196,10 @@ enum ofTargetPlatform{
 	#if defined(__LITTLE_ENDIAN__)
 		#define TARGET_LITTLE_ENDIAN		// intel cpu
 	#endif
+
+	#if defined(__OBJC__) && !__has_feature(objc_arc)
+		#error "Please enable ARC (Automatic Reference Counting) at the project level"
+	#endif
 #endif
 
 #ifdef TARGET_LINUX
@@ -246,6 +250,11 @@ enum ofTargetPlatform{
 
 
 	#define TARGET_LITTLE_ENDIAN		// arm cpu
+
+	#if defined(__OBJC__) && !__has_feature(objc_arc)
+		#error "Please enable ARC (Automatic Reference Counting) at the project level"
+	#endif
+
 #endif
 
 #ifdef TARGET_ANDROID

diff --git a/libs/openFrameworks/video/ofAVFoundationGrabber.mm b/libs/openFrameworks/video/ofAVFoundationGrabber.mm
@@ -9,10 +9,6 @@
 
 #ifdef OF_VIDEO_CAPTURE_AVF
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 #import <Accelerate/Accelerate.h>
 
 @interface OSXVideoGrabber ()

diff --git a/libs/openFrameworks/video/ofAVFoundationPlayer.mm b/libs/openFrameworks/video/ofAVFoundationPlayer.mm
@@ -14,10 +14,6 @@
 	#include "ofTexture.h"
 #endif
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 //--------------------------------------------------------------
 ofAVFoundationPlayer::ofAVFoundationPlayer() {
     videoPlayer = nullptr;

diff --git a/libs/openFrameworks/video/ofAVFoundationVideoPlayer.m b/libs/openFrameworks/video/ofAVFoundationVideoPlayer.m
@@ -6,10 +6,6 @@
 
 #import "ofAVFoundationVideoPlayer.h"
 
-#if !__has_feature(objc_arc)
-#   error need ARC
-#endif
-
 #define IS_OS_6_OR_LATER    ([[[UIDevice currentDevice] systemVersion] floatValue] >= 6.0)