Merge remote-tracking branch 'origin/master' into update-simavr-3-3-24

Author: vintagepc

.github/workflows/build.yml

@@ -90,12 +90,13 @@ jobs:
 
     - name: Upload artifact
       if: ${{ !github.event.pull_request }}
-      uses: actions/upload-artifact@v3.1.1
+      uses: actions/upload-artifact@v4
       with:
-        name: Binaries
+        name: Binaries-linux
         path: ${{ runner.workspace }}/MK404/build/MK404-development-build.tar.bz2
 
   build_osx:
+    continue-on-error: true
     # The type of runner that the job will run on
     runs-on: macos-latest
     if: "!contains(github.event.head_commit.message, 'NO_BUILD')"
@@ -134,9 +135,9 @@ jobs:
 
     - name: Upload OSX artifact
       if: ${{ !github.event.pull_request }}
-      uses: actions/upload-artifact@v3.1.1
+      uses: actions/upload-artifact@v4
       with:
-        name: Binaries
+        name: Binaries-osx
         path: ${{ runner.workspace }}/MK404/build/MK404_OSX
 
   build_cygwin:
@@ -202,9 +203,9 @@ jobs:
 
       - name: Upload Cygwin artifact
         if: ${{ !github.event.pull_request }}
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4
         with:
-          name: Binaries
+          name: Binaries-win
           path: ${{ runner.workspace }}/MK404/build/MK404.exe
 
   Publish:
@@ -213,14 +214,15 @@ jobs:
     needs: [build, build_osx, build_cygwin]
     steps:
       - name: Retrieve platform binaries
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4.1.7
         with:
-          name: Binaries
+          pattern: Binaries-*
+          merge-multiple: true
 
       - name: Extract assets
         run: |
           tar -jxvf MK404-development-build.tar.bz2
-          mv MK404_OSX MK404-dev/
+          if [ -f MK404_OSX ]; then mv MK404_OSX MK404-dev/; fi
           mv MK404.exe MK404-dev/MK404-cygwin.exe
 
       - name: Check tag version

.github/workflows/tests.yml

@@ -75,15 +75,15 @@ jobs:
     - run: cd ${{ runner.workspace }}/MK404/build && tar -zcvf snaps_core.tar.gz tests/snaps/
 
     - name: Upload report
-      uses: actions/upload-artifact@v3.1.1
+      uses: actions/upload-artifact@v4
       with:
-        name: Report
+        name: Report-1
         path: |
           ${{ runner.workspace }}/MK404/build/snaps_core.tar.gz
 #          ${{ runner.workspace }}/MK404/build/Coverage.tar.gz
 
     - name: Upload coverage artifact
-      uses: actions/upload-artifact@v3.1.1
+      uses: actions/upload-artifact@v4
       with:
         name: Coverage
         path: |
@@ -160,14 +160,14 @@ jobs:
     - run: cd ${{ runner.workspace }}/MK404/build && tar -zcvf snaps_ext1.tar.gz tests/snaps/
 
     - name: Upload report
-      uses: actions/upload-artifact@v3.1.1
+      uses: actions/upload-artifact@v4
       with:
-        name: Report
+        name: Report-2
         path: |
           ${{ runner.workspace }}/MK404/build/snaps_ext1.tar.gz
 
     - name: Upload coverage artifact
-      uses: actions/upload-artifact@v3.1.1
+      uses: actions/upload-artifact@v4
       with:
         name: Coverage2
         path: |
@@ -201,20 +201,22 @@ jobs:
         submodules: true
 
     - name: Retrieve coverage reports
-      uses: actions/download-artifact@v3.0.2
+      uses: actions/download-artifact@v4.1.7
       with:
         name: Coverage
         path: parts
 
     - name: Retrieve coverage reports
-      uses: actions/download-artifact@v3.0.2
+      uses: actions/download-artifact@v4.1.7
       with:
         name: Coverage2
         path: ext1
 
 
     - name: Upload to codecov.io
-      uses: codecov/codecov-action@v2.1.0
+      uses: codecov/codecov-action@v4
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       with:
         # Comma-separated list of files to upload
         files: ./parts/parts.info,./ext1/ext1.info

CMakeLists.txt

@@ -174,7 +174,9 @@ set(H_FILES ${H_FILES_base} ${H_FILES_3rdParty})
 if (NOT APPLE)
 	set(NON_APPLE_SRC parts/components/usbip.c)
 	set_source_files_properties(parts/components/usbip.c PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
+ 	SET(LIBELF_EXTRA_INCLUDE)
 else()
+	SET(LIBELF_EXTRA_INCLUDE "/opt/homebrew/include/") # Stupid workaround
 	set(NON_APPLE_SRC)
 endif()
 
@@ -346,7 +348,7 @@ if (NOT CPPCHECK_ONLY)
 #target_link_libraries(Exe ${SDL2_LIBRARIES})
 
 find_package(LibElf REQUIRED)
-include_directories(${LIBELF_INCLUDE_DIRS})
+include_directories(${LIBELF_INCLUDE_DIRS} ${LIBELF_EXTRA_INCLUDE})
 find_package(SDL2)
 include_directories(${SDL2_INCLUDE_DIR})
 include(FindPNG)