Include sys/wait.h for MINGW64

kibook · Apr 3, 2024 · 207085c · 207085c
1 parent 08b3566
commit 207085c
Show file tree

Hide file tree

Showing 36 changed files with 656 additions and 8 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -105,9 +105,6 @@ install the necessary packages from pacman:
 
     pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-pkgconf mingw-w64-x86_64-libxml2 mingw-w64-x86_64-libxslt mingw-w64-x86_64-libsystre vim
 
-You will also need to install a sys/wait.h header for Windows:
-<https://github.com/win32ports/sys_wait_h>
-
 ## Building and installing
 
 Run the following commands to build the executables, and install both

diff --git a/build-mingw64.sh b/build-mingw64.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+out=build/mingw64
+
+make
+mkdir -p "$out"
+cp tools/s1kd-*/s1kd-*.exe "$out"
+ldd "$out"/s1kd-*.exe | awk '{print $3}' | grep '^/mingw64' | sort -u | xargs cp -t "$out"
diff --git a/doc/DMC-S1KDTOOLS-A-00-00-00-00A-920A-D_EN-CA.XML b/doc/DMC-S1KDTOOLS-A-00-00-00-00A-920A-D_EN-CA.XML
@@ -221,11 +221,6 @@
             <para>
               <verbatimText verbatimStyle="vs24">pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-pkgconf mingw-w64-x86_64-libxml2 mingw-w64-x86_64-libxslt mingw-w64-x86_64-libsystre vim</verbatimText>
             </para>
-            <para>You will also need to install a sys/wait.h header for Windows: <externalPubRef xlink:href="https://github.com/win32ports/sys_wait_h">
-                <externalPubRefIdent>
-                  <externalPubCode>https://github.com/win32ports/sys_wait_h</externalPubCode>
-                </externalPubRefIdent>
-              </externalPubRef></para>
           </levelledPara>
         </levelledPara>
         <levelledPara>