firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 04:43:03 +01:00
Code Issues

Include zlib1.dll in the binary kits

Browse Source
This commit is contained in:
paul_reeves 2015-12-11 16:06:37 +00:00
parent 53bc8eb2cb
commit dbd023006c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
View File

@ -746,7 +746,7 @@ procedure SetupSharedFilesArray;
// - Libraries // - Libraries
// - License files // - License files
begin begin
SetArrayLength(SharedFileArray,35); SetArrayLength(SharedFileArray,36);
SharedFileArray[0].Filename := ExpandConstant('{app}')+'IPLicense.txt'; SharedFileArray[0].Filename := ExpandConstant('{app}')+'IPLicense.txt';
SharedFileArray[1].Filename := ExpandConstant('{app}')+'IDPLicense.txt'; SharedFileArray[1].Filename := ExpandConstant('{app}')+'IDPLicense.txt';
@ -794,6 +794,7 @@ SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf';
SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe'; SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe';
SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll'; SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll';
SharedFileArray[34].Filename := ExpandConstant('{app}')+'fbtracemgr.exe'; SharedFileArray[34].Filename := ExpandConstant('{app}')+'fbtracemgr.exe';
SharedFileArray[35].Filename := ExpandConstant('{app}')+'zlib1.dll';
// FIXME // FIXME
// Add in WOW64 here. // Add in WOW64 here.

1
builds/install/arch-specific/win32/FirebirdInstall_30.iss
View File

@ -502,6 +502,7 @@ Source: {#FilesDir}\icudt*.dat; DestDir: {app}; Components: ServerComponent; Fl
#if PlatformTarget =="Win32" #if PlatformTarget =="Win32"
Source: {#FilesDir}\fbrmclib.dll; DestDir: {app}; Components: ServerComponent; Flags: sharedfile ignoreversion Source: {#FilesDir}\fbrmclib.dll; DestDir: {app}; Components: ServerComponent; Flags: sharedfile ignoreversion
#endif #endif
Source: {#FilesDir}\zlib1.dll; DestDir: {app}; Components: ServerComponent; Flags: sharedfile ignoreversion
;Rules for installation of MS runtimes are simplified with MSVC10 ;Rules for installation of MS runtimes are simplified with MSVC10
;We just install the runtimes into the install dir. ;We just install the runtimes into the install dir.