openframeworks · danoli3 · Jun 26, 2024 · Feb 7, 2024 · Feb 8, 2024 · Feb 9, 2024
diff --git a/.github/workflows/actions/build-ios-tvos.yml b/.github/workflows/actions/build-ios-tvos.yml
@@ -26,8 +26,8 @@ jobs:
     strategy:
         matrix:
           cfg:
-          - {target: ios, libs: ios}
-          #- {target: tvos, libs: ios} #broken currently maybe better to just remove
+          - {target: ios, libs: macos}
+          - {target: tvos, libs: macos}
     env:
      TARGET: ${{matrix.cfg.target}}
     steps:
@@ -38,11 +38,11 @@ jobs:
         key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
 
     - name: Download libs
-      run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh
+      run: ./scripts/macos/download_latest_libs.sh
     - name: install
       run: ./scripts/ci/$TARGET/install.sh
     - name: Build
       run: ./scripts/ci/$TARGET/build.sh;
 
       env:
-        DEVELOPER_DIR: "/Applications/Xcode_15.2.app/Contents/Developer"
+        DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer"
diff --git a/.github/workflows/actions/build-macos.yml b/.github/workflows/actions/build-macos.yml
@@ -22,12 +22,12 @@ env:
 
 jobs:
   build-macos:
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
         matrix:
           cfg:
-          - {target: osx, opt: "xcode"}
-          - {target: osx, opt: "makefiles"}
+          - {target: macos, opt: "xcode"}
+          - {target: macos, opt: "makefiles"}
     steps:
     - uses: actions/checkout@v4
     - name: ccache
@@ -37,13 +37,9 @@ jobs:
         key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }}
         # key: ${{ matrix.msystem }}
 
-
     - name: Download libs
       # continue-on-error: true
-      run: ./scripts/${{ matrix.cfg.target }}/download_libs.sh
-#    - name: rm-dev
-#      run: sudo rm -rf /Library/Developer
-
+      run: ./scripts/${{ matrix.cfg.target }}/download_latest_libs.sh
     # this step is not needed here because the script is empty
     # - name: install
     # run: ./scripts/ci/$TARGET/install.sh

diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml
@@ -176,8 +176,8 @@ jobs:
     strategy:
         matrix:
           cfg:
-          - {target: ios, libs: ios}
-          #- {target: tvos, libs: ios} #broken currently maybe better to just remove
+          - {target: ios, libs: macos}
+          - {target: tvos, libs: macos}
     env:
      TARGET: ${{matrix.cfg.target}}
     steps:
@@ -188,7 +188,7 @@ jobs:
         key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
 
     - name: Download libs
-      run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh
+      run: ./scripts/${{matrix.cfg.libs}}/download_latest_libs.sh
     - name: install
       run: ./scripts/ci/$TARGET/install.sh
     - name: Build
@@ -260,7 +260,7 @@ jobs:
 
 
     - name: Download libs
-      run: ./scripts/${{ matrix.cfg.target }}/download_libs.sh
+      run: ./scripts/${{ matrix.cfg.target }}/download_latest_libs.sh
 
     - name: Build
       run:

diff --git a/.gitignore b/.gitignore
@@ -154,3 +154,6 @@ examples/**/config.make
 libs/openFrameworksCompiled/project/vs/.vs/
 scripts/templates/vs/.vs/
 **/.vs/
+libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/xcshareddata
+scripts/templates/ios/bin
+libs/openFrameworksCompiled/project/tvOS/tvOS+OFLib.xcodeproj/xcshareddata
diff --git a/addons/ofxAccelerometer/src/ofxAccelerometer.h b/addons/ofxAccelerometer/src/ofxAccelerometer.h
@@ -34,6 +34,7 @@
 #include "ofTypes.h"
 #include "ofPoint.h"
 #include "ofEvents.h"
+#include "ofMathConstants.h"
 
 typedef void (*ofxAccelCB)(ofPoint&);			// typedef for accelerometer callback
 

diff --git a/addons/ofxSvg/addon_config.mk b/addons/ofxSvg/addon_config.mk
@@ -61,8 +61,8 @@ common:
 	# ADDON_LIBS_EXCLUDE =
 
 osx:
-	ADDON_LIBS = libs/svgtiny/lib/osx/svgtiny.a
-	ADDON_LIBS += libs/libxml2/lib/osx/xml2.a
+# 	ADDON_LIBS = libs/svgtiny/lib/osx/svgtiny.a
+# 	ADDON_LIBS += libs/libxml2/lib/osx/xml2.a
 
 ios:
 	ADDON_LIBS = libs/svgtiny/lib/ios/svgtiny.a

diff --git a/addons/ofxiOS/src/app/ofAppiOSWindow.h b/addons/ofxiOS/src/app/ofAppiOSWindow.h
@@ -30,6 +30,8 @@
  * ***********************************************************************/
 
 #pragma once
+#include "ofxiOSConstants.h"
+#if defined(TARGET_OF_IOS)
 #include <TargetConditionals.h>
 #include "ofAppBaseWindow.h"
 #include "ofxiOSConstants.h"
