Copy all required DLLs from their output directory

into the release/ directory and add them to the artifact.

Author: udif

.github/workflows/windows-x64.yml

@@ -14,7 +14,8 @@ jobs:
     - uses: actions/checkout@v2
     - name : mxe repo
       run: >
-        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 86B72ED9 &&
+        sudo apt-get update && 
+        sudo apt-get install software-properties-common lsb-release && sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 86B72ED9 &&
         sudo add-apt-repository "deb [arch=amd64] https://pkg.mxe.cc/repos/apt `lsb_release -sc` main" &&
         sudo apt-get update
 
@@ -27,7 +28,9 @@ jobs:
          git clone https://github.com/udif/admesh.git &&
          cd admesh && pwd &&
          ./autogen.sh && ./configure --host=x86_64-w64-mingw32.static --prefix=/usr/mxe-x86-64-w64-mingw32.static &&
-         make && sudo make install
+         make &&
+         mkdir -p ../release && cp -p .libs/libadmesh-1.dll ../release &&
+         sudo make install
 
     - name: stlsplit
       # These are just snippets put aside for debugging
@@ -47,27 +50,43 @@ jobs:
       # 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_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) &&
-         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
+        export PKG_CONFIG_PATH_x86_64_w64_mingw32_static=/usr/mxe-x86-64-w64-mingw32.static/lib/pkgconfig &&
+        export PATH=/usr/lib/mxe/usr/bin:$PATH &&
+        git clone https://github.com/udif/stlsplit &&
+        cd stlsplit && git checkout pr_autoconf &&
+        premake4 gmake config=release64 &&
+        export CXX=/usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-g++ &&
+        make -f static-lib.make INCLUDES="-I/usr/mxe-x86-64-w64-mingw32.static/include $(x86_64-w64-mingw32.static-pkg-config libadmesh --cflags)" LIBS="$(x86_64-w64-mingw32.static-pkg-config libadmesh --libs) -ladmesh" &&
+        sudo /usr/bin/install -c -m 644 build/libstlsplit.a /usr/mxe-x86-64-w64-mingw32.static/lib &&
+        sudo mkdir -p /usr/mxe-x86-64-w64-mingw32.static/include/stlsplit &&
+        sudo /usr/bin/install -c -m 644 stlsplit.h /usr/mxe-x86-64-w64-mingw32.static/include/stlsplit
+
+      # sudo /usr/bin/install -c -m 644 libstlsplit.pc '/usr/mxe-x86-64-w64-mingw32.static/lib/pkgconfig'
+
+      # export PKG_CONFIG_PATH_x86_64_w64_mingw32_static=/usr/mxe-x86-64-w64-mingw32.static/lib/pkgconfig &&
+      # export PATH=/usr/lib/mxe/usr/bin:$PATH &&
+      # git clone https://github.com/udif/stlsplit &&
+      # cd stlsplit &&
+      # 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) &&
+      # 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 -n && make &&
+      # cp -p .libs/libstlsplit-1.dll ../release &&
+      # sudo make install
 
     - name: qmake
       run: >
          export PATH=/usr/lib/mxe/usr/bin:$PATH &&
          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
+         export CFLAGS1="$(x86_64-w64-mingw32.static-pkg-config libadmesh --cflags)" &&
+         export CXXFLAGS=`printf "%s %s%s"  ${CFLAGS1} ${CFLAGS1} '/stlsplit'`
+         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
@@ -84,5 +103,7 @@ jobs:
       with:
         name: admeshgui-${{ steps.vars.outputs.sha_short }}
         path: |
-          .libs/*.exe
-          .libs/*.dll
+          release/admeshgui.exe
+          release/libadmesh-1.dll
+          release/libstlsplit-1.dll
+

ADMeshGUI.pro

@@ -60,7 +60,7 @@ macx {
 }
 
 win32 {
-    LIBS += -lintl -liconv -lopengl32
+    LIBS += -lintl -liconv -lopengl32 -ladmesh.dll
     RC_FILE = admeshgui.rc
 }