From 7f8f86905ac5262c536b669319058bcb0b2afccd Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Tue, 28 Aug 2012 23:33:37 +0000
Subject: [PATCH] fix link errors with CRC stuff - crc.cpp from utils/decrypt
 was overwriting crc.obj from FEX; changed so that crc.cpp from utils/decrypt
 builds to a different dir

---
 desmume/src/windows/DeSmuME_2005.vcproj       | 536 +++++++++---------
 desmume/src/windows/DeSmuME_2008.vcproj       | 490 ++++++++--------
 desmume/src/windows/DeSmuME_2010.vcxproj      |   7 +-
 .../src/windows/DeSmuME_2010.vcxproj.filters  |   3 -
 4 files changed, 543 insertions(+), 493 deletions(-)

diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index 9308b3e81..869810c08 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -621,262 +621,6 @@
 		<Filter
 			Name="windows"
 			>
-			<Filter
-				Name="File_Extractor"
-				>
-				<Filter
-					Name="7-Zip"
-					>
-					<File
-						RelativePath=".\File_Extractor\7z_C\7zAlloc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\7zBuf.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\7zBuf2.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\7zCrc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\7zCrcOpt.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\7zDec.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\7zFile.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\7zIn.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\7zStream.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Alloc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Bcj2.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Bra.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Bra86.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\BraIA64.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\CpuArch.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Delta.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\LzFind.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\LzFindMt.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Lzma2Dec.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Lzma2Enc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Lzma86Dec.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Lzma86Enc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\LzmaDec.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\LzmaEnc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\LzmaLib.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\MtCoder.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Ppmd7.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Ppmd7Dec.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Ppmd7Enc.c"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\7z_C\Threads.c"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="unrar"
-					>
-					<File
-						RelativePath=".\File_Extractor\unrar\archive.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\arcread.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\coder.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\crc.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\encname.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\extract.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\getbits.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\model.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\rarvm.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\rarvmtbl.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\rawread.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\suballoc.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\unicode.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\unpack.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\unpack15.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\unpack20.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\unrar.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\unrar_misc.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\File_Extractor\unrar\unrar_open.cpp"
-						>
-					</File>
-				</Filter>
-				<File
-					RelativePath=".\File_Extractor\fex\Binary_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\blargg_common.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\blargg_errors.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Data_Reader.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\fex.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\File_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Gzip_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Gzip_Reader.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Rar_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Zip7_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Zip_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Zlib_Inflater.cpp"
-					>
-				</File>
-			</Filter>
 			<File
 				RelativePath=".\AboutBox.cpp"
 				>
@@ -1193,6 +937,262 @@
 				RelativePath=".\winutil.h"
 				>
 			</File>
+			<Filter
+				Name="File_Extractor"
+				>
+				<File
+					RelativePath=".\File_Extractor\fex\Binary_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\blargg_common.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\blargg_errors.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Data_Reader.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\fex.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\File_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Gzip_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Gzip_Reader.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Rar_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Zip7_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Zip_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Zlib_Inflater.cpp"
+					>
+				</File>
+				<Filter
+					Name="7-Zip"
+					>
+					<File
+						RelativePath=".\File_Extractor\7z_C\7zAlloc.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\7zBuf.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\7zBuf2.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\7zCrc.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\7zCrcOpt.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\7zDec.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\7zFile.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\7zIn.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\7zStream.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Alloc.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Bcj2.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Bra.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Bra86.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\BraIA64.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\CpuArch.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Delta.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\LzFind.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\LzFindMt.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Lzma2Dec.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Lzma2Enc.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Lzma86Dec.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Lzma86Enc.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\LzmaDec.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\LzmaEnc.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\LzmaLib.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\MtCoder.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Ppmd7.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Ppmd7Dec.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Ppmd7Enc.c"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\7z_C\Threads.c"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="unrar"
+					>
+					<File
+						RelativePath=".\File_Extractor\unrar\archive.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\arcread.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\coder.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\crc.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\encname.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\extract.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\getbits.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\model.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\rarvm.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\rarvmtbl.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\rawread.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\suballoc.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\unicode.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\unpack.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\unpack15.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\unpack20.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\unrar.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\unrar_misc.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\File_Extractor\unrar\unrar_open.cpp"
+						>
+					</File>
+				</Filter>
+			</Filter>
 			<Filter
 				Name="userconfig"
 				>
@@ -1611,6 +1611,30 @@
 				<File
 					RelativePath="..\utils\decrypt\crc.cpp"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\decrypt\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\decrypt\"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release FastBuild|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							ObjectFile="$(IntDir)\decrypt\"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\utils\decrypt\crc.h"
diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index 641952559..3f414d52f 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="DeSmuME_VS2008"
 	ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
 	RootNamespace="DeSmuME"
@@ -1123,6 +1123,30 @@
 					<File
 						RelativePath="..\utils\decrypt\crc.cpp"
 						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\decrypt\"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\decrypt\"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Dev+|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\decrypt\"
+							/>
+						</FileConfiguration>
 					</File>
 					<File
 						RelativePath="..\utils\decrypt\crc.h"
@@ -1634,9 +1658,241 @@
 		<Filter
 			Name="Windows"
 			>
