dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed the order of the zlib lib files SConstruct searches for so it can find the MinGW specific .a first. 64-bit MinGW has problems with a MSVC generated lib file.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6615 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-09-19 18:54:02 +00:00
parent 85851b0dad
commit fe491ddf94
4 changed files with 16 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/build.cpp
View file

@ -857,14 +857,6 @@ int CEXEBuild::add_db_data(IMMap *mmap) // returns offset
bufferlen = INT_MAX-st-sizeof(int); // so maximize compressor room and hope the file compresses well
db->resize(st + bufferlen + sizeof(int));
#if defined(NSIS_CONFIG_COMPRESSION_SUPPORT) && defined(__GNUC__) && defined(_WIN64) // There is another one of these, remove both when fixed
// BUGBUG: zlib is currently broken on 64-bit MinGW
if (compressor == &zlib_compressor)
{
ERROR_MSG(_T("\nError: ZLib is currently broken on this platform!\n"));
return -1;
}
#endif
int n = compressor->Init(build_compress_level, build_compress_dict_size);
if (n != C_OK)
{
@ -2577,15 +2569,6 @@ int CEXEBuild::write_output(void)
RET_UNLESS_OK( check_write_output_errors() );
#if defined(NSIS_CONFIG_COMPRESSION_SUPPORT) && defined(__GNUC__) && defined(_WIN64) // There is another one of these, remove both when fixed
// BUGBUG: zlib is currently broken on 64-bit MinGW
if (compressor == &zlib_compressor)
{
ERROR_MSG(_T("\nError: ZLib is currently broken on this platform!\n"));
return PS_ERROR;
}
#endif
has_called_write_output=true;
#ifdef NSIS_CONFIG_PLUGIN_SUPPORT