Skip to content

Commit 51012f4

Browse files
danoli3danoli3
authored
macOS Xcode Project Updates to XCFrameworks C++17 - Bleeding Edge (#7889)
* Xcode Project Updates to XCFrameworks C++17 - Bleeding Edge * macOS GitHub Actions Latest Libs * GitHub Actions * macOS just one download latest libs * Fixes #7781 * Apothecary on Bleeding * macOS addon ofxSVG * GitHub Actions - macOS disabled makefile until dupe fix * GitHub Actions * GitHub Actions macOS makefiles on * Download Libs macos * macos download all targets * macOS template against super mega xcframework * Compiler scripts for macOS / Actions * GitHub Actions - macOS disabled makefile until dupe fix * GitHub Actions * iOS Bleeding Latest * iOS curl disabled for moment * iOS Download Libs / Actions and scripts for other platforms * Fix ofxAccelerometer / url off for tvOS * Xcode Pbxproj to XML script - XML is required for PG to work for these projects. Added script as we keep forgetting * Xcode Project to XML iOS / macOS * tvOS Update Bleeding * Xcode Xchemas * Revert "Xcode Project to XML iOS / macOS" This reverts commit bcdb4db. * Fix download / addons * iOS Project Update Link to Mega * Actions ios to libs macos download * tvos * tvOS Code - Add temp url loader * tvOS Project Working * Fix ofURLFileLoader * tvOS Schema * tvOS Fix * OpenAL Disabled for Sims * tvOS Actions + * Project Changes iPhone to iOS. openFrameworksLib to OSX+OFLib * macOS Super Mega Framework Project all Targets * Major Preprocessor Defines for Ability to Scope out platform and features * Create Package Nightly Fixes for macOS * iOS Compiling - More Define Fixes * tvOS Compiling - fixed defines * Define Updates * Obj-C Fixing * Cairo Include Fix * macOS Nightly package * macos project changes * Revert "macos project changes" This reverts commit 4a54492. * Mega Project Changes * Mega Project Assets * macOS ci * Video Grabber / Player updates * macOS fixes for openFrameworks core project * AV macOS Foundation Fixes * Add missing core frameworks * osx project fix up * Workflow macOS XCFrameworks * VS Fix Cairo Include Path * tvOS and iOS Fixes * VS Fix Cairo * Defines for OF_RTAUDIO_6 / #define OF_RTAUDIO * projectGenerator tip * iOS / tvOS / OSX project updates - frameworks linked * update create_package * mk curl * remove script
1 parent 90efc05 commit 51012f4

File tree

171 files changed

+8471
-3592
lines changed

Some content is hidden

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

171 files changed

+8471
-3592
lines changed

‎.github/workflows/actions/build-ios-tvos.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
strategy:
2727
matrix:
2828
cfg:
29-
- {target: ios, libs: ios}
30-
#- {target: tvos, libs: ios} #broken currently maybe better to just remove
29+
- {target: ios, libs: macos}
30+
- {target: tvos, libs: macos}
3131
env:
3232
TARGET: ${{matrix.cfg.target}}
3333
steps:
@@ -38,11 +38,11 @@ jobs:
3838
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
3939

4040
- name: Download libs
41-
run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh
41+
run: ./scripts/macos/download_latest_libs.sh
4242
- name: install
4343
run: ./scripts/ci/$TARGET/install.sh
4444
- name: Build
4545
run: ./scripts/ci/$TARGET/build.sh;
4646

4747
env:
48-
DEVELOPER_DIR: "/Applications/Xcode_15.2.app/Contents/Developer"
48+
DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer"

‎.github/workflows/actions/build-macos.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ env:
2222

2323
jobs:
2424
build-macos:
25-
runs-on: macos-13
25+
runs-on: macos-14
2626
strategy:
2727
matrix:
2828
cfg:
29-
- {target: osx, opt: "xcode"}
30-
- {target: osx, opt: "makefiles"}
29+
- {target: macos, opt: "xcode"}
30+
- {target: macos, opt: "makefiles"}
3131
steps:
3232
- uses: actions/checkout@v4
3333
- name: ccache
@@ -37,13 +37,9 @@ jobs:
3737
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }}
3838
# key: ${{ matrix.msystem }}
3939

