temporarily removed optimization that is breaking zlib somehow

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40300
This commit is contained in:
David Anderson 2007-01-15 23:10:59 +00:00
parent 9331fe2a5c
commit c97d129c4d
2 changed files with 11 additions and 2 deletions

View File

@ -116,6 +116,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="true" OmitFramePointers="true"
@ -196,6 +197,14 @@
<File <File
RelativePath="..\pawncc.c" RelativePath="..\pawncc.c"
> >
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AssemblerOutput="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\sc1.c" RelativePath="..\sc1.c"

View File

@ -440,7 +440,7 @@ int main(int argc, char *argv[])
proper = (unsigned char *)pOrig->base + header_size; proper = (unsigned char *)pOrig->base + header_size;
/* get initial size estimate */ /* get initial size estimate */
pHdr->disksize = (uint32_t)compressBound(pHdr->imagesize); pHdr->disksize = (uint32_t)compressBound(pHdr->imagesize) * 2;
zcmp = (Bytef *)malloc(pHdr->disksize); zcmp = (Bytef *)malloc(pHdr->disksize);
if ((err=compress2(zcmp, if ((err=compress2(zcmp,
@ -451,7 +451,7 @@ int main(int argc, char *argv[])
!= Z_OK) != Z_OK)
{ {
free(zcmp); free(zcmp);
pc_printf("Unable to compress (Z): error %d", err); pc_printf("Unable to compress (Z): error %d\n", err);
pc_printf("Falling back to no compression."); pc_printf("Falling back to no compression.");
memfile_write(bin_file, memfile_write(bin_file,
proper, proper,