finally found the culprit in the Makefile, matlab-actions/setup-matla…

…b#60
fangq · Mar 14, 2023 · 2e3894b · 2e3894b
1 parent 1394602
commit 2e3894b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
@@ -78,27 +78,20 @@ jobs:
           fi
           octave-cli --eval "fprintf(1,['OCTAVE_ARCH=' regexprep(computer('arch'), 'darwin[0-9.]+-', 'darwin-')])"
           octave-cli --eval "fprintf(1,['OCTAVE_ARCH=' regexprep(computer('arch'), 'darwin[0-9.]+-', 'darwin-')])" >> $GITHUB_ENV
-      - name: Build mmclab for MATLAB (MacOS and Linux)
-        if: ${{ runner.os != 'Windows' }}
+      - name: Build mmclab for MATLAB
         run: |
           cd src
-          if [[ "$RUNNER_OS" == "macOS" ]]; then
+          if [[ "$RUNNER_OS" == "Windows" ]]; then
+            make mex USERARFLAGS="-v"
+            objdump -p ../mmclab/mmc.mexw* | grep "DLL Name:"
+          elif [[ "$RUNNER_OS" == "macOS" ]]; then
             which mex
             make mex CC=gcc-10 CXX=g++-10 MEXLINKOPT="-static-libstdc++ -static-libgcc -fopenmp" EXTRALIB="-v -f mexopts_maci64_gcc.xml"
             otool -L ../mmclab/mmc.mex*
           else
             make mex MEXLINKOPT="-static-libstdc++ -static-libgcc -fopenmp" EXTRALIB="-v"
             ldd ../mmclab/mmc.mex*
           fi
-      - name: Build mmclab for MATLAB (Windows only)
-        if: ${{ runner.os == 'Windows' }}
-        run: |
-          cd src
-          env
-          make mex USERARFLAGS="-V"
-          objdump -p ../mmclab/mmc.mexw* | grep "DLL Name:"
-        env:
-          MW_MINGW64_LOC: c:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw64\
       - name: Build binary
         run: |
           cd src

diff --git a/commons/Makefile_common.mk b/commons/Makefile_common.mk
@@ -60,7 +60,7 @@ DLLFLAG=-fPIC
 
 PLATFORM = $(shell uname -s)
 ifeq ($(findstring MINGW64,$(PLATFORM)), MINGW64)
-    MW_MINGW64_LOC=/c/msys64/usr/
+    MW_MINGW64_LOC?=/c/msys64/usr/
     MKMEX      :=cmd //c mex.bat
     INCLUDEDIRS+=-I"./mingw64/include"
     LIBOPENCL   ="c:\Windows\System32\OpenCL.dll"