Merge branch 'openframeworks:master' into android2024

Author: dimitre

.github/workflows/actions/build-msys2.yml

@@ -44,10 +44,11 @@ jobs:
         release: true
         update: false
         msystem: ${{matrix.msystem}}
-        pacboy: gcc:p assimp:p cairo:p curl:p freeglut:p FreeImage:p glew:p glfw:p glm:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p openal:p opencv:p pugixml:p rtaudio:p uriparser:p utf8cpp:p
+        pacboy: openssl:p python:p gcc:p assimp:p cairo:p curl:p freeglut:p FreeImage:p glew:p glfw:p glm:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p openal:p opencv:p pugixml:p rtaudio:p uriparser:p utf8cpp:p
         install: >-
           unzip
           make
+        # lld
         # gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p 
         # boost:p tools:p
         # install: >-

.github/workflows/of.yml

@@ -69,10 +69,11 @@ jobs:
         release: true
         update: false
         msystem: ${{matrix.msystem}}
-        pacboy: gcc:p assimp:p cairo:p curl:p freeglut:p FreeImage:p glew:p glfw:p glm:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p openal:p opencv:p pugixml:p rtaudio:p uriparser:p utf8cpp:p
+        pacboy: openssl:p python:p gcc:p assimp:p cairo:p curl:p freeglut:p FreeImage:p glew:p glfw:p glm:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p openal:p opencv:p pugixml:p rtaudio:p uriparser:p utf8cpp:p
         install: >-
           unzip
           make
+        # lld
         # gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p 
         # boost:p tools:p
         # install: >-
@@ -171,7 +172,7 @@ jobs:
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
 
   build-ios-tvos:
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
         matrix:
           cfg:
@@ -194,7 +195,7 @@ jobs:
       run: ./scripts/ci/$TARGET/build.sh;
 
       env:
-        DEVELOPER_DIR: "/Applications/Xcode_15.2.app/Contents/Developer"
+        DEVELOPER_DIR: "/Applications/Xcode_15.4.app/Contents/Developer"
 
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
@@ -244,7 +245,7 @@ jobs:
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
 
   build-macos:
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
         matrix:
           cfg:
@@ -255,20 +256,11 @@ jobs:
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1.2.13
       with:
-        # key: ${{ matrix.os }}-${{ matrix.type }}
         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
-
-    # this step is not needed here because the script is empty
-    # - name: install
-    # run: ./scripts/ci/$TARGET/install.sh
 
     - name: Build
       run:
@@ -278,8 +270,8 @@ jobs:
           scripts/ci/${{ matrix.cfg.target }}/run_tests.sh;
         fi
       env:
-        DEVELOPER_DIR: "/Applications/Xcode.app/Contents/Developer"
-        SDKROOT: "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
+        DEVELOPER_DIR: "/Applications/Xcode_15.4.app/Contents/Developer"
+        SDKROOT: "/Applications/Xcode_15.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
 
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 

libs/openFrameworks/3d/ofEasyCam.h

@@ -1,10 +1,8 @@
 #pragma once
 
 #include "ofCamera.h"
-//#include "ofEvents.h"
 class ofEventListeners;
 class ofEventArgs;
-//#include "ofRectangle.h"
 class ofRectangle;
 
 #define GLM_FORCE_CTOR_INIT

libs/openFrameworks/events/ofEvents.h

@@ -2,7 +2,6 @@
 
 #include "ofEventUtils.h"
 #include "ofFpsCounter.h"
-//#include "ofTimer.h"
 #include "ofTimerFps.h"
 
 #define GLM_FORCE_CTOR_INIT

libs/openFrameworks/gl/ofBufferObject.cpp

@@ -1,6 +1,5 @@
 #include "ofBufferObject.h"
 #include "ofAppRunner.h"
-//#include "ofPixels.h"
 #include "ofGLUtils.h"
 
 

libs/openFrameworks/gl/ofGLProgrammableRenderer.h

@@ -8,7 +8,6 @@
 #include "ofPolyline.h"
 #include "ofBitmapFont.h"
 #include "ofPath.h"
-//#include "ofMaterialBaseTypes.h"
 
 class ofShapeTessellation;
 class ofFbo;

libs/openFrameworks/gl/ofMaterial.cpp

@@ -10,8 +10,6 @@
 #include <glm/vec2.hpp>
 #include <glm/gtx/transform.hpp>
 
-//#include <typeinfo>
-
 using std::shared_ptr;
 using std::string;
 

libs/openFrameworks/gl/ofShader.cpp

@@ -1,16 +1,9 @@
 #include "ofBufferObject.h"
 #include "ofCubeMap.h"
-// #include "ofFileUtils.h"
 #include "ofGLProgrammableRenderer.h"
-// #include "ofGraphics.h"
 #include "ofLight.h"
-// #include "ofMatrix3x3.h"
-// #include "ofMatrix4x4.h"
-// #include "ofParameter.h"
 #include "ofShader.h"
 #include "ofShadow.h"
-// #include "ofTexture.h"
-// #include "ofUtils.h"
 #ifdef TARGET_ANDROID
     #include "ofxAndroidUtils.h"
 #endif

