Merge branch 'openframeworks:master' into glfw0

Author: dimitre

.github/workflows/manual-nightly.yml

@@ -6,10 +6,14 @@ on:
           release:
             description: 'release'     
             required: true
-            default: 'nightly'  
+            default: 'nightly'
+
+env:
+  ccache: ccache
+
 jobs:
   manual-nightly:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
         matrix:
           cfg:
@@ -20,12 +24,15 @@ jobs:
     - name: Cache Packages
       uses: awalsh128/cache-apt-pkgs-action@latest
       with:
-        packages: aptitude wget2
-        # packages: make curl 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 libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-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
+        packages: aptitude wget2 make curl 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 libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-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
         # libunwind-dev
         version: 1.0
 
     - uses: actions/checkout@v4
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.13
+      with:
+        key: ${{ matrix.cfg.target }}    
     - name: Install dependencies
       run: ./scripts/ci/${{matrix.cfg.target}}/install.sh;
     - name: Download libs

.github/workflows/nightly-linux64.yml

@@ -3,9 +3,13 @@ name: nightly-linux64
 on:
  schedule:
    - cron: "0 6 * * *"
+
+env:
+  ccache: ccache
+
 jobs:
   build-nightly:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: github.repository == 'openframeworks/openFrameworks' && github.ref == 'refs/heads/master'
     strategy:
         matrix:
@@ -24,6 +28,10 @@ jobs:
         version: 1.0
 
     - uses: actions/checkout@v4
+    - name: ccache
+      uses: hendrikmuhs/ccache-action@v1.2.13
+      with:
+        key: ${{ matrix.cfg.target }}
     - name: Install dependencies
       run: ./scripts/ci/$TARGET/install.sh;
     - name: Download libs

apps/projectGenerator

@@ -69,12 +69,15 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME)
 //OF_CORE_LIBS = $(inherited) $(LIB_BOOST_FS) $(LIB_BOOST_SYSTEM)
 //OF_CORE_HEADERS = $(inherited) $(HEADER_BOOST)
 
+HIGH_RESOLUTION_CAPABLE = NO
+
 // Optional include to keep any permanent settings as CODE_SIGN_IDENTITY. 
 #include? "App.xcconfig"
 
-//FOR AV ENGINE SOUND PLAYER UNCOMMENT TWO LINES BELOW
+//FOR AV ENGINE SOUND PLAYER UNCOMMENT THREE LINES BELOW
 //OF_NO_FMOD=1
 //USER_PREPROCESSOR_DEFINITIONS="OF_NO_FMOD=1"
+//LIB_FMOD=""
 GCC_PREPROCESSOR_DEFINITIONS=$(inherited) $(USER_PREPROCESSOR_DEFINITIONS)
 
 OTHER_CFLAGS = $(OF_CORE_CFLAGS)

scripts/templates/osx/Project.xcconfig

@@ -3,30 +3,30 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<string>${DEVELOPMENT_LANGUAGE}</string>
 	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
+	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
-	<string>$(ICON_NAME)</string>
+	<string>${ICON_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>$(TARGET_NAME)</string>
+	<string>${TARGET_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>${MARKETING_VERSION}</string>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>${CURRENT_PROJECT_VERSION}</string>
 	<key>NSCameraUsageDescription</key>
 	<string>This app needs to access the camera</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>This app needs to access the microphone</string>
 	<key>NSHighResolutionCapable</key>
-	<false/>
+	<string>${HIGH_RESOLUTION_CAPABLE}</string>
 </dict>
 </plist>