diff --git a/.github/linux/appimage.sh b/.github/linux/appimage.sh index f4b15f6..f17087a 100755 --- a/.github/linux/appimage.sh +++ b/.github/linux/appimage.sh @@ -20,7 +20,7 @@ chmod a+x linuxdeploy* mkdir -p AppDir/usr/bin cp Zelda64Recompiled AppDir/usr/bin/ cp -r assets/ AppDir/usr/bin/ -cp zeldacontrollerdb.txt AppDir/usr/bin/ +cp recompcontrollerdb.txt AppDir/usr/bin/ cp icons/512.png AppDir/Zelda64Recompiled.png cp .github/linux/Zelda64Recompiled.desktop AppDir/ diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index db90f8a..9366be6 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -93,7 +93,7 @@ jobs: run: | mv cmake-build/Zelda64Recompiled Zelda64Recompiled rm -rf assets/scss - tar -czf Zelda64Recompiled.tar.gz Zelda64Recompiled assets/ zeldacontrollerdb.txt + tar -czf Zelda64Recompiled.tar.gz Zelda64Recompiled assets/ recompcontrollerdb.txt - name: Archive Zelda64Recomp uses: actions/upload-artifact@v3 with: @@ -182,7 +182,7 @@ jobs: run: | mv cmake-build/Zelda64Recompiled Zelda64Recompiled rm -rf assets/scss - tar -czf Zelda64Recompiled.tar.gz Zelda64Recompiled assets/ zeldacontrollerdb.txt + tar -czf Zelda64Recompiled.tar.gz Zelda64Recompiled assets/ recompcontrollerdb.txt - name: Archive Zelda64Recomp uses: actions/upload-artifact@v4 with: @@ -275,4 +275,4 @@ jobs: dxil.dll SDL2.dll assets/ - zeldacontrollerdb.txt + recompcontrollerdb.txt diff --git a/zeldacontrollerdb.txt b/recompcontrollerdb.txt similarity index 100% rename from zeldacontrollerdb.txt rename to recompcontrollerdb.txt diff --git a/src/main/main.cpp b/src/main/main.cpp index 1669f68..0f3007e 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -457,7 +457,7 @@ int main(int argc, char** argv) { reset_audio(48000); // Source controller mappings file - if (SDL_GameControllerAddMappingsFromFile("zeldacontrollerdb.txt") < 0) { + if (SDL_GameControllerAddMappingsFromFile("recompcontrollerdb.txt") < 0) { fprintf(stderr, "Failed to load controller mappings: %s\n", SDL_GetError()); }