libs/openFrameworks/graphics/ofPolyline.inl

@@ -6,9 +6,7 @@
 #include "ofGraphicsBaseTypes.h"
 #include "ofVectorMath.h"
 #include "ofAppRunner.h"
-//#include "ofMath.h"
 #include "ofLog.h"
-//#include "ofConstants.h"
 
 //----------------------------------------------------------
 template<class T>

libs/openFrameworks/math/ofVec3f.h

@@ -7,8 +7,6 @@
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/vec3.hpp>
 
-//#include <iostream>
-
 /// \brief  ofVec3f is a class for storing a three dimensional vector.
 /// 
 /// Moving through space requires knowledge of where things are and where they are

libs/openFrameworks/math/ofVectorMath.h

@@ -1,11 +1,6 @@
 #pragma once
 
-//#include "ofVec3f.h"
 class ofMatrix3x3;
-// MARK: ofMatrix4x4 already contains some of commented out includes here.
-//#include "ofVec2f.h"
-//#include "ofVec4f.h"
-//#include "ofMatrix3x3.h"
 #include "ofMatrix4x4.h"
 #include "ofQuaternion.h"
 

libs/openFrameworks/sound/ofAVEngineSoundPlayer.h

@@ -13,7 +13,6 @@
 #ifdef OF_SOUND_PLAYER_AV_ENGINE
 
 #include "ofSoundBaseTypes.h"
-//#include "ofEvents.h"
 class ofEventArgs;
 
 // FIXME: some can be moved to .mm

libs/openFrameworks/sound/ofSoundBuffer.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include <cstdint> // MARK: uint64_t msys2 only complain about this one it seems.
-//#include <cstddef>
 #include <vector>
 #include <string>
 

libs/openFrameworks/sound/ofSoundPlayer.cpp

@@ -9,11 +9,6 @@
 #define OF_SOUND_PLAYER_TYPE ofAVEngineSoundPlayer
 #endif
 
-//#ifdef OF_SOUND_PLAYER_QUICKTIME
-//#include "ofQuicktimeSoundPlayer.h"
-//#define OF_SOUND_PLAYER_TYPE ofQuicktimeSoundPlayer
-//#endif
-
 #ifdef OF_SOUND_PLAYER_FMOD
 #include "ofFmodSoundPlayer.h"
 #define OF_SOUND_PLAYER_TYPE ofFmodSoundPlayer

libs/openFrameworks/types/ofColor.h

@@ -2,7 +2,6 @@
 
 #define GLM_FORCE_CTOR_INIT
 #define GLM_ENABLE_EXPERIMENTAL
-// #include <glm/ext/scalar_common.hpp>
 #include <glm/gtx/wrap.hpp>
 #include <iostream>
 #include <limits>

libs/openFrameworks/utils/ofConstants.h

