msys2 improvements (#7976)

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/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