40-
4140
- name: Download libs
4241
# continue-on-error: true
43-
run: ./scripts/${{ matrix.cfg.target }}/download_libs.sh
44-
# - name: rm-dev
45-
# run: sudo rm -rf /Library/Developer
46-
42+
run: ./scripts/${{ matrix.cfg.target }}/download_latest_libs.sh
4743
# this step is not needed here because the script is empty
4844
# - name: install
4945
# run: ./scripts/ci/$TARGET/install.sh

‎.github/workflows/of.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ jobs:
176176
strategy:
177177
matrix:
178178
cfg:
179-
- {target: ios, libs: ios}
180-
#- {target: tvos, libs: ios} #broken currently maybe better to just remove
179+
- {target: ios, libs: macos}
180+
- {target: tvos, libs: macos}
181181
env:
182182
TARGET: ${{matrix.cfg.target}}
183183
steps:
@@ -188,7 +188,7 @@ jobs:
188188
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
189189

190190
- name: Download libs
191-
run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh
191+
run: ./scripts/${{matrix.cfg.libs}}/download_latest_libs.sh
192192
- name: install
193193
run: ./scripts/ci/$TARGET/install.sh
194194
- name: Build
@@ -260,7 +260,7 @@ jobs:
260260

261261

262262
- name: Download libs
263-
run: ./scripts/${{ matrix.cfg.target }}/download_libs.sh
263+
run: ./scripts/${{ matrix.cfg.target }}/download_latest_libs.sh
264264

265265
- name: Build
266266
run:

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,6 @@ examples/**/config.make
154154
libs/openFrameworksCompiled/project/vs/.vs/
155155
scripts/templates/vs/.vs/
156156
**/.vs/
157+
libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/xcshareddata
158+
scripts/templates/ios/bin
159+
libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/xcshareddata

‎addons/ofxAccelerometer/src/ofxAccelerometer.h

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "ofTypes.h"
3535
#include "ofPoint.h"
3636
#include "ofEvents.h"
37+
#include "ofMathConstants.h"
3738

3839
typedef void (*ofxAccelCB)(ofPoint&); // typedef for accelerometer callback
3940

‎addons/ofxSvg/addon_config.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ common:
6161
# ADDON_LIBS_EXCLUDE =
6262

6363
osx:
64-
ADDON_LIBS = libs/svgtiny/lib/osx/svgtiny.a
65-
ADDON_LIBS += libs/libxml2/lib/osx/xml2.a
64+
# ADDON_LIBS = libs/svgtiny/lib/osx/svgtiny.a
65+
# ADDON_LIBS += libs/libxml2/lib/osx/xml2.a
6666

6767
ios:
6868
ADDON_LIBS = libs/svgtiny/lib/ios/svgtiny.a

‎addons/ofxiOS/src/app/ofAppiOSWindow.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
* ***********************************************************************/
3131

