*** empty log message ***

16 files changed, 249 insertions, 94 deletions

diff --git a/mak.vc8/im.vcproj b/mak.vc8/im.vcproj
index 6cb24ba..617ae29 100644
--- a/mak.vc8/im.vcproj
+++ b/mak.vc8/im.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PNG_NO_STDIO;PNG_USE_PNGVCRD;PNG_TIME_RFC1123_SUPPORTED;_CRT_SECURE_NO_DEPRECATE;USE_EXIF"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/im.pch"
-				AssemblerListingLocation="..\obj/"
-				ObjectFile="..\obj/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -96,6 +97,10 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
+				RelativePath="..\src\im.def"
+				>
+			</File>
+			<File
 				RelativePath="..\src\im_attrib.cpp"
 				>
 			</File>
@@ -399,6 +404,10 @@
 				Name="libJPEG"
 				>
 				<File
+					RelativePath="..\src\libjpeg\jaricom.c"
+					>
+				</File>
+				<File
 					RelativePath="..\src\libjpeg\jcapimin.c"
 					>
 				</File>
@@ -407,6 +416,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\libjpeg\jcarith.c"
+					>
+				</File>
+				<File
 					RelativePath="..\src\libjpeg\jccoefct.c"
 					>
 				</File>
@@ -447,10 +460,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\src\libjpeg\jcphuff.c"
-					>
-				</File>
-				<File
 					RelativePath="..\src\libjpeg\jcprepct.c"
 					>
 				</File>
@@ -471,6 +480,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\libjpeg\jdarith.c"
+					>
+				</File>
+				<File
 					RelativePath="..\src\libjpeg\jdatadst.c"
 					>
 				</File>
@@ -515,10 +528,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\src\libjpeg\jdphuff.c"
-					>
-				</File>
-				<File
 					RelativePath="..\src\libjpeg\jdpostct.c"
 					>
 				</File>
@@ -559,10 +568,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\src\libjpeg\jidctred.c"
-					>
-				</File>
-				<File
 					RelativePath="..\src\libjpeg\jmemmgr.c"
 					>
 				</File>
@@ -682,6 +687,50 @@
 					RelativePath="..\src\zlib\zutil.c"
 					>
 				</File>
+				<Filter
+					Name="inc"
+					>
+					<File
+						RelativePath="..\src\zlib\crc32.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\zlib\deflate.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\zlib\inffast.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\zlib\inffixed.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\zlib\inflate.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\zlib\inftrees.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\zlib\trees.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\zlib\zconf.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\zlib\zlib.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\zlib\zutil.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="libEXIF"
@@ -727,6 +776,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\libexif\fuji\exif-mnote-data-fuji.c"
+					>
+				</File>
+				<File
 					RelativePath="..\src\libexif\olympus\exif-mnote-data-olympus.c"
 					>
 				</File>
@@ -755,6 +808,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\libexif\fuji\mnote-fuji-entry.c"
+					>
+				</File>
+				<File
+					RelativePath="..\src\libexif\fuji\mnote-fuji-tag.c"
+					>
+				</File>
+				<File
 					RelativePath="..\src\libexif\olympus\mnote-olympus-entry.c"
 					>
 				</File>
@@ -790,6 +851,10 @@
 						>
 					</File>
 					<File
+						RelativePath="..\src\libexif\exif-data-type.h"
+						>
+					</File>
+					<File
 						RelativePath="..\src\libexif\exif-data.h"
 						>
 					</File>
@@ -822,6 +887,10 @@
 						>
 					</File>
 					<File
+						RelativePath="..\src\libexif\fuji\exif-mnote-data-fuji.h"
+						>
+					</File>
+					<File
 						RelativePath="..\src\libexif\olympus\exif-mnote-data-olympus.h"
 						>
 					</File>
@@ -838,15 +907,15 @@
 						>
 					</File>
 					<File
-						RelativePath="..\src\libexif\exif-tag.h"
+						RelativePath="..\src\libexif\exif-system.h"
 						>
 					</File>
 					<File
-						RelativePath="..\src\libexif\exif-utils.h"
+						RelativePath="..\src\libexif\exif-tag.h"
 						>
 					</File>
 					<File
-						RelativePath="..\src\libexif\exif.h"
+						RelativePath="..\src\libexif\exif-utils.h"
 						>
 					</File>
 					<File
@@ -862,6 +931,14 @@
 						>
 					</File>
 					<File
+						RelativePath="..\src\libexif\fuji\mnote-fuji-entry.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\libexif\fuji\mnote-fuji-tag.h"
+						>
+					</File>
+					<File
 						RelativePath="..\src\libexif\olympus\mnote-olympus-entry.h"
 						>
 					</File>
