Merge branch 'upstream'
update to 2.4.5 revision 1 Conflicts: HLLib/XZPFile.cpp
This commit is contained in:
commit
e061e4f4ee
|
@ -163,11 +163,11 @@ namespace HLLib
|
||||||
class CSGASpecializedDirectory : public ISGADirectory
|
class CSGASpecializedDirectory : public ISGADirectory
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef TSGAHeader SGAHeader;
|
typedef typename TSGAHeader SGAHeader;
|
||||||
typedef TSGADirectoryHeader SGADirectoryHeader;
|
typedef typename TSGADirectoryHeader SGADirectoryHeader;
|
||||||
typedef TSGASection SGASection;
|
typedef typename TSGASection SGASection;
|
||||||
typedef TSGAFolder SGAFolder;
|
typedef typename TSGAFolder SGAFolder;
|
||||||
typedef TSGAFile SGAFile;
|
typedef typename TSGAFile SGAFile;
|
||||||
|
|
||||||
CSGASpecializedDirectory(CSGAFile& File);
|
CSGASpecializedDirectory(CSGAFile& File);
|
||||||
|
|
||||||
|
@ -192,10 +192,10 @@ namespace HLLib
|
||||||
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile4> : public ISGADirectory
|
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile4> : public ISGADirectory
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef TSGAHeader SGAHeader;
|
typedef typename TSGAHeader SGAHeader;
|
||||||
typedef TSGADirectoryHeader SGADirectoryHeader;
|
typedef typename TSGADirectoryHeader SGADirectoryHeader;
|
||||||
typedef TSGASection SGASection;
|
typedef typename TSGASection SGASection;
|
||||||
typedef TSGAFolder SGAFolder;
|
typedef typename TSGAFolder SGAFolder;
|
||||||
typedef CSGAFile::SGAFile4 SGAFile;
|
typedef CSGAFile::SGAFile4 SGAFile;
|
||||||
|
|
||||||
CSGASpecializedDirectory(CSGAFile& File);
|
CSGASpecializedDirectory(CSGAFile& File);
|
||||||
|
@ -221,10 +221,10 @@ namespace HLLib
|
||||||
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile6> : public ISGADirectory
|
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile6> : public ISGADirectory
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef TSGAHeader SGAHeader;
|
typedef typename TSGAHeader SGAHeader;
|
||||||
typedef TSGADirectoryHeader SGADirectoryHeader;
|
typedef typename TSGADirectoryHeader SGADirectoryHeader;
|
||||||
typedef TSGASection SGASection;
|
typedef typename TSGASection SGASection;
|
||||||
typedef TSGAFolder SGAFolder;
|
typedef typename TSGAFolder SGAFolder;
|
||||||
typedef CSGAFile::SGAFile6 SGAFile;
|
typedef CSGAFile::SGAFile6 SGAFile;
|
||||||
|
|
||||||
CSGASpecializedDirectory(CSGAFile& File);
|
CSGASpecializedDirectory(CSGAFile& File);
|
||||||
|
|
|
@ -194,16 +194,18 @@ CDirectoryFolder *CXZPFile::CreateRoot()
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// No file name information, just file name CRCs.
|
// No file name information, just file name CRCs.
|
||||||
|
const hlChar lpLookup[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
|
||||||
for(hlUInt i = 0; i < this->pHeader->uiDirectoryEntryCount; i++)
|
for(hlUInt i = 0; i < this->pHeader->uiDirectoryEntryCount; i++)
|
||||||
{
|
{
|
||||||
hlChar lpTemp[16] = "";
|
hlChar lpTemp[16];
|
||||||
const hlChar *lpLookup[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };
|
|
||||||
|
hlChar* lpName = lpTemp;
|
||||||
for(hlByte *lpCRC = (hlByte *)&this->lpDirectoryEntries[i].uiFileNameCRC; lpCRC < (hlByte *)&this->lpDirectoryEntries[i].uiFileNameCRC + sizeof(hlUInt); lpCRC++)
|
for(hlByte *lpCRC = (hlByte *)&this->lpDirectoryEntries[i].uiFileNameCRC; lpCRC < (hlByte *)&this->lpDirectoryEntries[i].uiFileNameCRC + sizeof(hlUInt); lpCRC++)
|
||||||
{
|
{
|
||||||
strcat(lpTemp, lpLookup[(hlByte)(*lpCRC >> 4)]);
|
*lpName++ = lpLookup[(hlByte)(*lpCRC >> 4)];
|
||||||
strcat(lpTemp, lpLookup[(hlByte)(*lpCRC & 0x0F)]);
|
*lpName++ = lpLookup[(hlByte)(*lpCRC & 0x0F)];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
*lpName = '\0';
|
||||||
|
|
||||||
pRoot->AddFile(lpTemp, i);
|
pRoot->AddFile(lpTemp, i);
|
||||||
}
|
}
|
||||||
|
|
26
lib/HLLib.h
26
lib/HLLib.h
|
@ -2031,11 +2031,11 @@ class HLLIB_API CSGAFile : public CPackage
|
||||||
class CSGASpecializedDirectory : public ISGADirectory
|
class CSGASpecializedDirectory : public ISGADirectory
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef TSGAHeader SGAHeader;
|
typedef typename TSGAHeader SGAHeader;
|
||||||
typedef TSGADirectoryHeader SGADirectoryHeader;
|
typedef typename TSGADirectoryHeader SGADirectoryHeader;
|
||||||
typedef TSGASection SGASection;
|
typedef typename TSGASection SGASection;
|
||||||
typedef TSGAFolder SGAFolder;
|
typedef typename TSGAFolder SGAFolder;
|
||||||
typedef TSGAFile SGAFile;
|
typedef typename TSGAFile SGAFile;
|
||||||
|
|
||||||
CSGASpecializedDirectory(CSGAFile& File);
|
CSGASpecializedDirectory(CSGAFile& File);
|
||||||
|
|
||||||
|
@ -2060,10 +2060,10 @@ class HLLIB_API CSGAFile : public CPackage
|
||||||
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile4> : public ISGADirectory
|
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile4> : public ISGADirectory
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef TSGAHeader SGAHeader;
|
typedef typename TSGAHeader SGAHeader;
|
||||||
typedef TSGADirectoryHeader SGADirectoryHeader;
|
typedef typename TSGADirectoryHeader SGADirectoryHeader;
|
||||||
typedef TSGASection SGASection;
|
typedef typename TSGASection SGASection;
|
||||||
typedef TSGAFolder SGAFolder;
|
typedef typename TSGAFolder SGAFolder;
|
||||||
typedef CSGAFile::SGAFile4 SGAFile;
|
typedef CSGAFile::SGAFile4 SGAFile;
|
||||||
|
|
||||||
CSGASpecializedDirectory(CSGAFile& File);
|
CSGASpecializedDirectory(CSGAFile& File);
|
||||||
|
@ -2089,10 +2089,10 @@ class HLLIB_API CSGAFile : public CPackage
|
||||||
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile6> : public ISGADirectory
|
class CSGASpecializedDirectory<TSGAHeader, TSGADirectoryHeader, TSGASection, TSGAFolder, SGAFile6> : public ISGADirectory
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
typedef TSGAHeader SGAHeader;
|
typedef typename TSGAHeader SGAHeader;
|
||||||
typedef TSGADirectoryHeader SGADirectoryHeader;
|
typedef typename TSGADirectoryHeader SGADirectoryHeader;
|
||||||
typedef TSGASection SGASection;
|
typedef typename TSGASection SGASection;
|
||||||
typedef TSGAFolder SGAFolder;
|
typedef typename TSGAFolder SGAFolder;
|
||||||
typedef CSGAFile::SGAFile6 SGAFile;
|
typedef CSGAFile::SGAFile6 SGAFile;
|
||||||
|
|
||||||
CSGASpecializedDirectory(CSGAFile& File);
|
CSGASpecializedDirectory(CSGAFile& File);
|
||||||
|
|
|
@ -82,7 +82,7 @@
|
||||||
<MinimalRebuild>true</MinimalRebuild>
|
<MinimalRebuild>true</MinimalRebuild>
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
<ExceptionHandling>Sync</ExceptionHandling>
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<RuntimeTypeInfo>false</RuntimeTypeInfo>
|
<RuntimeTypeInfo>false</RuntimeTypeInfo>
|
||||||
<PrecompiledHeader>
|
<PrecompiledHeader>
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
|
@ -110,7 +110,7 @@
|
||||||
<MinimalRebuild>true</MinimalRebuild>
|
<MinimalRebuild>true</MinimalRebuild>
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
<ExceptionHandling>Sync</ExceptionHandling>
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<RuntimeTypeInfo>false</RuntimeTypeInfo>
|
<RuntimeTypeInfo>false</RuntimeTypeInfo>
|
||||||
<PrecompiledHeader>
|
<PrecompiledHeader>
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
|
@ -135,7 +135,7 @@
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
<ExceptionHandling>Sync</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
<PrecompiledHeader>
|
<PrecompiledHeader>
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
@ -165,7 +165,7 @@
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
<ExceptionHandling>Sync</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
<PrecompiledHeader>
|
<PrecompiledHeader>
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
|
|
@ -84,13 +84,13 @@
|
||||||
<MinimalRebuild>true</MinimalRebuild>
|
<MinimalRebuild>true</MinimalRebuild>
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
<ExceptionHandling>Sync</ExceptionHandling>
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<RuntimeTypeInfo>false</RuntimeTypeInfo>
|
<RuntimeTypeInfo>false</RuntimeTypeInfo>
|
||||||
<PrecompiledHeader>
|
<PrecompiledHeader>
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||||
<AdditionalIncludeDirectories>E:\Projects\Utilities\ZLib</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\..\..\3rdParty\zlib\current</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
|
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
|
||||||
|
@ -102,7 +102,7 @@
|
||||||
</DataExecutionPrevention>
|
</DataExecutionPrevention>
|
||||||
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
|
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<AdditionalLibraryDirectories>E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x86\ZlibStatDebug</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration)</AdditionalLibraryDirectories>
|
||||||
<AdditionalDependencies>zlibstat.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>zlibstat.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
@ -116,13 +116,13 @@
|
||||||
<MinimalRebuild>true</MinimalRebuild>
|
<MinimalRebuild>true</MinimalRebuild>
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
<ExceptionHandling>Sync</ExceptionHandling>
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<RuntimeTypeInfo>false</RuntimeTypeInfo>
|
<RuntimeTypeInfo>false</RuntimeTypeInfo>
|
||||||
<PrecompiledHeader>
|
<PrecompiledHeader>
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<AdditionalIncludeDirectories>E:\Projects\Utilities\ZLib</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\..\..\3rdParty\zlib\current</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
|
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
|
||||||
|
@ -135,7 +135,7 @@
|
||||||
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
|
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
<TargetMachine>MachineX64</TargetMachine>
|
||||||
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<AdditionalLibraryDirectories>E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x64\ZlibStatDebug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration)</AdditionalLibraryDirectories>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
@ -147,13 +147,13 @@
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
<ExceptionHandling>Sync</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
<PrecompiledHeader>
|
<PrecompiledHeader>
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<AdditionalIncludeDirectories>E:\Projects\Utilities\ZLib</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\..\..\3rdParty\zlib\current</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
|
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
|
||||||
|
@ -166,7 +166,7 @@
|
||||||
</DataExecutionPrevention>
|
</DataExecutionPrevention>
|
||||||
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
|
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<AdditionalLibraryDirectories>E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x86\ZlibStatRelease</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration)</AdditionalLibraryDirectories>
|
||||||
<AdditionalDependencies>zlibstat.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>zlibstat.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
@ -182,13 +182,13 @@
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ExceptionHandling>Sync</ExceptionHandling>
|
<ExceptionHandling>Sync</ExceptionHandling>
|
||||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||||
<PrecompiledHeader>
|
<PrecompiledHeader>
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<AdditionalIncludeDirectories>E:\Projects\Utilities\ZLib</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\..\..\..\..\3rdParty\zlib\current</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
|
<OutputFile>$(OutDir)HLLib.dll</OutputFile>
|
||||||
|
@ -201,7 +201,7 @@
|
||||||
</DataExecutionPrevention>
|
</DataExecutionPrevention>
|
||||||
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
|
<ImportLibrary>$(OutDir)HLLib.lib</ImportLibrary>
|
||||||
<TargetMachine>MachineX64</TargetMachine>
|
<TargetMachine>MachineX64</TargetMachine>
|
||||||
<AdditionalLibraryDirectories>E:\Projects\Utilities\ZLib\contrib\vstudio\vc10\x64\ZlibStatRelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(Platform)\ZlibStat$(Configuration)</AdditionalLibraryDirectories>
|
||||||
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
MinimalRebuild="true"
|
MinimalRebuild="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="3"
|
||||||
RuntimeTypeInfo="false"
|
RuntimeTypeInfo="false"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
|
@ -129,7 +129,7 @@
|
||||||
MinimalRebuild="true"
|
MinimalRebuild="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="3"
|
||||||
RuntimeTypeInfo="false"
|
RuntimeTypeInfo="false"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
|
@ -208,7 +208,7 @@
|
||||||
FavorSizeOrSpeed="1"
|
FavorSizeOrSpeed="1"
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION"
|
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="2"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
|
@ -290,7 +290,7 @@
|
||||||
FavorSizeOrSpeed="1"
|
FavorSizeOrSpeed="1"
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION"
|
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_RTM_VERSION"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="2"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
|
|
|
@ -45,12 +45,12 @@
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="E:\Projects\Utilities\ZLib"
|
AdditionalIncludeDirectories="..\..\..\..\..\3rdParty\zlib\current"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_USE_RTM_VERSION;HLLIB_EXPORTS;USE_ZLIB=1"
|
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_USE_RTM_VERSION;HLLIB_EXPORTS;USE_ZLIB=1"
|
||||||
MinimalRebuild="true"
|
MinimalRebuild="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="3"
|
||||||
RuntimeTypeInfo="false"
|
RuntimeTypeInfo="false"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
AdditionalDependencies="zlibstat.lib"
|
AdditionalDependencies="zlibstat.lib"
|
||||||
OutputFile="$(OutDir)/HLLib.dll"
|
OutputFile="$(OutDir)/HLLib.dll"
|
||||||
LinkIncremental="2"
|
LinkIncremental="2"
|
||||||
AdditionalLibraryDirectories="E:\Projects\Utilities\ZLib\contrib\vstudio\vc9\x86\ZlibStatDebug"
|
AdditionalLibraryDirectories="..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(PlatformName)\ZlibStat$(ConfigurationName)"
|
||||||
GenerateDebugInformation="true"
|
GenerateDebugInformation="true"
|
||||||
ProgramDatabaseFile="$(OutDir)/HLLib.pdb"
|
ProgramDatabaseFile="$(OutDir)/HLLib.pdb"
|
||||||
SubSystem="2"
|
SubSystem="2"
|
||||||
|
@ -128,12 +128,12 @@
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories="E:\Projects\Utilities\ZLib"
|
AdditionalIncludeDirectories="..\..\..\..\..\3rdParty\zlib\current"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_USE_RTM_VERSION;HLLIB_EXPORTS;USE_ZLIB=1"
|
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_USE_RTM_VERSION;HLLIB_EXPORTS;USE_ZLIB=1"
|
||||||
MinimalRebuild="true"
|
MinimalRebuild="true"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
RuntimeLibrary="1"
|
RuntimeLibrary="3"
|
||||||
RuntimeTypeInfo="false"
|
RuntimeTypeInfo="false"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
|
@ -153,7 +153,7 @@
|
||||||
AdditionalDependencies="zlibstat.lib"
|
AdditionalDependencies="zlibstat.lib"
|
||||||
OutputFile="$(OutDir)/HLLib.dll"
|
OutputFile="$(OutDir)/HLLib.dll"
|
||||||
LinkIncremental="2"
|
LinkIncremental="2"
|
||||||
AdditionalLibraryDirectories="E:\Projects\Utilities\ZLib\contrib\vstudio\vc9\x64\ZlibStatDebug"
|
AdditionalLibraryDirectories="..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(PlatformName)\ZlibStat$(ConfigurationName)"
|
||||||
GenerateDebugInformation="true"
|
GenerateDebugInformation="true"
|
||||||
ProgramDatabaseFile="$(OutDir)/HLLib.pdb"
|
ProgramDatabaseFile="$(OutDir)/HLLib.pdb"
|
||||||
SubSystem="2"
|
SubSystem="2"
|
||||||
|
@ -215,10 +215,10 @@
|
||||||
EnableIntrinsicFunctions="true"
|
EnableIntrinsicFunctions="true"
|
||||||
FavorSizeOrSpeed="1"
|
FavorSizeOrSpeed="1"
|
||||||
WholeProgramOptimization="true"
|
WholeProgramOptimization="true"
|
||||||
AdditionalIncludeDirectories="E:\Projects\Utilities\ZLib"
|
AdditionalIncludeDirectories="..\..\..\..\..\3rdParty\zlib\current"
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1"
|
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="2"
|
||||||
BufferSecurityCheck="false"
|
BufferSecurityCheck="false"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
|
@ -238,7 +238,7 @@
|
||||||
AdditionalDependencies="zlibstat.lib"
|
AdditionalDependencies="zlibstat.lib"
|
||||||
OutputFile="$(OutDir)/HLLib.dll"
|
OutputFile="$(OutDir)/HLLib.dll"
|
||||||
LinkIncremental="1"
|
LinkIncremental="1"
|
||||||
AdditionalLibraryDirectories="E:\Projects\Utilities\ZLib\contrib\vstudio\vc9\x86\ZlibStatRelease"
|
AdditionalLibraryDirectories="..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(PlatformName)\ZlibStat$(ConfigurationName)"
|
||||||
GenerateDebugInformation="false"
|
GenerateDebugInformation="false"
|
||||||
SubSystem="2"
|
SubSystem="2"
|
||||||
OptimizeReferences="2"
|
OptimizeReferences="2"
|
||||||
|
@ -302,10 +302,10 @@
|
||||||
EnableIntrinsicFunctions="true"
|
EnableIntrinsicFunctions="true"
|
||||||
FavorSizeOrSpeed="1"
|
FavorSizeOrSpeed="1"
|
||||||
WholeProgramOptimization="true"
|
WholeProgramOptimization="true"
|
||||||
AdditionalIncludeDirectories="E:\Projects\Utilities\ZLib"
|
AdditionalIncludeDirectories="..\..\..\..\..\3rdParty\zlib\current"
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1"
|
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HLLIB_EXPORTS;USE_ZLIB=1"
|
||||||
ExceptionHandling="1"
|
ExceptionHandling="1"
|
||||||
RuntimeLibrary="0"
|
RuntimeLibrary="2"
|
||||||
BufferSecurityCheck="false"
|
BufferSecurityCheck="false"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
|
@ -325,7 +325,7 @@
|
||||||
AdditionalDependencies="zlibstat.lib"
|
AdditionalDependencies="zlibstat.lib"
|
||||||
OutputFile="$(OutDir)/HLLib.dll"
|
OutputFile="$(OutDir)/HLLib.dll"
|
||||||
LinkIncremental="1"
|
LinkIncremental="1"
|
||||||
AdditionalLibraryDirectories="E:\Projects\Utilities\ZLib\contrib\vstudio\vc9\x64\ZlibStatRelease"
|
AdditionalLibraryDirectories="..\..\..\..\..\3rdParty\ZLib\current\contrib\vstudio\vc10\$(PlatformName)\ZlibStat$(ConfigurationName)"
|
||||||
GenerateDebugInformation="false"
|
GenerateDebugInformation="false"
|
||||||
SubSystem="2"
|
SubSystem="2"
|
||||||
OptimizeReferences="2"
|
OptimizeReferences="2"
|
||||||
|
|
Loading…
Reference in New Issue