@@ -99,7 +99,6 @@ enum ofTargetPlatform{
 #elif defined( __APPLE_CC__)
     #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
     #include <TargetConditionals.h>
-	// #include <unistd.h>
 
 	#if (TARGET_OS_IPHONE || TARGET_OS_IOS || TARGET_OS_SIMULATOR || TARGET_IPHONE_SIMULATOR) && !TARGET_OS_TV && !TARGET_OS_WATCH
         #define TARGET_OF_IPHONE
@@ -191,7 +190,6 @@ enum ofTargetPlatform{
 		#define __MACOSX_CORE__
 	#endif
 	#include "GL/glew.h"
-	// #include <ApplicationServices/ApplicationServices.h>
 
 	#if defined(__LITTLE_ENDIAN__)
 		#define TARGET_LITTLE_ENDIAN		// intel cpu
@@ -204,8 +202,6 @@ enum ofTargetPlatform{
 
 #ifdef TARGET_LINUX
 
-	// #include <unistd.h>
-
 	#ifdef TARGET_LINUX_ARM
 		#ifdef TARGET_RASPBERRY_PI
 			#include <bcm_host.h>
@@ -259,7 +255,6 @@ enum ofTargetPlatform{
 
 #ifdef TARGET_ANDROID
 	#include <typeinfo>
-	// #include <unistd.h>
 	#include <GLES/gl.h>
 	#define GL_GLEXT_PROTOTYPES
 	#include <GLES/glext.h>

libs/openFrameworks/utils/ofLog.h

@@ -2,7 +2,6 @@
 
 // Only private ofFile file;
 #include "ofFileUtils.h"
-//#include "ofUtils.h"  //ofVAArgsToString
 #include <sstream>
 
 

libs/openFrameworks/utils/ofUtils.h

@@ -14,10 +14,7 @@
 #include <chrono>
 #include <iomanip>  //for setprecision
 #include <optional>
-
-// #include <random>
 #include <sstream>
-// #include <type_traits>
 
 #include "ofRandomDistributions.h"
 #include "ofRandomEngine.h"

libs/openFrameworks/video/ofDirectShowPlayer.h

@@ -3,7 +3,6 @@
 //To allow for QuickTime video playback install the K-Lite Mega Codec Pack 10.2
 
 #pragma once 
-//#include "ofConstants.h"
 #include "ofVideoBaseTypes.h"
 
 template<typename T>

libs/openFrameworks/video/ofMediaFoundationPlayer.h

@@ -34,7 +34,6 @@
 #include <d3d11_1.h>
 #include <wrl.h>
 #include <wincodec.h>
-//#include "ofConstants.h"
 #include "ofVideoBaseTypes.h"
 #include "ofPixels.h" //mSrcPixels
 #include "ofFbo.h"

libs/openFrameworks/video/ofVideoPlayer.h

@@ -2,7 +2,6 @@
 
 #include "ofTexture.h"
 #include "ofVideoBaseTypes.h"
-//#include "ofConstants.h"
 
 //---------------------------------------------
 class ofVideoPlayer : public ofBaseVideoDraws {

libs/openFrameworksCompiled/project/makefileCommon/compile.core.mk

@@ -13,6 +13,7 @@ ifdef PLATFORM_CXX
 	CXX ?= $(PLATFORM_CXX)
 endif
 
+
 ifdef PROJECT_CC
 	CC ?= $(PROJECT_CC)
 endif
@@ -21,6 +22,14 @@ ifdef PLATFORM_CC
 	CC ?= $(PLATFORM_CC)
 endif
 
+# ifdef PROJECT_LD
+# 	LD ?= $(PROJECT_LD)
+# endif
+
+# ifdef PLATFORM_LD
+# 	LD = $(PLATFORM_LD)
+# endif
+
 ifdef PROJECT_AR
 	AR ?= $(PROJECT_AR)
 endif
@@ -29,6 +38,7 @@ ifdef PLATFORM_AR
 	AR ?= $(PLATFORM_AR)
 endif
 
+
 ifdef PLATFORM_ARFLAGS
 	ARFLAGS = $(PLATFORM_ARFLAGS)
 else
@@ -43,6 +53,7 @@ endif
 
 $(info 💾 CXX = $(CXX))
 $(info 💾 CC = $(CC))
+# $(info 💾 LD = $(LD))
 
 ################################################################################
 # CFLAGS

libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk

@@ -404,11 +404,11 @@ $(OF_PROJECT_OBJ_OUTPUT_PATH)libs/openFrameworks/%.o: $(OF_ROOT)/libs/openFramew
 
 # Rules to link the project
 $(TARGET): $(OF_PROJECT_OBJS) $(OF_PROJECT_RESOURCES) $(OF_PROJECT_ADDONS_OBJS) $(OF_PROJECT_LIBS) $(TARGET_LIBS) $(OF_PROJECT_OBJ_OUTPUT_PATH).compiler_flags
-	@echo 'Linking $(TARGET) for $(ABI_LIB_SUBPATH)'
+	@echo '🔗 Linking $(TARGET) for $(ABI_LIB_SUBPATH)'
 	@mkdir -p $(@D)
+# $(LD)
 	$(CXX) -o $@ $(OPTIMIZATION_LDFLAGS) $(OF_PROJECT_OBJS) $(OF_PROJECT_RESOURCES) $(OF_PROJECT_ADDONS_OBJS) $(TARGET_LIBS) $(OF_PROJECT_LIBS) $(LDFLAGS) $(OF_CORE_LIBS)
 
-
 clean:
 	@$(MAKE) CleanDebug
 	@$(MAKE) CleanRelease

libs/openFrameworksCompiled/project/msys2/config.msys2.default.mk

@@ -25,7 +25,8 @@
 #   core source code.
 ##########################################################################################
 
-MINGW_PREFIX ?= /mingw32
+#MINGW_PREFIX ?= /mingw32
+MINGW_PREFIX ?= /mingw64
 PLATFORM_CFLAGS += -std=gnu++17 -DUNICODE -D_UNICODE
 #PLATFORM_CFLAGS += -IC:/msys64/mingw32/include/gstreamer-1.0 -DOF_VIDEO_PLAYER_GSTREAMER
 
@@ -34,7 +35,8 @@ CXX = $(MINGW_PREFIX)/bin/g++
 
 FIND ?= /usr/bin/find
 PLATFORM_AR = $(MINGW_PREFIX)/bin/ar
-PLATFORM_LD = $(MINGW_PREFIX)/bin/ld
+#PLATFORM_LD = $(MINGW_PREFIX)/bin/ld
+PLATFORM_LD = /usr/bin/lld
 PLATFORM_RESOURCE_COMPILER = $(MINGW_PREFIX)/bin/windres
 PLATFORM_PKG_CONFIG = $(MINGW_PREFIX)/bin/pkgconf
 
@@ -125,6 +127,7 @@ PLATFORM_CFLAGS += -fexceptions
 #PLATFORM_LDFLAGS += -arch i386
 PLATFORM_LDFLAGS += -lpthread
 
+
 ifeq ($(findstring MINGW64,$(MSYSTEM)),MINGW64)
 	PLATFORM_LDFLAGS += -Wl,--disable-dynamicbase,--disable-high-entropy-va,--default-image-base-low
 endif