diff --git a/mak.vc8/im_avi.vcproj b/mak.vc8/im_avi.vcproj
index 90c310c..a648839 100644
--- a/mak.vc8/im_avi.vcproj
+++ b/mak.vc8/im_avi.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj\im_avi"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/im_avi.pch"
-				AssemblerListingLocation="..\obj\im_avi/"
-				ObjectFile="..\obj\im_avi/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -96,6 +97,10 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
+				RelativePath="..\src\im_avi.def"
+				>
+			</File>
+			<File
 				RelativePath="..\src\im_format_avi.cpp"
 				>
 			</File>
diff --git a/mak.vc8/im_capture.vcproj b/mak.vc8/im_capture.vcproj
index e7a8555..6bc1003 100644
--- a/mak.vc8/im_capture.vcproj
+++ b/mak.vc8/im_capture.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj\im_capture"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/im_capture.pch"
-				AssemblerListingLocation="..\obj\im_capture/"
-				ObjectFile="..\obj\im_capture/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -96,6 +97,10 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
+				RelativePath="..\src\im_capture.def"
+				>
+			</File>
+			<File
 				RelativePath="..\src\im_capture_dx.cpp"
 				>
 			</File>
diff --git a/mak.vc8/im_copy.vcproj b/mak.vc8/im_copy.vcproj
index 0829d33..0c08cdb 100644
--- a/mak.vc8/im_copy.vcproj
+++ b/mak.vc8/im_copy.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\bin"
-			IntermediateDirectory="..\obj\$(ProjectName)"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -43,13 +43,16 @@
 				Optimization="0"
 				AdditionalIncludeDirectories="../include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
+				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/mak.vc8/im_ecw.vcproj b/mak.vc8/im_ecw.vcproj
index 0b115a0..d394811 100644
--- a/mak.vc8/im_ecw.vcproj
+++ b/mak.vc8/im_ecw.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/im_ecw.pch"
-				AssemblerListingLocation="..\obj/"
-				ObjectFile="..\obj/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -96,6 +97,10 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
+				RelativePath="..\src\im_ecw.def"
+				>
+			</File>
+			<File
 				RelativePath="..\src\im_format_ecw.cpp"
 				>
 			</File>
diff --git a/mak.vc8/im_fftw.vcproj b/mak.vc8/im_fftw.vcproj
index 957f81c..e231f09 100644
--- a/mak.vc8/im_fftw.vcproj
+++ b/mak.vc8/im_fftw.vcproj
@@ -4,6 +4,7 @@
 	Version="8,00"
 	Name="im_fftw"
 	ProjectGUID="{CB80E607-6B6C-345F-9B6D-27AA9123E493}"
+	RootNamespace="im_fftw"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -17,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj\im_fftw"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +47,15 @@
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,FFTW_ENABLE_FLOAT,_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/im_fftw.pch"
-				AssemblerListingLocation="..\obj\im_fftw/"
-				ObjectFile="..\obj\im_fftw/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -99,6 +101,10 @@
 				RelativePath="..\src\process\im_fft.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\im_fftw.def"
+				>
+			</File>
 			<Filter
 				Name="FFTW"
 				>
diff --git a/mak.vc8/im_info.vcproj b/mak.vc8/im_info.vcproj
index ca6271c..5e91a5b 100644
--- a/mak.vc8/im_info.vcproj
+++ b/mak.vc8/im_info.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\bin"
-			IntermediateDirectory="..\obj\$(ProjectName)"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -43,13 +43,16 @@
 				Optimization="0"
 				AdditionalIncludeDirectories="../include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
+				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/mak.vc8/im_jp2.vcproj b/mak.vc8/im_jp2.vcproj
index 7e6e720..07fcd82 100644
--- a/mak.vc8/im_jp2.vcproj
+++ b/mak.vc8/im_jp2.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj\im_jp2"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;EXCLUDE_JPG_SUPPORT;EXCLUDE_MIF_SUPPORT;EXCLUDE_PNM_SUPPORT;EXCLUDE_RAS_SUPPORT;EXCLUDE_BMP_SUPPORT;EXCLUDE_PGX_SUPPORT;EXCLUDE_TIFF_SUPPORT;JAS_WIN_MSVC_BUILD;JAS_TYPES;_CRT_SECURE_NO_DEPRECATE;JAS_GEO_OMIT_PRINTING_CODE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/im_jp2.pch"
-				AssemblerListingLocation="..\obj\im_jp2/"
-				ObjectFile="..\obj\im_jp2/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -100,6 +101,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\im_jp2.def"
+				>
+			</File>
+			<File
 				RelativePath="..\src\jas_binfile.c"
 				>
 			</File>
diff --git a/mak.vc8/im_process.vcproj b/mak.vc8/im_process.vcproj
index db2acb2..bd1760a 100644
--- a/mak.vc8/im_process.vcproj
+++ b/mak.vc8/im_process.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj\im_process"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/im_process.pch"
-				AssemblerListingLocation="..\obj\im_process/"
-				ObjectFile="..\obj\im_process/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -160,6 +161,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\src\im_process.def"
+				>
+			</File>
+			<File
 				RelativePath="..\src\process\im_quantize.cpp"
 				>
 			</File>
