Try msys2 (#580)

* Try msys2

* Try to get everythin from msys2

* Try to go further

* Attempt to fix go vet

* Add back all jobs

Author: kivutar

.github/workflows/cd.yml

@@ -277,30 +277,42 @@ jobs:
 
   build_windows_x86_64:
     runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
       - uses: actions/setup-go@v5
         with:
           go-version: '1.25.0'
-      - run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> $GITHUB_ENV
-      - run: choco install wget make hashdeep --ignore-checksums
-      - run: wget --no-check-certificate http://www.openal-soft.org/openal-binaries/openal-soft-1.21.0-bin.zip
-      - run: wget https://github.com/electron/rcedit/releases/download/v1.1.1/rcedit-x64.exe
-      - run: curl -L -o mingw64.zip https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0posix-17.0.6-11.0.1-ucrt-r5/winlibs-x86_64-posix-seh-gcc-13.2.0-llvm-17.0.6-mingw-w64ucrt-11.0.1-r5.zip
-      - run: unzip mingw64.zip
-      - run: 7z x openal-soft-1.21.0-bin.zip -o/c/
-      - run: echo "CGO_CFLAGS=-I/c/openal-soft-1.21.0-bin/include/" >> $GITHUB_ENV
-      - run: echo "CGO_LDFLAGS=-L/c/openal-soft-1.21.0-bin/libs/Win64/" >> $GITHUB_ENV
-      - run: cp "mingw64/bin/libwinpthread-1.dll" .
-      - run: cp /c/openal-soft-1.21.0-bin/bin/Win64/soft_oal.dll OpenAL32.dll
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
+          path-type: inherit
+          install: >-
+            mingw-w64-ucrt-x86_64-toolchain
+            mingw-w64-ucrt-x86_64-openal
+            make
+            p7zip
+            mingw-w64-ucrt-x86_64-rcedit
+      - run: echo "VERSION=$(echo ${{ github.event.release.tag_name }} | cut -c 2-)" >> "$GITHUB_ENV"
+      - run: cp /ucrt64/bin/rcedit.exe ./rcedit-x64
+      - run: cp /ucrt64/lib/libopenal.dll.a ./libOpenAL32.dll.a
+      - run: echo "CGO_LDFLAGS=-L$PWD" >> "$GITHUB_ENV"
+      - run: cp /ucrt64/bin/libgcc_s_seh-1.dll .
+      - run: cp /ucrt64/bin/libmysofa.dll .
+      - run: cp /ucrt64/bin/libopenal-1.dll .
+      - run: cp /ucrt64/bin/libstdc++-6.dll .
+      - run: cp /ucrt64/bin/libwinpthread-1.dll .
+      - run: cp /ucrt64/bin/zlib1.dll .
       - run: cp /c/Windows/System32/VCRUNTIME140.dll .
-      - run: PATH="/c/mingw64/bin:$PATH"
       - run: mkdir -p ./Ludo-Windows-x86_64-${VERSION}/
       - run: cp *.dll ./Ludo-Windows-x86_64-${VERSION}/
       - run: OS=Windows ARCH=x86_64 VERSION=$VERSION make zip
-      - run: hashdeep -c sha256 Ludo-Windows-x86_64-${VERSION}.zip > Ludo-Windows-x86_64-${VERSION}.zip.sha256
+      - run: sha256sum Ludo-Windows-x86_64-${VERSION}.zip > Ludo-Windows-x86_64-${VERSION}.zip.sha256
 
       - name: Upload Release Asset
         uses: alexellis/upload-assets@0.2.2

.github/workflows/ci.yml

@@ -197,26 +197,32 @@ jobs:
 
   build_windows_x86_64:
     runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
       - uses: actions/setup-go@v5
         with:
           go-version: '1.25.0'
-      - run: echo "/c/Users/runneradmin/go/bin" >> $GITHUB_PATH
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
+          path-type: inherit
+          install: >-
+            mingw-w64-ucrt-x86_64-toolchain
+            mingw-w64-ucrt-x86_64-openal
+      - run: echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
       - run: go install honnef.co/go/tools/cmd/staticcheck@latest
-      - run: choco install wget --ignore-checksums
-      - run: curl -L -o mingw64.zip https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0posix-17.0.6-11.0.1-ucrt-r5/winlibs-x86_64-posix-seh-gcc-13.2.0-llvm-17.0.6-mingw-w64ucrt-11.0.1-r5.zip
-      - run: unzip mingw64.zip
-      - run: wget --no-check-certificate http://www.openal-soft.org/openal-binaries/openal-soft-1.21.0-bin.zip
-      - run: 7z x openal-soft-1.21.0-bin.zip -o/c/
-      - run: echo "CGO_CFLAGS=-I/c/openal-soft-1.21.0-bin/include/" >> $GITHUB_ENV
-      - run: echo "CGO_LDFLAGS=-L/c/openal-soft-1.21.0-bin/libs/Win64/" >> $GITHUB_ENV
-      - run: cp "mingw64/bin/libwinpthread-1.dll" .
-      - run: PATH="/c/mingw64/bin:$PATH"
+      # golang.org/x/mobile/exp/audio/al hardcodes -lOpenAL32 on Windows,
+      # while the MSYS2 package installs libopenal.dll.a.
+      - run: cp /ucrt64/lib/libopenal.dll.a ./libOpenAL32.dll.a
+      - run: echo "CGO_LDFLAGS=-L$PWD" >> "$GITHUB_ENV"
       - run: go get .
-      #- run: go test -v -race ./...
-      #- run: go vet ./...
+      - run: go test -v -race ./...
+      - run: go vet ./...
       - run: staticcheck ./...
       - run: go build -v -ldflags '-H=windowsgui'

libretro/libretro_windows.go

@@ -1,5 +1,13 @@
 package libretro
 
+/*
+#include <stdint.h>
+
+static void *symbol_from_addr(uintptr_t addr) {
+	return (void *)addr;
+}
+*/
+import "C"
 import (
 	"syscall"
 	"unsafe"
@@ -11,7 +19,7 @@ type DlHandle = *syscall.DLL
 // DlSym loads a symbol from a dynamic library
 func DlSym(handle DlHandle, name string) unsafe.Pointer {
 	proc := handle.MustFindProc(name)
-	return unsafe.Pointer(proc.Addr())
+	return C.symbol_from_addr(C.uintptr_t(proc.Addr()))
 }
 
 // DlOpen opens a dynamic library