X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=mj2%2Fmj2_to_metadata.vcproj;h=4207365cfde58380b07f6b77558fa55689bc3325;hb=b93c12564daea92200eefc596d4c438b1b00c1c4;hp=a35f07d0586e312db50730de5ce752a4827bf849;hpb=4c67811f6528b915a3011792e2a286adbda49247;p=openjpeg.git

diff --git a/mj2/mj2_to_metadata.vcproj b/mj2/mj2_to_metadata.vcproj
index a35f07d0..4207365c 100644
--- a/mj2/mj2_to_metadata.vcproj
+++ b/mj2/mj2_to_metadata.vcproj
@@ -1,134 +1,201 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8,00"
 	Name="mj2_to_metadata"
-	ProjectGUID="{338C1241-ACB9-469F-98DF-3B9D79ADD1A0}"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{69BE42AB-E7CE-4DA1-BBD2-39FEA2C91E0B}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			Name="Debug|Win32"
+			OutputDirectory=".\mj2_to_metadata___Win32_Debug0"
+			IntermediateDirectory=".\mj2_to_metadata___Win32_Debug0"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.tlb"
+				HeaderFileName=""
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
+				Optimization="0"
 				AdditionalIncludeDirectories="../libopenjpeg"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,DONT_HAVE_GETOPT,NO_PACKETS_DECODING"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/mj2_to_metadata.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;OPJ_STATIC;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				PrecompiledHeaderFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.pch"
+				AssemblerListingLocation=".\mj2_to_metadata___Win32_Debug0/"
+				ObjectFile=".\mj2_to_metadata___Win32_Debug0/"
+				ProgramDataBaseFileName=".\mj2_to_metadata___Win32_Debug0/"
+				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile=".\Release/mj2_to_metadata.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/mj2_to_metadata.pdb"
-				SubSystem="1"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/mj2_to_metadata.tlb"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCLinkerTool"
+				OutputFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="LIBCMT"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.bsc"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\mj2_to_metadata___Win32_Debug0"
-			IntermediateDirectory=".\mj2_to_metadata___Win32_Debug0"
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/mj2_to_metadata.tlb"
+				HeaderFileName=""
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../libopenjpeg"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,DONT_HAVE_GETOPT,NO_PACKETS_DECODING"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.pch"
-				AssemblerListingLocation=".\mj2_to_metadata___Win32_Debug0/"
-				ObjectFile=".\mj2_to_metadata___Win32_Debug0/"
-				ProgramDataBaseFileName=".\mj2_to_metadata___Win32_Debug0/"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;OPJ_STATIC;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release/mj2_to_metadata.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"/>
+				SuppressStartupBanner="true"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.pdb"
-				SubSystem="1"/>
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\mj2_to_metadata___Win32_Debug0/mj2_to_metadata.tlb"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCLinkerTool"
+				OutputFile=".\Release/mj2_to_metadata.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="libcmtd"
+				ProgramDatabaseFile=".\Release/mj2_to_metadata.pdb"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-				AdditionalIncludeDirectories=""
-				ResourceOutputFileName=""/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/mj2_to_metadata.bsc"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -136,188 +203,146 @@
 	<Files>
 		<Filter
 			Name="MJ2"
-			Filter="">
+			>
 			<Filter
 				Name="MJ2 Header Files"
-				Filter="">
+				>
 				<File
-					RelativePath=".\compat\getopt.h">
+					RelativePath="compat\getopt.h"
+					>
 				</File>
 				<File
-					RelativePath="meta_out.h">
+					RelativePath="meta_out.h"
+					>
 				</File>
 				<File
-					RelativePath=".\mj2.h">
+					RelativePath="mj2.h"
+					>
 				</File>
 				<File
-					RelativePath=".\mj2_convert.h">
+					RelativePath="mj2_convert.h"
+					>
 				</File>
 				<File
-					RelativePath="mj2_to_metadata.h">
+					RelativePath="mj2_to_metadata.h"
+					>
 				</File>
 			</Filter>
 			<Filter
 				Name="MJ2 Source Files"
-				Filter="">
+				>
 				<File
-					RelativePath=".\compat\getopt.c">
+					RelativePath="compat\getopt.c"
+					>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories="../libopenjpeg;$(NoInherit)"
-							CompileAs="0"/>
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="meta_out.c">
-				</File>
-				<File
-					RelativePath=".\mj2.c">
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories="../libopenjpeg;$(NoInherit)"
-							CompileAs="0"/>
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\mj2_convert.c">
+					RelativePath="meta_out.c"
+					>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories="../libopenjpeg;$(NoInherit)"
-							CompileAs="0"/>
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
 					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\mj2_to_metadata.c">
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories="../libopenjpeg;$(NoInherit)"
-							CompileAs="0"/>
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
 					</FileConfiguration>
 				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="OpenJPEG"
-			Filter="">
-			<Filter
-				Name="OpenJPEG Header Files"
-				Filter=".h">
 				<File
-					RelativePath="..\libopenjpeg\bio.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\cio.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\dwt.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\fix.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\int.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\j2k.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\jp2.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\jpt.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\mct.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\mqc.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\openjpeg.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\pi.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\raw.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\t1.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\t2.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\tcd.h">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\tgt.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="OpenJPEG Source Files"
-				Filter=".c">
-				<File
-					RelativePath="..\libopenjpeg\bio.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\cio.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\dwt.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\fix.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\int.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\j2k.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\jp2.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\jpt.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\mct.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\mqc.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\pi.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\raw.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\t1.c">
-				</File>
-				<File
-					RelativePath="..\libopenjpeg\t2.c">
+					RelativePath="mj2.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\libopenjpeg\tcd.c">
+					RelativePath="mj2_convert.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\libopenjpeg\tgt.c">
+					RelativePath="mj2_to_metadata.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalIncludeDirectories=""
+							PreprocessorDefinitions=""
+						/>
+					</FileConfiguration>
 				</File>
 			</Filter>
 		</Filter>
-		<File
-			RelativePath="resource.h">
-		</File>
 	</Files>
 	<Globals>
 	</Globals>