From: Bruce Cran <bcran@fusionio.com>
Date: Tue, 28 Jan 2014 19:56:53 +0000 (-0700)
Subject: Update Windows build for new threading library
X-Git-Tag: fio-2.1.5~22
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=9aa5fe3290fd49c70e498d5e072a5b27e1c3034f

Update Windows build for new threading library

MinGW now uses libwinpthread-1.dll instead of pthreadGC2.dll.
To simplify things, create a static executable so users can run fio
from anywhere without needing to copy the dll.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/Makefile b/Makefile
index 8c2c5146..3f654f02 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,7 @@ ifneq (,$(findstring CYGWIN,$(CONFIG_TARGET_OS)))
   SOURCE := $(filter-out engines/mmap.c,$(SOURCE))
   SOURCE += os/windows/posix.c
   LIBS	 += -lpthread -lpsapi -lws2_32
-  CFLAGS += -DPSAPI_VERSION=1 -Ios/windows/posix/include -Wno-format
+  CFLAGS += -DPSAPI_VERSION=1 -Ios/windows/posix/include -Wno-format -static
 endif
 
 OBJS = $(SOURCE:.c=.o)
diff --git a/README b/README
index e90f4938..4da0d249 100644
--- a/README
+++ b/README
@@ -105,24 +105,20 @@ Configure will attempt to determine the target platform automatically.
 Windows
 -------
 
-On Windows Cygwin (http://www.cygwin.com/) is required in order to
-build fio. To create an MSI installer package install WiX 3.7 from
+On Windows, Cygwin (http://www.cygwin.com/) is required in order to
+build fio. To create an MSI installer package install WiX 3.8 from
 http://wixtoolset.org and run dobuild.cmd from the
 os/windows directory.
 
-How to compile FIO on 64-bit Windows:
+How to compile fio on 64-bit Windows:
 
- 1. Install Cygwin (http://www.cygwin.com/setup.exe). Install 'make' and all
+ 1. Install Cygwin (http://www.cygwin.com/). Install 'make' and all
     packages starting with 'mingw64-i686' and 'mingw64-x86_64'.
- 2. Download ftp://sourceware.org/pub/pthreads-win32/prebuilt-dll-2-9-1-release/dll/x64/pthreadGC2.dll
-    and copy to the fio source directory.
- 3. Open the Cygwin Terminal.
- 4. Go to the fio directory (source files).
- 5. Run 'make clean'.
- 6. Run 'make'.
-
-To build fio on 32-bit Windows, download x86/pthreadGC2.dll instead and do
-'./configure --build-32bit-win=yes' before 'make'.
+ 2. Open the Cygwin Terminal.
+ 3. Go to the fio directory (source files).
+ 4. Run 'make clean && make -j'.
+
+To build fio on 32-bit Windows, run './configure --build-32bit-win' before 'make'.
 
 It's recommended that once built or installed, fio be run in a Command Prompt
 or other 'native' console such as console2, since there are known to be display
diff --git a/os/windows/examples.wxs b/os/windows/examples.wxs
index 644799d8..a21182a9 100755
--- a/os/windows/examples.wxs
+++ b/os/windows/examples.wxs
@@ -20,6 +20,9 @@
                 <Component>
                     <File Source="..\..\examples\netio.fio" />
                 </Component>
+                <Component>
+                    <File Source="..\..\examples\netio_multicast.fio" />
+                </Component>
                 <Component>
                     <File Source="..\..\examples\ssd-test.fio" />
                 </Component>
@@ -60,6 +63,7 @@
             <ComponentRef Id="fsx.fio" />
             <ComponentRef Id="iometer_file_access_server.fio" />
             <ComponentRef Id="netio.fio" />
+            <ComponentRef Id="netio_multicast.fio" />
             <ComponentRef Id="ssd_test.fio" />
             <ComponentRef Id="surface_scan.fio" />
             <ComponentRef Id="tiobench_example.fio" />
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index adc50f65..599fe39d 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -26,9 +26,6 @@
 						<Component>
 							<File Source="..\..\fio.exe"/>
 						</Component>
-						<Component>
-							<File KeyPath="yes" Source="..\..\libwinpthread-1.dll"/>
-						</Component>
 						<Component>
 							<File Id="README" Name="README.txt" Source="..\..\README"/>
 						</Component>
@@ -52,7 +49,6 @@
 
 	<Feature Id="AlwaysInstall" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Display="hidden" Level="1" Title="Flexible IO Tester">
 		<ComponentRef Id="fio.exe"/>
-		<ComponentRef Id="pthreadGC2.dll"/>
 		<ComponentRef Id="HOWTO"/>
 		<ComponentRef Id="README"/>
 		<ComponentRef Id="REPORTING_BUGS"/>