Merge branch 'master' into morebsd

.github/workflows/android.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true

.github/workflows/bsd.yml

@@ -122,3 +122,4 @@ jobs:
             make -j3 VERBOSE=1
             make install DESTDIR="/tmp/supertux" VERBOSE=1
             # ./test_supertux2
+

.github/workflows/gnulinux.yml

@@ -58,7 +58,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0

.github/workflows/lint.yml

@@ -33,7 +33,7 @@ jobs:
   lint_cppcheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # The apt version of Cppcheck is outdated and apparently there are no
       # alternative up-to-date precompiled versions for Ubuntu,

.github/workflows/macos.yml

@@ -42,7 +42,7 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0

.github/workflows/scripting.yml

@@ -28,12 +28,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
       - name: Checkout the wiki repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: SuperTux/wiki
           path: wiki

.github/workflows/translations.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout SuperTux repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: 'SuperTux/supertux'
           fetch-depth: 1

.github/workflows/ubuntu-touch.yml

@@ -41,7 +41,7 @@ jobs:
 
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0

.github/workflows/wasm.yml

@@ -34,7 +34,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0

.github/workflows/wiki.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout the .wiki repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: 'SuperTux/supertux.wiki'
           fetch-depth: 100

.github/workflows/windows.yml

@@ -46,7 +46,7 @@ jobs:
 
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # Fetch the whole tree so git describe works
           fetch-depth: 0

mk/cmake/SuperTux/ProvidePhysfs.cmake

@@ -39,8 +39,6 @@ else()
     CMAKE_ARGS
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
     -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
     -DCMAKE_INSTALL_PREFIX=${PHYSFS_PREFIX}
     -DLIB_SUFFIX=${LIB_SUFFIX}
     -DPHYSFS_BUILD_SHARED=${PHYSFS_BUILD_SHARED}