merge master

Author: dimitre

.github/workflows/manual-nightly.yml .github/workflows/manual-release.yml.github/workflows/manual-nightly.yml renamed to .github/workflows/manual-release.yml

@@ -1,6 +1,6 @@
 # This one was created to make it work whil
 
-name: manual-nightly-ok
+name: manual-release
 
 on:
   workflow_dispatch:
@@ -67,8 +67,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ github.event.inputs.release }}
-          # release: ${{ github.event.inputs.release }}
-          release: nightly
+          release: ${{ github.event.inputs.release }}
           prerelease: false
           replace: true
           files: ${{ steps.createpackage.outputs.FILES_OUT }}

.github/workflows/of.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Docker Step
-        run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:4.0.4 bash"
+        run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:4.0.16 bash"
       # - name: Determine Release
       #   id: vars
       #   shell: bash
@@ -77,17 +77,17 @@ jobs:
         run: gcc -v
       - uses: actions/checkout@v4
       - name: ccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].17
         with:
           # key: ${{ matrix.os }}-${{ matrix.type }}
           key: ${{ matrix.msystem }}
-      - uses: msys2/setup-msys2@v2.24.1
+      - uses: msys2/setup-msys2@v2.27.0
         with:
           cache: true
           release: true
           update: true
           msystem: ${{matrix.msystem}}
-          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
+          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
@@ -116,7 +116,7 @@ jobs:
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
   build-vs2022:
-    runs-on: windows-2022
+    runs-on: windows-2025
     strategy:
       matrix:
         platform: [x64, ARM64, ARM64EC]
@@ -125,7 +125,7 @@ jobs:
     steps:
       - name: Clone repository
         uses: actions/checkout@v4
-      - uses: msys2/setup-msys2@v2.24.1
+      - uses: msys2/setup-msys2@v2.27.0
         with:
           update: true
           install: >-
@@ -161,62 +161,6 @@ jobs:
           msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
           msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
 
-  build-vs2019:
-    runs-on: windows-2019
-    strategy:
-      matrix:
-        platform: [x64]
-    env:
-      BITS: ${{ matrix.bits }}
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v4
-        
-      - uses: msys2/[email protected]
-        with:
-          update: true
-          install: >-
-            git
-            unzip
-
-      - name: Setup MSBuild (VS2019 - 16.11)
-        uses: microsoft/setup-msbuild@v2
-        with:
-          vs-version: '16.11'
-          msbuild-architecture: x64
-
-      - name: Verify MSBuild Version
-        run: msbuild -version
-
-      - name: Download libs
-        run: ./scripts/vs/download_libs_2019_x64.sh -t $RELEASE
-
-      - name: Download projectGenerator
-        shell: bash
-        run: ./scripts/vs/download_projectGenerator.sh
-
-      - name: Debug projectGenerator Directory
-        shell: bash
-        run: |
-          echo "Checking projectGenerator directory:"
-          ls -la projectGenerator/
-
-      # - name: run projectGenerator on examples
-      #   shell: bash
-      #   run: ./scripts/ci/vs/pg_projects.sh
-
-      # - name: Build DEBUG and RELEASE emptyExample
-      #   working-directory: ${{env.GITHUB_WORKSPACE}}
-      #   run: |
-      #     msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
-      #     msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
-      # - name: Build DEBUG and RELEASE allAddonsExample
-      #   working-directory: ${{env.GITHUB_WORKSPACE}}
-      #   run: |
-      #     msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
-      #     msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
-
-
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
   rpi-build:
@@ -254,7 +198,7 @@ jobs:
           version: 1.0
       - uses: actions/checkout@v4
       - name: ccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].17
         with:
           key: ${{ matrix.cfg.libs }}
       # - name: Determine Release
@@ -294,7 +238,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: ccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].17
         with:
           key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
       # - name: Determine Release
@@ -331,11 +275,11 @@ jobs:
     env:
       TARGET: ${{matrix.cfg.target}}
     steps:
-# handled by the install script now 
-#      - name: Remove Old lib-unwind
-#        run: if [ "$TARGET" = "linux64" ]; then
-#          sudo apt-get remove libunwind-14 -y;
-#          fi
+      # handled by the install script now
+      #      - name: Remove Old lib-unwind
+      #        run: if [ "$TARGET" = "linux64" ]; then
+      #          sudo apt-get remove libunwind-14 -y;
+      #          fi
       - name: Cache Packages
         uses: awalsh128/cache-apt-pkgs-action@latest
         with:
@@ -356,7 +300,7 @@ jobs:
       #     fi
       - uses: actions/checkout@v4
       - name: ccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].17
         with:
           key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
 
@@ -395,7 +339,7 @@ jobs:
 
   #   - uses: actions/checkout@v4
   #   - name: ccache
-  #     uses: hendrikmuhs/[email protected].14
+  #     uses: hendrikmuhs/[email protected].17
   #     with:
   #       key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
 
@@ -423,7 +367,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: ccache
-        uses: hendrikmuhs/[email protected].14
+        uses: hendrikmuhs/[email protected].17
         with:
           key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }}
 
@@ -477,8 +421,8 @@ jobs:
       - name: Set Up JDK 17
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: "temurin"
+          java-version: "17"
 
       - name: Download Libraries
         run: ./of update libs android
@@ -504,4 +448,3 @@ jobs:
             echo "ERROR: Build Failed not found: [$LIB_PATH]"
             exit 1
           fi
-

.gitignore

@@ -140,6 +140,28 @@ Desktop.ini
 .csettings
 /libs/openFrameworksCompiled/project/android/paths.make
 
+/libs/openFrameworksCompiled/project/android/**/build/
+/libs/openFrameworksCompiled/project/android/**/.cxx/
+/libs/openFrameworksCompiled/project/android/build*
+
+examples/android/**/build.gradle
+examples/android/**/gradle.properties
+examples/android/**/proguard.cfg
+examples/android/**/proguard-rules.pro
+examples/android/**/template.config
+examples/android/**/AndroidManifest.xml
+examples/android/**/OFActivity.java
+
+# Ignore compiled output or build dirs
+examples/android/**/build/
+examples/android/**/.cxx/
+
+# Ignore launcher icons or PNGs
+examples/android/**/*.png
+
+# Ignore CMake files if autogenerated
+examples/android/**/CMakeLists.txt
+
 # Android Studio
 *.iml
 
@@ -170,3 +192,5 @@ libs/openFrameworksCompiled/project/vs2019/openframeworksLib.vcxproj.user
 scripts/templates/vs/bin/emptyExample_debug.exe
 scripts/templates/vs2019/emptyExample.vcxproj.user
 libs/openFrameworksCompiled/project/android/build-*/
+
+