Merge branch 'master' into rewrite-ofxSvg

Author: NickHardeman

.github/workflows/of.yml

@@ -116,7 +116,7 @@ jobs:
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
   build-vs2022:
-    runs-on: windows-2022
+    runs-on: windows-2025
     strategy:
       matrix:
         platform: [x64, ARM64, ARM64EC]
@@ -161,61 +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:

.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-*/
+
+