@@ -284,5 +286,5 @@ class ofAppiOSWindow : public ofAppBaseGLESWindow {
 [[deprecated("use ofAppiOSWindow")]]
 typedef ofAppiOSWindow ofAppiPhoneWindow;
 
-
+#endif
 
diff --git a/addons/ofxiOS/src/app/ofAppiOSWindow.mm b/addons/ofxiOS/src/app/ofAppiOSWindow.mm
@@ -29,6 +29,8 @@
  *
  * ***********************************************************************/ 
 #include <TargetConditionals.h>
+#include "ofxiOSConstants.h"
+#if defined(TARGET_OF_IOS)
 #include "ofAppiOSWindow.h"
 #include "ofGLRenderer.h"
 #include "ofGLProgrammableRenderer.h"
@@ -486,3 +488,5 @@
 ofiOSWindowSettings & ofAppiOSWindow::getSettings() {
     return settings;
 }
+
+#endif
diff --git a/addons/ofxiOS/src/app/ofxiOSApp.h b/addons/ofxiOS/src/app/ofxiOSApp.h
@@ -8,6 +8,8 @@
  */
 
 #pragma once
+#include "ofxiOSConstants.h"
+#if defined(TARGET_OF_IOS)
 
 #include "ofBaseApp.h"
 #include "ofxiOSAlerts.h"
@@ -51,3 +53,5 @@ class ofxiOSApp : public ofBaseApp, public ofxiOSAlertsListener {
 
 [[deprecated("use ofxiOSApp")]]
 typedef ofxiOSApp ofxiPhoneApp;
+
+#endif
diff --git a/addons/ofxiOS/src/core/ofxiOSAppDelegate.h b/addons/ofxiOS/src/core/ofxiOSAppDelegate.h
@@ -30,9 +30,10 @@
  * ***********************************************************************/ 
 
 #pragma once
-
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT) 
 #include <TargetConditionals.h>
-#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
+#if defined(TARGET_OS_IOS) || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
 #import <UIKit/UIKit.h>
 
@@ -65,4 +66,4 @@
 #define ofxiPhoneAppDelegate ofxiOSAppDelegate
 
 #endif
-
+#endif
diff --git a/addons/ofxiOS/src/core/ofxiOSAppDelegate.mm b/addons/ofxiOS/src/core/ofxiOSAppDelegate.mm
@@ -29,10 +29,9 @@
  *
  * ***********************************************************************/
 
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT) && TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 #import "ofxiOSAppDelegate.h"
-
-#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
-
 #import "ofxiOSViewController.h"
 #import "ofxiOSGLKViewController.h"
 #import "ofxiOSExternalDisplay.h"

diff --git a/addons/ofxiOS/src/core/ofxiOSEAGLView.h b/addons/ofxiOS/src/core/ofxiOSEAGLView.h
@@ -6,6 +6,9 @@
 //
 
 #pragma once
+
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT)
 #include <TargetConditionals.h>
 #import <UIKit/UIKit.h>
 #import "EAGLView.h"
@@ -40,3 +43,4 @@ class ofAppiOSWindow;
 @end
 
 #define ofxiPhoneEAGLView ofxiOSEAGLView
+#endif
diff --git a/addons/ofxiOS/src/core/ofxiOSEAGLView.mm b/addons/ofxiOS/src/core/ofxiOSEAGLView.mm
@@ -5,6 +5,8 @@
 //  Created by lukasz karluk on 5/07/12.
 //
 
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT) && defined(TARGET_OF_IOS)
 #include "ofxiOSEAGLView.h"
 #include "ofxiOSApp.h"
 #include "ofAppiOSWindow.h"
@@ -389,3 +391,4 @@ - (void)touchesCancelled:(NSSet *)touches
 
 
 @end
+#endif
diff --git a/addons/ofxiOS/src/core/ofxiOSGLKView.h b/addons/ofxiOS/src/core/ofxiOSGLKView.h
@@ -4,10 +4,11 @@
 //
 //  Created by Dan Rosser on 7/3/18.
 //
-
-
 #pragma once
+#include "ofxiOSConstants.h"
 #include <TargetConditionals.h>
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT) && defined(OF_GL_KIT) && defined(TARGET_OF_IOS)
 #import <UIKit/UIKit.h>
 #import "EAGLKView.h"
 #include <glm/glm.hpp>
@@ -48,3 +49,4 @@ class ofAppiOSWindow;
 @end
 
 #define ofxiPhoneEAGLView ofxiOSEAGLView
+#endif
diff --git a/addons/ofxiOS/src/core/ofxiOSGLKView.mm b/addons/ofxiOS/src/core/ofxiOSGLKView.mm
@@ -4,7 +4,8 @@
 //
 //  Created by Dan Rosser on 7/3/18.
 //
-
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT) && defined(OF_GL_KIT) && defined(TARGET_OF_IOS)
 #include "ofxiOSGLKView.h"
 #include "ofxiOSApp.h"
 #include "ofAppiOSWindow.h"
