X-Git-Url: https://sfsrealm.hopto.org/projects/gitweb.cgi?p=SFmpqapi.git;a=blobdiff_plain;f=SFmpqlib.vcproj;h=b8dd17c573601f821f3706dee83b3ac1e547a7b4;hp=7a575cd7c2588318fbacf5f959f72311f70a9d45;hb=5ec6acabbdf7207331585eb3bbbb5b477dcc5564;hpb=46511c53b667ffb988cf1673c3939e9ef3d26dd8

diff --git a/SFmpqlib.vcproj b/SFmpqlib.vcproj
index 7a575cd..b8dd17c 100644
--- a/SFmpqlib.vcproj
+++ b/SFmpqlib.vcproj
@@ -4,6 +4,7 @@
 	Version="9.00"
 	Name="SFmpqlib"
 	ProjectGUID="{2AB3EE05-94F1-433F-A9CF-F7E01220445D}"
+	RootNamespace="SFmpqlib"
 	TargetFrameworkVersion="0"
 	>
 	<Platforms>
@@ -42,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LIB;SFMPQ_STATIC;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LIB;SFMPQ_STATIC;ZLIB_DLL;BZ_NO_STDIO"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -117,7 +118,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_LIB;SFMPQ_STATIC;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_LIB;SFMPQ_STATIC;ZLIB_DLL;BZ_NO_STDIO"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -170,106 +171,6 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
-			<File
-				RelativePath="..\SComp\explode.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\huffman.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\implode.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\SComp.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\SErr.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="SFmpq_static.cpp"
 				>
@@ -310,67 +211,11 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\SComp\SMem.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\SComp\wave.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
-			<File
-				RelativePath="..\SComp\Huffman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\pklib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\SComp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\SComp\SErr.h"
-				>
-			</File>
 			<File
 				RelativePath="SFmpq_static.h"
 				>
@@ -379,19 +224,587 @@
 				RelativePath="SFmpqapi.h"
 				>
 			</File>
-			<File
-				RelativePath="..\SComp\SMem.h"
+		</Filter>
+		<Filter
+			Name="SComp"
+			>
+			<Filter
+				Name="Base"
 				>
-			</File>
-			<File
-				RelativePath="..\SComp\wave.h"
+				<Filter
+					Name="Header Files"
+					Filter="h;hpp;hxx;hm;inl"
+					>
+					<File
+						RelativePath="..\SComp\Huffman.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\pklib.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\SComp.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\SErr.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\SMem.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\wave.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Source Files"
+					Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+					>
+					<File
+						RelativePath="..\SComp\explode.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\huffman.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\implode.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\SComp.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\SErr.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\SMem.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\wave.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								PreprocessorDefinitions=""
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="bzip2"
 				>
-			</File>
+				<Filter
+					Name="Header Files"
+					Filter="h;hpp;hxx;hm;inl"
+					>
+					<File
+						RelativePath="..\SComp\bzip2\bzlib.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\bzlib_private.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Source Files"
+					Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+					>
+					<File
+						RelativePath="..\SComp\bzip2\blocksort.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\bzlib.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\compress.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\crctable.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\decompress.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\huffman.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\bzip2\randtable.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/bzip2/"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="zlib"
+				>
+				<Filter
+					Name="Header Files"
+					Filter="h;hpp;hxx;hm;inl"
+					>
+					<File
+						RelativePath="..\SComp\zlib\zconf.h"
+						>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\zlib.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Source Files"
+					Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+					>
+					<File
+						RelativePath="..\SComp\zlib\adler32.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\compress.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\crc32.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\deflate.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\inffast.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\inflate.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\inftrees.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\trees.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\uncompr.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\SComp\zlib\zutil.c"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Debug/SComp/zlib/"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile=".\SFmpqlib___Win32_Release/SComp/zlib/"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
-		<File
-			RelativePath="..\SComp\ZLib_Static_min.lib"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>