diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-11 09:53:42 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-11 09:53:42 +0100 |
| commit | 2f20d297f8ea731d845bb220e680ad10c7a927bc (patch) | |
| tree | 9bd18ef1ab766422ba4c51b4ab189e259955a2d0 /win/packaging/heidisql.wxi.in | |
| parent | a629b5172e96c96c414fca70fffd64c80f2f7e8f (diff) | |
| parent | eb4f2e063c341d9f3644339c68cb01679e782001 (diff) | |
| download | mariadb-git-2f20d297f8ea731d845bb220e680ad10c7a927bc.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'win/packaging/heidisql.wxi.in')
| -rw-r--r-- | win/packaging/heidisql.wxi.in | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/win/packaging/heidisql.wxi.in b/win/packaging/heidisql.wxi.in index ce9f668e291..241d2c2750d 100644 --- a/win/packaging/heidisql.wxi.in +++ b/win/packaging/heidisql.wxi.in @@ -45,14 +45,20 @@ <Component Id="component.HeidiSQL_ssleay32.dll" Guid="*" Win64="no"> <File Id="heidisql.ssleay32.dll" Name="ssleay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\ssleay32.dll" /> </Component> - <Component Id="component.HeidiSQL_libintl.dll" Guid="*" Win64="no"> - <File Id="heidisql.libintl.dll" Name="libintl.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl.dll" /> + <Component Id="component.HeidiSQL_libintl_8.dll" Guid="*" Win64="no"> + <File Id="heidisql.libintl_8.dll" Name="libintl-8.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl-8.dll" /> + </Component> + <Component Id="component.HeidiSQL_libiconv_2.dll" Guid="*" Win64="no"> + <File Id="heidisql.libiconv_2.dll" Name="libiconv-2.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libiconv-2.dll" /> </Component> <Directory Id="D.HeidiSQL.plugins" Name="plugins"> <Component Id="component.HeidiSQL_dialog.dll" Guid="*" Win64="no"> <File Id="heidisql.dialog.dll" Name="dialog.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\dialog.dll" /> </Component> + <Component Id="component.HeidiSQL_auth_gssapi_client.dll" Guid="*" Win64="no"> + <File Id="heidisql.auth_gssapi_client.dll" Name="auth_gssapi_client.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\auth_gssapi_client.dll" /> + </Component> </Directory> <Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no"> @@ -70,8 +76,10 @@ <ComponentRef Id="component.HeidiSQL_libeay32.dll" /> <ComponentRef Id="component.HeidiSQL_libpq.dll" /> <ComponentRef Id="component.HeidiSQL_ssleay32.dll" /> - <ComponentRef Id="component.HeidiSQL_libintl.dll" /> + <ComponentRef Id="component.HeidiSQL_libintl_8.dll" /> + <ComponentRef Id="component.HeidiSQL_libiconv_2.dll" /> <ComponentRef Id="component.HeidiSQL_dialog.dll" /> + <ComponentRef Id="component.HeidiSQL_auth_gssapi_client.dll" /> <ComponentRef Id="component.HeidiSQL_CleanupSettings"/> </ComponentGroup> </Include> |