+			<File
+				RelativePath=".\AboutBox.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\AboutBox.h"
+				>
+			</File>
+			<File
+				RelativePath=".\aviout.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\aviout.h"
+				>
+			</File>
+			<File
+				RelativePath=".\cheatsWin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\cheatsWin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\colorctrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\colorctrl.h"
+				>
+			</File>
+			<File
+				RelativePath=".\console.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\console.h"
+				>
+			</File>
+			<File
+				RelativePath=".\CWindow.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\CWindow.h"
+				>
+			</File>
+			<File
+				RelativePath=".\FEX_Interface.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\FirmConfig.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\FirmConfig.h"
+				>
+			</File>
+			<File
+				RelativePath=".\gbaslot_config.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\gbaslot_config.h"
+				>
+			</File>
+			<File
+				RelativePath=".\hotkey.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\hotkey.h"
+				>
+			</File>
+			<File
+				RelativePath=".\importSave.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\importSave.h"
+				>
+			</File>
+			<File
+				RelativePath=".\inputdx.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\inputdx.h"
+				>
+			</File>
+			<File
+				RelativePath=".\luaconsole.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\main.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\main.h"
+				>
+			</File>
+			<File
+				RelativePath=".\mic.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ogl.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\OpenArchive.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\OpenArchive.h"
+				>
+			</File>
+			<File
+				RelativePath=".\pathsettings.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\pathsettings.h"
+				>
+			</File>
+			<File
+				RelativePath=".\recentroms.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\recentroms.h"
+				>
+			</File>
+			<File
+				RelativePath=".\replay.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\replay.h"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\slot1_config.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\slot1_config.h"
+				>
+			</File>
+			<File
+				RelativePath=".\snddx.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\snddx.h"
+				>
+			</File>
+			<File
+				RelativePath=".\throttle.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\throttle.h"
+				>
+			</File>
+			<File
+				RelativePath=".\winpcap.h"
+				>
+			</File>
+			<File
+				RelativePath=".\winutil.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\winutil.h"
+				>
+			</File>
 			<Filter
 				Name="File_Extractor"
 				>
+				<File
+					RelativePath=".\File_Extractor\fex\Binary_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\blargg_common.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\blargg_errors.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Data_Reader.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\fex.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\File_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Gzip_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Gzip_Reader.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Rar_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Zip7_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Zip_Extractor.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\File_Extractor\fex\Zlib_Inflater.cpp"
+					>
+				</File>
 				<Filter
 					Name="7-Zip"
 					>
@@ -1841,239 +2097,7 @@
 						>
 					</File>
 				</Filter>
-				<File
-					RelativePath=".\File_Extractor\fex\Binary_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\blargg_common.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\blargg_errors.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Data_Reader.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\fex.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\File_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Gzip_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Gzip_Reader.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Rar_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Zip7_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Zip_Extractor.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\File_Extractor\fex\Zlib_Inflater.cpp"
-					>
-				</File>
 			</Filter>
-			<File
-				RelativePath=".\AboutBox.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\AboutBox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\aviout.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\aviout.h"
-				>
-			</File>
-			<File
-				RelativePath=".\cheatsWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\cheatsWin.h"
-				>
-			</File>
-			<File
-				RelativePath=".\colorctrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\colorctrl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\console.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\console.h"
-				>
-			</File>
-			<File
-				RelativePath=".\CWindow.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\CWindow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\FirmConfig.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\FEX_Interface.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\FirmConfig.h"
-				>
-			</File>
-			<File
-				RelativePath=".\gbaslot_config.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\gbaslot_config.h"
-				>
-			</File>
-			<File
-				RelativePath=".\hotkey.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\hotkey.h"
-				>
-			</File>
-			<File
-				RelativePath=".\importSave.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\importSave.h"
-				>
-			</File>
-			<File
-				RelativePath=".\inputdx.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\inputdx.h"
-				>
-			</File>
-			<File
-				RelativePath=".\luaconsole.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\main.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mic.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ogl.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpenArchive.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OpenArchive.h"
-				>
-			</File>
-			<File
-				RelativePath=".\pathsettings.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\pathsettings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\recentroms.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\recentroms.h"
-				>
-			</File>
-			<File
-				RelativePath=".\replay.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\replay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\slot1_config.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\slot1_config.h"
-				>
-			</File>
-			<File
-				RelativePath=".\snddx.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\snddx.h"
-				>
-			</File>
-			<File
-				RelativePath=".\throttle.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\throttle.h"
-				>
-			</File>
-			<File
-				RelativePath=".\winpcap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\winutil.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\winutil.h"
-				>
-			</File>
 			<Filter
 				Name="userconfig"
 				>
diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj b/desmume/src/windows/DeSmuME_2010.vcxproj
index 7a915ca4e..944f22ad4 100644
--- a/desmume/src/windows/DeSmuME_2010.vcxproj
+++ b/desmume/src/windows/DeSmuME_2010.vcxproj
@@ -533,7 +533,12 @@
     <ClCompile Include="..\utils\md5.cpp" />
     <ClCompile Include="..\utils\task.cpp" />
     <ClCompile Include="..\utils\xstring.cpp" />
-    <ClCompile Include="..\utils\decrypt\crc.cpp" />
+    <ClCompile Include="..\utils\decrypt\crc.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)\decrypt\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Dev+|Win32'">$(IntDir)\decrypt\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)\decrypt\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(IntDir)\decrypt\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\utils\decrypt\decrypt.cpp" />
     <ClCompile Include="..\utils\decrypt\header.cpp" />
     <ClCompile Include="..\metaspu\metaspu.cpp" />
diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj.filters b/desmume/src/windows/DeSmuME_2010.vcxproj.filters
index 2d4ab4582..d2398965a 100644
--- a/desmume/src/windows/DeSmuME_2010.vcxproj.filters
+++ b/desmume/src/windows/DeSmuME_2010.vcxproj.filters
@@ -929,9 +929,6 @@
     <ClInclude Include="..\wxdlg\wxdlg3dViewer.h">
       <Filter>Core\wxdlg</Filter>
     </ClInclude>
-    <ClInclude Include="7zipstreams.h">
-      <Filter>Windows</Filter>
-    </ClInclude>
     <ClInclude Include="AboutBox.h">
       <Filter>Windows</Filter>
     </ClInclude>