@@ -401,3 +402,4 @@ - (UIImage*)getSnapshot {
 
 
 @end
+#endif
diff --git a/addons/ofxiOS/src/core/ofxiOSGLKViewController.h b/addons/ofxiOS/src/core/ofxiOSGLKViewController.h
@@ -11,6 +11,8 @@
 #pragma once
 
 #include <TargetConditionals.h>
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT) && defined(OF_GL_KIT)
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
 #import <UIKit/UIKit.h>
@@ -41,3 +43,4 @@ class ofxiOSApp;
 
 
 #endif /* ofxiOSGLKViewController_h */
+#endif
diff --git a/addons/ofxiOS/src/core/ofxiOSGLKViewController.mm b/addons/ofxiOS/src/core/ofxiOSGLKViewController.mm
@@ -6,6 +6,8 @@
 //
 
 #include <TargetConditionals.h>
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT) && defined(OF_GL_KIT)
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
 
 #import "ofxiOSGLKViewController.h"
@@ -470,3 +472,4 @@ - (void)setMSAA:(bool)value {
 @end
 
 #endif
+#endif
diff --git a/addons/ofxiOS/src/core/ofxiOSViewController.h b/addons/ofxiOS/src/core/ofxiOSViewController.h
@@ -7,11 +7,14 @@
 
 #include <TargetConditionals.h>
 #if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
-
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT)
 #import <UIKit/UIKit.h>
-
+#import "EAGLView.h"
+#import "ofxiOSEAGLView.h"
 class ofxiOSApp;
 @class ofxiOSEAGLView;
+@class EAGLViewDelegate;
 
 @interface ofxiOSViewController : UIViewController
 
@@ -31,3 +34,4 @@ class ofxiOSApp;
 #define ofxPhoneViewController ofxiOSViewController
 
 #endif
+#endif
diff --git a/addons/ofxiOS/src/core/ofxiOSViewController.mm b/addons/ofxiOS/src/core/ofxiOSViewController.mm
@@ -4,15 +4,17 @@
 //
 
 #include <TargetConditionals.h>
-#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV)
-
+#include "ofxiOSConstants.h"
+#if TARGET_OS_IOS || (TARGET_OS_IPHONE && !TARGET_OS_TV) && !defined(TARGET_OF_MACOS)
+#if defined(OF_UI_KIT)
 #import <QuartzCore/QuartzCore.h>
 
 #include "ofxiOSViewController.h"
 #include "ofxiOSEAGLView.h"
 #include "ofAppiOSWindow.h"
 #import "ofxiOSExtras.h"
 
+
 @interface ofxiOSViewController() <EAGLViewDelegate> {
     UIInterfaceOrientation currentInterfaceOrientation;
     UIInterfaceOrientation pendingInterfaceOrientation;
@@ -386,3 +388,4 @@ -(BOOL)prefersStatusBarHidden{
 @end
 
 #endif
+#endif
diff --git a/addons/ofxiOS/src/events/ofxiOSAlertsListener.h b/addons/ofxiOS/src/events/ofxiOSAlertsListener.h
@@ -29,7 +29,6 @@
  * ***********************************************************************/ 
 
 #pragma once
-
 #include <string>
 
 /****** protocol, delegate, interface, whatever you want to call it ******/

diff --git a/addons/ofxiOS/src/gl/EAGLKView.h b/addons/ofxiOS/src/gl/EAGLKView.h
@@ -5,9 +5,9 @@
 //  Created by Dan Rosser on 7/3/18.
 //
 
-
 #pragma once
-
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT) && defined(OF_GL_KIT)
 #import <UIKit/UIKit.h>
 #import <GLKit/GLKit.h>
 #import "ESRenderer.h"
@@ -71,3 +71,5 @@
 - (void)notifyResized;
 
 @end
+
+#endif
diff --git a/addons/ofxiOS/src/gl/EAGLKView.m b/addons/ofxiOS/src/gl/EAGLKView.m
@@ -4,11 +4,10 @@
 //
 //  Created by Dan Rosser on 7/3/18.
 //
-
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT) && defined(OF_GL_KIT)
 #include <TargetConditionals.h>
-
 #import "EAGLKView.h"
-
 #import "ES1Renderer.h"
 #import "ES2Renderer.h"
 
@@ -183,3 +182,5 @@ - (void) notifyResized {
 
 
 @end
+
+#endif
diff --git a/addons/ofxiOS/src/gl/EAGLView.h b/addons/ofxiOS/src/gl/EAGLView.h
@@ -30,7 +30,8 @@
  * ***********************************************************************/ 
 
 #pragma once
-
+#include "ofxiOSConstants.h"
+#if defined(OF_UI_KIT) && defined(OF_GL_KIT)
 #import <UIKit/UIKit.h>
 #import "ESRenderer.h"
 
@@ -108,3 +109,5 @@
 - (void)notifyResized;
 
 @end
+
+#endif