Windows: add CONFIG_TLS_THREAD=y and swap pthreadGC2 to libwinpthread-1.

[fio.git] / os / windows / install.wxs

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 37216b4d448e334319e32927f652feab30806d5b..adc50f65844b488b23d7da1bcfc4134312a66029 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -10,7 +10,7 @@
        <Product Id="*"
          Codepage="1252" Language="1033"
          Manufacturer="fio" Name="fio"
-         UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.0.14">
+         UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.1.4">
                <Package
                  Description="Flexible IO Tester"
                  InstallerVersion="301" Keywords="Installer,MSI,Database"
@@ -27,7 +27,7 @@
                                                        <File Source="..\..\fio.exe"/>
                                                </Component>
                                                <Component>
-                                                       <File KeyPath="yes" Source="..\..\pthreadGC2.dll"/>
+                                                       <File KeyPath="yes" Source="..\..\libwinpthread-1.dll"/>
                                                </Component>
                                                <Component>
                                                        <File Id="README" Name="README.txt" Source="..\..\README"/>
@@ -70,6 +70,7 @@
 
        <UIRef Id="WixUI_Minimal"/>
 
-       <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of the application is already installed."/>
+       <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of the application is already installed."
+                  AllowSameVersionUpgrades="yes"/>
 </Product>
 </Wix>