More build fixes, add versioned artifact creation

Author: udif

.github/workflows/windows-x64.yml

@@ -37,28 +37,52 @@ jobs:
       # echo "CFLAGS=" $CFLAGS "LDFLAGS=" $LDFLAGS &&
       # && find /usr/mxe* -type f
       # && ls /usr/mxe-x86-64-w64-mingw32.static/include/admesh
+      # export PKG_CONFIG_PATH=./admesh &&
+      # export PKG_CONFIG_PATH_x86_64_w64_mingw32_static=../admesh &&
+      # export PKG_CONFIG_PATH_x86_64_w64_mingw32_static=../admesh &&
+      # strings `which x86_64-w64-mingw32.static-pkg-config` | grep usr &&
+      # ls /usr/mxe-x86-64-w64-mingw32.static/lib/pkgconfig &&
+      # export _STLINCLUDE= &&
+      # export STLINCLUDE="${_STLINCLUDE}/stlsplit" &&
+      # echo "___${_STLINCLUDE}___" &&
+      # echo "___${STLINCLUDE}___" &&
+
       run: >
          export PATH=/usr/lib/mxe/usr/bin:$PATH &&
          git clone https://github.com/udif/stlsplit &&
          cd stlsplit &&
-         export PKG_CONFIG_PATH=../admesh &&
+         export PKG_CONFIG_PATH_x86_64_w64_mingw32_static=/usr/mxe-x86-64-w64-mingw32.static/lib/pkgconfig &&
          export CFLAGS=$(x86_64-w64-mingw32.static-pkg-config libadmesh --cflags) &&
          export CXXFLAGS=$(x86_64-w64-mingw32.static-pkg-config libadmesh --cflags) &&
          export LDFLAGS=$(x86_64-w64-mingw32.static-pkg-config libadmesh --libs) &&
-         ./autogen.sh && ./configure --host=x86_64-w64-mingw32.static --prefix=/usr/mxe-x86-64-w64-mingw32.static &&
+         echo "CFLAGS=" $CFLAGS "LDFLAGS=" $LDFLAGS &&
+         ./autogen.sh && ./configure --host=x86_64-w64-mingw32.static --prefix=/usr/mxe-x86-64-w64-mingw32.static --includedir='${prefix}/include' &&
          make && sudo make install
 
     - name: qmake
       run: >
          export PATH=/usr/lib/mxe/usr/bin:$PATH &&
-         export PKG_CONFIG_PATH=./admesh &&
-         ls /usr/mxe-x86-64-w64-mingw32.static/lib/pkgconfig &&
-         export CFLAGS="$(x86_64-w64-mingw32.static-pkg-config libadmesh --cflags) $(x86_64-w64-mingw32.static-pkg-config libstlsplit --cflags)" &&
-         export CXXFLAGS="$(x86_64-w64-mingw32.static-pkg-config libadmesh --cflags) $(x86_64-w64-mingw32.static-pkg-config libstlsplit --cflags)" &&
+         export PKG_CONFIG_PATH_x86_64_w64_mingw32_static=/usr/mxe-x86-64-w64-mingw32.static/lib/pkgconfig &&
+         export CFLAGS="$(x86_64-w64-mingw32.static-pkg-config libadmesh --cflags) $(x86_64-w64-mingw32.static-pkg-config libstlsplit --cflags | sed 's/\s*$//g')/stlsplit" &&
+         export CXXFLAGS=$CFLAGS
          export LDFLAGS=$(x86_64-w64-mingw32.static-pkg-config libadmesh --libs) &&
          /usr/lib/mxe/usr/x86_64-w64-mingw32.static/qt5/bin/qmake &&
          cat Makefile && cat Makefile.Release
 
     - name: make
       run: export PATH=/usr/lib/mxe/usr/bin:$PATH && make
 
+    - name: Declare some variables
+      id: vars
+      shell: bash
+      run: |
+        echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+        echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+
+    - name: upload windows
+      uses: actions/upload-artifact@v2
+      with:
+        name: admeshgui-${{ steps.vars.outputs.sha_short }}
+        path: |
+          .libs/*.exe
+          .libs/*.dll