diff --git a/mak.vc8/im_view.vcproj b/mak.vc8/im_view.vcproj
index fcd41db..117b0fd 100644
--- a/mak.vc8/im_view.vcproj
+++ b/mak.vc8/im_view.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\bin"
-			IntermediateDirectory="..\obj\$(ProjectName)"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -47,9 +47,12 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -62,7 +65,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib vfw32.lib im.lib im_avi.lib iup.lib iupwin.lib cd.lib iupcd.lib freetype6.lib"
+				AdditionalDependencies="comctl32.lib vfw32.lib im.lib im_avi.lib iup.lib cd.lib iupcd.lib freetype6.lib"
 				OutputFile="$(OutDir)/im_view.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../lib;../../iup/lib;../../cd/lib"
diff --git a/mak.vc8/im_wmv.vcproj b/mak.vc8/im_wmv.vcproj
index 7e6d3b6..0a0daef 100644
--- a/mak.vc8/im_wmv.vcproj
+++ b/mak.vc8/im_wmv.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj\im_wmv"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/im_wmv.pch"
-				AssemblerListingLocation="..\obj\im_wmv/"
-				ObjectFile="..\obj\im_wmv/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -99,6 +100,10 @@
 				RelativePath="..\src\im_format_wmv.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\im_wmv.def"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/mak.vc8/imlua3.vcproj b/mak.vc8/imlua3.vcproj
index 6f89287..ab4446b 100644
--- a/mak.vc8/imlua3.vcproj
+++ b/mak.vc8/imlua3.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj\imlua3"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/imlua3.pch"
-				AssemblerListingLocation="..\obj\imlua3/"
-				ObjectFile="..\obj\imlua3/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -99,6 +100,10 @@
 				RelativePath="..\src\im_lua3.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\imlua3.def"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/mak.vc8/imlua5.vcproj b/mak.vc8/imlua5.vcproj
index 7b7131b..fe1a5a9 100644
--- a/mak.vc8/imlua5.vcproj
+++ b/mak.vc8/imlua5.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj\imlua5"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/imlua5.pch"
-				AssemblerListingLocation="..\obj\imlua5/"
-				ObjectFile="..\obj\imlua5/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -96,10 +97,22 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
+				RelativePath="..\src\lua5\im_convert.lua"
+				>
+			</File>
+			<File
+				RelativePath="..\src\lua5\im_image.lua"
+				>
+			</File>
+			<File
 				RelativePath="..\src\lua5\imlua.c"
 				>
 			</File>
 			<File
+				RelativePath="..\src\lua5\imlua.def"
+				>
+			</File>
+			<File
 				RelativePath="..\src\lua5\imlua_aux.c"
 				>
 			</File>
diff --git a/mak.vc8/imlua_capture5.vcproj b/mak.vc8/imlua_capture5.vcproj
index c2a4a81..7c18e77 100644
--- a/mak.vc8/imlua_capture5.vcproj
+++ b/mak.vc8/imlua_capture5.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj\imlua_capture5"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/imlua_capture5.pch"
-				AssemblerListingLocation="..\obj\imlua_capture5/"
-				ObjectFile="..\obj\imlua_capture5/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -99,6 +100,10 @@
 				RelativePath="..\src\lua5\imlua_capture.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\lua5\imlua_capture.def"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/mak.vc8/imlua_fftw5.vcproj b/mak.vc8/imlua_fftw5.vcproj
index f0363c4..5deb406 100644
--- a/mak.vc8/imlua_fftw5.vcproj
+++ b/mak.vc8/imlua_fftw5.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj\imlua_fftw5"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/imlua_fftw5.pch"
-				AssemblerListingLocation="..\obj\imlua_fftw5/"
-				ObjectFile="..\obj\imlua_fftw5/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -103,6 +104,10 @@
 				RelativePath="..\src\lua5\imlua_fftw.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\lua5\imlua_fftw.def"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/mak.vc8/imlua_process5.vcproj b/mak.vc8/imlua_process5.vcproj
index 7cb2b0d..65772df 100644
--- a/mak.vc8/imlua_process5.vcproj
+++ b/mak.vc8/imlua_process5.vcproj
@@ -17,7 +17,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\lib"
-			IntermediateDirectory="..\obj\imlua_process5"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -46,14 +46,15 @@
 				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,_CRT_SECURE_NO_DEPRECATE"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="0"
+				RuntimeLibrary="1"
 				PrecompiledHeaderFile="..\lib/imlua_process5.pch"
-				AssemblerListingLocation="..\obj\imlua_process5/"
-				ObjectFile="..\obj\imlua_process5/"
-				ProgramDataBaseFileName="..\lib/"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -107,6 +108,10 @@
 				RelativePath="..\src\lua5\imlua_process.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\lua5\imlua_process.def"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>