3232
#pragma once
33+
#include "ofxiOSConstants.h"
34+
#if defined(TARGET_OF_IOS)
3335
#include <TargetConditionals.h>
3436
#include "ofAppBaseWindow.h"
3537
#include "ofxiOSConstants.h"
@@ -284,5 +286,5 @@ class ofAppiOSWindow : public ofAppBaseGLESWindow {
284286
[[deprecated("use ofAppiOSWindow")]]
285287
typedef ofAppiOSWindow ofAppiPhoneWindow;
286288

287-
289+
#endif
288290

‎addons/ofxiOS/src/app/ofAppiOSWindow.mm

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
*
3030
* ***********************************************************************/
3131
#include <TargetConditionals.h>
32+
#include "ofxiOSConstants.h"
33+
#if defined(TARGET_OF_IOS)
3234
#include "ofAppiOSWindow.h"
3335
#include "ofGLRenderer.h"
3436
#include "ofGLProgrammableRenderer.h"
@@ -486,3 +488,5 @@
486488
ofiOSWindowSettings & ofAppiOSWindow::getSettings() {
487489
return settings;
488490
}
491+
492+
#endif

‎addons/ofxiOS/src/app/ofxiOSApp.h

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
*/
99

1010
#pragma once
11+
#include "ofxiOSConstants.h"
12+
#if defined(TARGET_OF_IOS)
1113

1214
#include "ofBaseApp.h"
1315
#include "ofxiOSAlerts.h"
@@ -51,3 +53,5 @@ class ofxiOSApp : public ofBaseApp, public ofxiOSAlertsListener {
5153

5254
[[deprecated("use ofxiOSApp")]]
5355
typedef ofxiOSApp ofxiPhoneApp;
56+
57+
#endif

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

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

3232
#pragma once
33-
33+
#include "ofxiOSConstants.h"
34+
#if defined(OF_UI_KIT)
3435
#include <TargetConditionals.h>
35-
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
36+
#if defined(TARGET_OS_IOS) || (TARGET_OS_IPHONE && !TARGET_OS_TV)
3637

3738
#import <UIKit/UIKit.h>
3839

@@ -65,4 +66,4 @@
6566
#define ofxiPhoneAppDelegate ofxiOSAppDelegate
6667

6768
#endif
68-
69+
#endif

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@
2929
*
3030
* ***********************************************************************/
3131

32+
#include "ofxiOSConstants.h"
33+
#if defined(OF_UI_KIT) && TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
3234
#import "ofxiOSAppDelegate.h"
33-
34-
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
35-
3635
#import "ofxiOSViewController.h"
3736
#import "ofxiOSGLKViewController.h"
3837
#import "ofxiOSExternalDisplay.h"

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

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
//
77

88
#pragma once
9+
10+
#include "ofxiOSConstants.h"
11+
#if defined(OF_UI_KIT)
912
#include <TargetConditionals.h>
1013
#import <UIKit/UIKit.h>
1114
#import "EAGLView.h"
@@ -40,3 +43,4 @@ class ofAppiOSWindow;
4043
@end
4144

4245
#define ofxiPhoneEAGLView ofxiOSEAGLView
46+
#endif

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

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
// Created by lukasz karluk on 5/07/12.
66
//
77

8+
#include "ofxiOSConstants.h"
9+
#if defined(OF_UI_KIT) && defined(TARGET_OF_IOS)
810
#include "ofxiOSEAGLView.h"
911
#include "ofxiOSApp.h"
1012
#include "ofAppiOSWindow.h"
@@ -389,3 +391,4 @@ - (void)touchesCancelled:(NSSet *)touches
389391

390392

391393
@end
394+
#endif

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
//
55
// Created by Dan Rosser on 7/3/18.
66
//
7-
8-
97
#pragma once
8+
#include "ofxiOSConstants.h"
109
#include <TargetConditionals.h>
10+
#include "ofxiOSConstants.h"
11+
#if defined(OF_UI_KIT) && defined(OF_GL_KIT) && defined(TARGET_OF_IOS)
1112
#import <UIKit/UIKit.h>
1213
#import "EAGLKView.h"
1314
#include <glm/glm.hpp>
@@ -48,3 +49,4 @@ class ofAppiOSWindow;
4849
@end
4950

5051
#define ofxiPhoneEAGLView ofxiOSEAGLView
52+
#endif

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
//
55
// Created by Dan Rosser on 7/3/18.
66
//
7-
7+
#include "ofxiOSConstants.h"
8+
#if defined(OF_UI_KIT) && defined(OF_GL_KIT) && defined(TARGET_OF_IOS)
89
#include "ofxiOSGLKView.h"
910
#include "ofxiOSApp.h"
1011
#include "ofAppiOSWindow.h"
@@ -401,3 +402,4 @@ - (UIImage*)getSnapshot {
401402

402403

403404
@end
405+
#endif

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

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#pragma once
1212

1313
#include <TargetConditionals.h>
14+
#include "ofxiOSConstants.h"
15+
#if defined(OF_UI_KIT) && defined(OF_GL_KIT)
1416
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
1517

1618
#import <UIKit/UIKit.h>
@@ -41,3 +43,4 @@ class ofxiOSApp;
4143

4244

4345
#endif /* ofxiOSGLKViewController_h */
46+
#endif

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

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
//
77

88
#include <TargetConditionals.h>
9+
#include "ofxiOSConstants.h"
10+
#if defined(OF_UI_KIT) && defined(OF_GL_KIT)
911
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
1012

1113
#import "ofxiOSGLKViewController.h"
@@ -470,3 +472,4 @@ - (void)setMSAA:(bool)value {
470472
@end
471473

472474
#endif
475+
#endif

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77

88
#include <TargetConditionals.h>
99
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
10-
10+
#include "ofxiOSConstants.h"
11+
#if defined(OF_UI_KIT)
1112
#import <UIKit/UIKit.h>
12-
13+
#import "EAGLView.h"
14+
#import "ofxiOSEAGLView.h"
1315
class ofxiOSApp;
1416
@class ofxiOSEAGLView;
17+
@class EAGLViewDelegate;
1518

1619
@interface ofxiOSViewController : UIViewController
1720

@@ -31,3 +34,4 @@ class ofxiOSApp;
3134
#define ofxPhoneViewController ofxiOSViewController
3235

3336
#endif
37+
#endif

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
//
55

66
#include <TargetConditionals.h>
7-
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
8-
7+
#include "ofxiOSConstants.h"
8+
#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV) && !defined(TARGET_OF_MACOS)
9+
#if defined(OF_UI_KIT)
910
#import <QuartzCore/QuartzCore.h>
1011

1112
#include "ofxiOSViewController.h"
1213
#include "ofxiOSEAGLView.h"
1314
#include "ofAppiOSWindow.h"
1415
#import "ofxiOSExtras.h"
1516

17+
1618
@interface ofxiOSViewController() <EAGLViewDelegate> {
1719
UIInterfaceOrientation currentInterfaceOrientation;
1820
UIInterfaceOrientation pendingInterfaceOrientation;
@@ -386,3 +388,4 @@ -(BOOL)prefersStatusBarHidden{
386388
@end
387389

388390
#endif
391+
#endif

‎addons/ofxiOS/src/events/ofxiOSAlertsListener.h

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
* ***********************************************************************/
3030

3131
#pragma once
32-
3332
#include <string>
3433

3534
/****** protocol, delegate, interface, whatever you want to call it ******/

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// Created by Dan Rosser on 7/3/18.
66
//
77

8-
98
#pragma once
10-
9+
#include "ofxiOSConstants.h"
10+
#if defined(OF_UI_KIT) && defined(OF_GL_KIT)
1111
#import <UIKit/UIKit.h>
1212
#import <GLKit/GLKit.h>
1313
#import "ESRenderer.h"
@@ -71,3 +71,5 @@
7171
- (void)notifyResized;
7272

7373
@end
74+
75+
#endif

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
//
55
// Created by Dan Rosser on 7/3/18.
66
//
7-
7+
#include "ofxiOSConstants.h"
8+
#if defined(OF_UI_KIT) && defined(OF_GL_KIT)
89
#include <TargetConditionals.h>
9-
1010
#import "EAGLKView.h"
11-
1211
#import "ES1Renderer.h"
1312
#import "ES2Renderer.h"
1413

@@ -183,3 +182,5 @@ - (void) notifyResized {
183182

184183

185184
@end
185+
186+
#endif

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
* ***********************************************************************/
3131

3232
#pragma once
33-
33+
#include "ofxiOSConstants.h"
34+
#if defined(OF_UI_KIT) && defined(OF_GL_KIT)
3435
#import <UIKit/UIKit.h>
3536
#import "ESRenderer.h"
3637

@@ -108,3 +109,5 @@
108109
- (void)notifyResized;
109110

110111
@end
112+
113+
#endif

0 commit comments

Comments
 (0)