install libpng from src.

n64-tools · Jan 19, 2023 · 6aecd06 · 6aecd06
1 parent cbd0a37
commit 6aecd06
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/build-tool-windows.yml b/.github/workflows/build-tool-windows.yml
@@ -7,15 +7,15 @@ jobs:
   Build-library-native:
     uses: ./.github/workflows/build-lib-native.yml
 
-  Build-Tools-Windows-msys2:
-    uses: ./.github/workflows/build-tools-windows-msys2.yml
+  # Build-Tools-Windows-msys2:
+  #   uses: ./.github/workflows/build-tools-windows-msys2.yml
 
-  Build-Tools-Windows-cygwin:
-    uses: ./.github/workflows/build-tools-windows-cygwin.yml
+  Build-Tools-Windows-mingw:
+    uses: ./.github/workflows/build-tools-windows-mingw.yml
 
   Generate-Windows-Tools-Release:
     runs-on: ubuntu-latest
-    needs: [Build-Tools-Windows-msys2, Build-library-native]
+    needs: [Build-Tools-Windows-mingw, Build-library-native] # Build-Tools-Windows-msys2
     steps:
       - name: Download x86_64 Windows artifact
         id: download-x86_64-windows-artifact

diff --git a/.../workflows/build-tools-windows-cygwin.yml → ...b/workflows/build-tools-windows-mingw.yml b/.../workflows/build-tools-windows-cygwin.yml → ...b/workflows/build-tools-windows-mingw.yml
@@ -14,14 +14,27 @@ jobs:
       matrix:
         include: [
           { arch: x86_64, host: x86_64-w64-mingw32, build: tools} # ,
-          # { arch: x86, build: tools}
+          # { arch: i686, host: i686-w64-mingw32, build: tools}
         ]
 
     steps:
       - name: Install x-compile system build dependencies
-        # if: ${{ matrix.target-platform == 'Windows-x86_64' }}
         run: |
-          sudo apt-get install -y mingw-w64 mingw-w64-x86_64-libpng
+          sudo apt-get install -y mingw-w64 libz-mingw-w64-dev libpng-dev
+
+      - name: x-compile libpng
+        run: |
+          # mkdir libpng-src
+          wget -c https://github.com/glennrp/libpng/archive/refs/tags/v1.6.28.tar.gz -O - | tar -xz # -C ./libpng-src
+          # ls -R
+          # cd libpng-src/libpng-1.6.28/
+          cd libpng-1.6.28/
+          ./configure --host=${{ matrix.build }} \
+                      --prefix=/usr/${{ matrix.build }} \
+                      CPPFLAGS=-I/usr/${{ matrix.build }}/include \
+                      LDFLAGS=-L/usr/${{ matrix.build }}/lib
+          make
+          sudo make install    
 
       - uses: actions/checkout@v3
         with: