Skip to content

Commit 9e9cd6b

Browse files
2bbb2bbb
committed
remove ARC feature test from implementation, add it to env conditional section of ofConstants.h
1 parent cbef3f2 commit 9e9cd6b

File tree

202 files changed

+3265
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+3265
-118
lines changed

‎addons/ofxiOS/src/core/ofxiOSAppDelegate.mm

-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333

3434
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
3535

36-
#if !__has_feature(objc_arc)
37-
# error need ARC
38-
#endif
39-
4036
#import "ofxiOSViewController.h"
4137
#import "ofxiOSGLKViewController.h"
4238
#import "ofxiOSExternalDisplay.h"

‎addons/ofxiOS/src/core/ofxiOSEAGLView.mm

-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
#include <TargetConditionals.h>
1414
#import <GameController/GameController.h>
1515

16-
#if !__has_feature(objc_arc)
17-
# error need ARC
18-
#endif
19-
2016
static ofxiOSEAGLView * _instanceRef = nil;
2117

2218
@interface ofxiOSEAGLView() {

‎addons/ofxiOS/src/core/ofxiOSGLKView.mm

-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313
#include <TargetConditionals.h>
1414
#import <GameController/GameController.h>
1515

16-
#if !__has_feature(objc_arc)
17-
# error need ARC
18-
#endif
19-
2016
static ofxiOSGLKView * _instanceRef = nil;
2117

2218
@interface ofxiOSGLKView() {

‎addons/ofxiOS/src/core/ofxiOSGLKViewController.mm

-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
#include <TargetConditionals.h>
99
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
1010

11-
#if !__has_feature(objc_arc)
12-
# error need ARC
13-
#endif
14-
1511
#import "ofxiOSGLKViewController.h"
1612

1713
#include "ofxiOSGLKView.h"

‎addons/ofxiOS/src/core/ofxiOSViewController.mm

-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
#include <TargetConditionals.h>
77
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
88

9-
#if !__has_feature(objc_arc)
10-
# error need ARC
11-
#endif
12-
139
#import <QuartzCore/QuartzCore.h>
1410

1511
#include "ofxiOSViewController.h"

‎addons/ofxiOS/src/gl/EAGLKView.m

-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
#import "ES1Renderer.h"
1313
#import "ES2Renderer.h"
1414

15-
#if !__has_feature(objc_arc)
16-
# error need ARC
17-
#endif
18-
1915
@interface EAGLKView() {
2016
BOOL bInit;
2117
}

‎addons/ofxiOS/src/gl/EAGLView.m

-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
* ***********************************************************************/
3131

3232

33-
#if !__has_feature(objc_arc)
34-
# error need ARC
35-
#endif
36-
3733
#import <QuartzCore/QuartzCore.h>
3834

3935
#include <TargetConditionals.h>

‎addons/ofxiOS/src/gl/ES1Renderer.m

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
#import "ES1Renderer.h"
44

5-
#if !__has_feature(objc_arc)
6-
# error need ARC
7-
#endif
8-
95
@implementation ES1Renderer
106

117
// Create an OpenGL ES 1.1 context

‎addons/ofxiOS/src/gl/ES2Renderer.m

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
#import "ES2Renderer.h"
44

5-
#if !__has_feature(objc_arc)
6-
# error need ARC
7-
#endif
8-
95
@implementation ES2Renderer
106

117
// Create an OpenGL ES 2.0 context

‎addons/ofxiOS/src/sound/AVSoundPlayer.m

-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
#import "AVSoundPlayer.h"
88
#include <TargetConditionals.h>
99

10-
#if !__has_feature(objc_arc)
11-
# error need ARC
12-
#endif
13-
1410
@interface AVSoundPlayer() {
1511
BOOL bMultiPlay;
1612
}

‎addons/ofxiOS/src/sound/SoundInputStream.m

-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
#import "SoundInputStream.h"
1818
#import <AVFoundation/AVFoundation.h>
1919

20-
#if !__has_feature(objc_arc)
21-
# error need ARC
22-
#endif
23-
2420
typedef struct {
2521
AudioBufferList * bufferList;
2622
AudioUnit remoteIO;

‎addons/ofxiOS/src/sound/SoundOutputStream.m

-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616

1717
#import "SoundOutputStream.h"
1818

19-
#if !__has_feature(objc_arc)
20-
# error need ARC
21-
#endif
22-
2319
static OSStatus soundOutputStreamRenderCallback(void *inRefCon,
2420
AudioUnitRenderActionFlags *ioActionFlags,
2521
const AudioTimeStamp *inTimeStamp,

‎addons/ofxiOS/src/sound/SoundStream.m

-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
#import "SoundStream.h"
99
#import <AVFoundation/AVFoundation.h>
1010

11-
#if !__has_feature(objc_arc)
12-
# error need ARC
13-
#endif
14-
1511
@interface SoundStream() {
1612
//
1713
}

‎addons/ofxiOS/src/sound/ofxiOSSoundPlayer.mm

-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
#include "ofLog.h"
1010
#import "AVSoundPlayer.h"
1111

12-
#if !__has_feature(objc_arc)
13-
# error need ARC
14-
#endif
15-
1612
using namespace std;
1713

1814
ofxiOSSoundPlayer::ofxiOSSoundPlayer() {

‎addons/ofxiOS/src/sound/ofxiOSSoundStream.mm

-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
#import "SoundOutputStream.h"
1616
#import <AVFoundation/AVFoundation.h>
1717

18-
#if !__has_feature(objc_arc)
19-
# error need ARC
20-
#endif
21-
2218
using namespace std;
2319

2420
//------------------------------------------------------------------------------

‎addons/ofxiOS/src/sound/ofxiOSSoundStreamDelegate.mm

-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
#include "ofLog.h"
99
#include "ofSoundBuffer.h"
1010

11-
#if !__has_feature(objc_arc)
12-
# error need ARC
13-
#endif
14-
1511
@interface ofxiOSSoundStreamDelegate() {
1612
std::function<void(ofSoundBuffer &)> inCallback;
1713
std::function<void(ofSoundBuffer &)> outCallback;

‎addons/ofxiOS/src/utils/ofxiOSCoreLocation.mm

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
#include <TargetConditionals.h>
2323
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
2424

25-
#if !__has_feature(objc_arc)
26-
# error need ARC
27-
#endif
28-
2925
//C++ class implementations
3026

3127
//--------------------------------------------------------------

‎addons/ofxiOS/src/utils/ofxiOSCoreMotion.mm

-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11

22
#include "ofxiOSCoreMotion.h"
33

4-
#if !__has_feature(objc_arc)
5-
# error need ARC
6-
#endif
7-
84
ofxiOSCoreMotion::ofxiOSCoreMotion() {
95

106
motionManager = [[CMMotionManager alloc] init];

‎addons/ofxiOS/src/utils/ofxiOSExtras.mm

-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
#include <TargetConditionals.h>
3535
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
3636

37-
#if !__has_feature(objc_arc)
38-
# error need ARC
39-
#endif
40-
4137
#import "ofxiOSAppDelegate.h"
4238
#import "ofxiOSViewController.h"
4339
#import "ofxiOSGLKViewController.h"

‎addons/ofxiOS/src/utils/ofxiOSImagePicker.mm

-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515

1616
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
1717

18-
#if !__has_feature(objc_arc)
19-
# error need ARC
20-
#endif
21-
2218
//C++ class implementations
2319

2420
//--------------------------------------------------------------

‎addons/ofxiOS/src/utils/ofxiOSKeyboard.mm

-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515

1616
using namespace std;
1717

18-
#if !__has_feature(objc_arc)
19-
# error need ARC
20-
#endif
21-
2218
//C++ class implementations
2319

2420
//--------------------------------------------------------------

‎addons/ofxiOS/src/utils/ofxiOSMapKit.mm

-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333

3434
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
3535

36-
#if !__has_feature(objc_arc)
37-
# error need ARC
38-
#endif
39-
4036
#include "ofxiOSMapKitDelegate.h"
4137
#include "ofxiOSExtras.h"
4238
#include "ofAppRunner.h"

‎addons/ofxiOS/src/utils/ofxiOSMapKitDelegate.mm

-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232

3333
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
3434

35-
#if !__has_feature(objc_arc)
36-
# error need ARC
37-
#endif
38-
3935
#include "ofxiOSMapKitDelegate.h"
4036
#include "ofxiOSMapKit.h"
4137
#include "ofLog.h"

‎addons/ofxiOS/src/video/AVFoundationVideoGrabber.mm

-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77

88
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
99

10-
#if !__has_feature(objc_arc)
11-
# error need ARC
12-
#endif
13-
1410
#include "ofxiOSExtras.h"
1511
#include "ofAppRunner.h"
1612
#include "ofLog.h"

‎addons/ofxiOS/src/video/AVFoundationVideoPlayer.m

-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99

1010
#define IS_OS_6_OR_LATER ([[[UIDevice currentDevice] systemVersion] floatValue] >= 6.0)
1111

12-
#if !__has_feature(objc_arc)
13-
# error need ARC
14-
#endif
15-
1612
/* Asset keys */
1713
NSString * const kTracksKey = @"tracks";
1814
NSString * const kPlayableKey = @"playable";

‎addons/ofxiOS/src/video/ofxiOSVideoPlayer.mm

-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77

88
using namespace std;
99

10-
#if !__has_feature(objc_arc)
11-
# error need ARC
12-
#endif
13-
1410
CVOpenGLESTextureCacheRef _videoTextureCache = NULL;
1511
CVOpenGLESTextureRef _videoTextureRef = NULL;
1612

‎examples/3d/3DPrimitivesExample/addons.make

Whitespace-only changes.

‎examples/3d/advanced3dExample/addons.make

Whitespace-only changes.

‎examples/3d/cameraParentingExample/addons.make

Whitespace-only changes.

‎examples/3d/cameraRibbonExample/addons.make

Whitespace-only changes.

‎examples/3d/easyCamExample/addons.make

Whitespace-only changes.

‎examples/3d/meshFromCameraExample/addons.make

Whitespace-only changes.

‎examples/3d/normalsExample/addons.make

Whitespace-only changes.

‎examples/3d/ofBoxExample/addons.make

Whitespace-only changes.

‎examples/3d/orientationExample/addons.make

Whitespace-only changes.

‎examples/3d/pointCloudExample/addons.make

Whitespace-only changes.

‎examples/3d/pointPickerExample/addons.make

Whitespace-only changes.

‎examples/3d/quaternionArcballExample/addons.make

Whitespace-only changes.

‎examples/3d/quaternionLatLongExample/addons.make

Whitespace-only changes.

‎examples/android/androidAccelerometerExample/Makefile

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Attempt to load a config.make file.
2+
# If none is found, project defaults in config.project.make will be used.
3+
ifneq ($(wildcard config.make),)
4+
include config.make
5+
endif
6+
7+
# make sure the the OF_ROOT location is defined
8+
ifndef OF_ROOT
9+
OF_ROOT=$(realpath ../../../.)
10+
endif
11+
12+
# call the project makefile!
13+
include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk

0 commit comments

Comments
 (0)