Linux Workflow updates / mkfile

Author: danoli3

.github/workflows/of.yml

@@ -327,42 +327,35 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - { target: linux64, libs: 64gcc6 }
+          - {target: linux, arch: 64, gcc: gcc14}
+          - {target: linux, arch: 64, gcc: gcc10}
     env:
       TARGET: ${{matrix.cfg.target}}
+      GCC: ${{matrix.cfg.gcc}}
+      ARCH: ${{matrix.cfg.arch}}
     steps:
       - name: Remove Old lib-unwind
-        run: if [ "$TARGET" = "linux64" ]; then
+        run: if [ "$TARGET" = "linux" ]; then
           sudo apt-get remove libunwind-14 -y;
           fi
       - name: Cache Packages
         uses: awalsh128/cache-apt-pkgs-action@latest
         with:
           packages: aptitude aptitude-common libboost-iostreams1.83.0 libcwidget4 libsigc++-2.0-0v5 libxapian30 fonts-wine{a} libasound2-plugins{a} libcapi20-3t64{a} libosmesa6{a} libpcsclite1{a} libspeexdsp1{a} libwine{a} libxkbregistry0{a} libz-mingw-w64{a} wine{a} wine64 wget2 make libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good
           version: 1.0
-      # - name: Determine Release
-      #   id: vars
-      #   shell: bash
-      #   run: |
-      #     if [[ "${{ github.ref }}" == refs/tags/* ]]; then
-      #       echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
-      #     elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
-      #       echo "RELEASE=nightly" >> $GITHUB_ENV
-      #     elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
-      #       echo "RELEASE=latest" >> $GITHUB_ENV
-      #     else
-      #       echo "RELEASE=latest" >> $GITHUB_ENV
-      #     fi
+
       - uses: actions/checkout@v4
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2.14
         with:
-          key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
+          key: ${{ matrix.cfg.target }}
 
-      - name: Download libs
-        run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.libs}}
       - name: Install dependencies
         run: ./scripts/ci/$TARGET/install.sh;
+
+      - name: Download libs
+        run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.arch}} -g ${{matrix.cfg.GCC}}
+
       - name: Build
         run: if [ "$TARGET" = "linux64" ]; then
           scripts/ci/linux64/build.sh;

libs/openFrameworksCompiled/project/makefileCommon/config.linux.common.mk

@@ -248,6 +248,8 @@ endif
 # core sources
 PLATFORM_CORE_EXCLUSIONS += %.mm
 PLATFORM_CORE_EXCLUSIONS += %.m
+PLATFORM_CORE_EXCLUSIONS += %.swift
+PLATFORM_CORE_EXCLUSIONS += %.kotlin
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/video/ofDirectShowGrabber.cpp
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/video/ofDirectShowPlayer.cpp
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openFrameworks/video/ofMediaFoundationPlayer.cpp
@@ -260,7 +262,7 @@ else
 endif
 
 # third party
-PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glew/%
+# PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glew/%
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/cairo/%
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/videoInput/%
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/freetype/%
@@ -269,7 +271,7 @@ PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/assimp/%
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/rtAudio/%
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/openssl/%
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/boost/%
-PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glfw/%
+# PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/glfw/%
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/curl/%
 PLATFORM_CORE_EXCLUSIONS += $(OF_LIBS_PATH)/uriparser/%
 
@@ -349,7 +351,7 @@ PLATFORM_SHARED_LIBRARIES =
 
 PLATFORM_PKG_CONFIG_LIBRARIES =
 PLATFORM_PKG_CONFIG_LIBRARIES += cairo
-PLATFORM_PKG_CONFIG_LIBRARIES += zlib
+# PLATFORM_PKG_CONFIG_LIBRARIES += zlib
 PLATFORM_PKG_CONFIG_LIBRARIES += gstreamer-app-$(GST_VERSION)
 PLATFORM_PKG_CONFIG_LIBRARIES += gstreamer-$(GST_VERSION)
 PLATFORM_PKG_CONFIG_LIBRARIES += gstreamer-video-$(GST_VERSION)
@@ -375,17 +377,17 @@ ifeq "$(shell pkg-config --exists libcurl4 && echo 1)" "1"
 endif
 
 
-ifeq ($(CROSS_COMPILING),1)
-	ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists glfw3 && echo 1)" "1"
-		PLATFORM_PKG_CONFIG_LIBRARIES += glfw3
-		PLATFORM_LIBRARIES += Xinerama
-	endif
-else
-	ifeq "$(shell pkg-config --exists glfw3 && echo 1)" "1"
-		PLATFORM_PKG_CONFIG_LIBRARIES += glfw3
-		PLATFORM_LIBRARIES += Xinerama
-	endif
-endif
+# ifeq ($(CROSS_COMPILING),1)
+# 	ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists glfw3 && echo 1)" "1"
+# 		PLATFORM_PKG_CONFIG_LIBRARIES += glfw3
+# 		PLATFORM_LIBRARIES += Xinerama
+# 	endif
+# else
+# 	ifeq "$(shell pkg-config --exists glfw3 && echo 1)" "1"
+# 		PLATFORM_PKG_CONFIG_LIBRARIES += glfw3
+# 		PLATFORM_LIBRARIES += Xinerama
+# 	endif
+# endif
 
 ifeq ($(CROSS_COMPILING),1)
 	ifeq "$(shell export PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR); pkg-config --exists rtaudio && echo 1)" "1"