diff --git a/desmume/src/windows/7z.exe b/desmume/src/windows/7z.exe
new file mode 100644
index 000000000..789d08922
Binary files /dev/null and b/desmume/src/windows/7z.exe differ
diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index 9cfc96561..5a18fe742 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -78,9 +78,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua-vc8-Win32-debug.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib"
+				AdditionalDependencies="glib-vc8-Win32.lib lua-vc8-Win32-debug.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -173,7 +173,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib lua-5.1.4-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\x64\dxguid.lib shell32.lib comdlg32.lib directx\x64\dxerr8.lib directx\x64\dsound.lib directx\x64\dinput8.lib directx\x64\ddraw.lib shlwapi.lib winpcap\x64\wpcap.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_x64_debug.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -271,7 +271,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_release.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -370,7 +370,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib lua-5.1.4-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\x64\dxguid.lib shell32.lib comdlg32.lib directx\x64\dxerr8.lib directx\x64\dsound.lib directx\x64\dinput8.lib directx\x64\ddraw.lib shlwapi.lib winpcap\x64\wpcap.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_x64_release.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -470,7 +470,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_releaseFastBuild.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -572,7 +572,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib lua-5.1.4-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\x64\dxguid.lib shell32.lib comdlg32.lib directx\x64\dxerr8.lib directx\x64\dsound.lib directx\x64\dinput8.lib directx\x64\ddraw.lib shlwapi.lib winpcap\x64\wpcap.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_x64_releaseFastBuild.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -943,6 +943,74 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="libs"
+				>
+				<File
+					RelativePath=".\glib-2.20.1\glib-2.20.1.7z"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release FastBuild|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release FastBuild|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="utils"
diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index 5ca6f941e..2cff86889 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -79,7 +79,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua-vc8-Win32-debug.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -168,7 +168,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\x64\dxguid.lib shell32.lib comdlg32.lib directx\x64\dxerr8.lib directx\x64\dsound.lib directx\x64\dinput8.lib directx\x64\ddraw.lib shlwapi.lib winpcap\x64\wpcap.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_x64_debug.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -261,7 +261,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_release.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
@@ -355,7 +355,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\x64\dxguid.lib shell32.lib comdlg32.lib directx\x64\dxerr8.lib directx\x64\dsound.lib directx\x64\dinput8.lib directx\x64\ddraw.lib shlwapi.lib winpcap\x64\wpcap.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_x64_release.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
@@ -424,7 +424,7 @@
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories=".;..;&quot;lua\include&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;GLIB_STATIC_COMPILATION;WIN32;HAVE_LIBZ;NOMINMAX;RELEASE;NDEBUG;FASTBUILD"
 				StringPooling="true"
 				ExceptionHandling="1"
 				StructMemberAlignment="0"
@@ -449,7 +449,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_releaseFastBuild.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
@@ -544,7 +544,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua-vc8-x64.lib glib-vc8-x64.lib 7z-vc8-x64.lib zlib-vc8-x64.lib agg-2.5-x64.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\x64\dxguid.lib shell32.lib comdlg32.lib directx\x64\dxerr8.lib directx\x64\dsound.lib directx\x64\dinput8.lib directx\x64\ddraw.lib shlwapi.lib winpcap\x64\wpcap.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_x64_releaseFastBuild.exe"
-				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
+				AdditionalLibraryDirectories=".\zlib123;.\lua;.\7z;agg;.libs"
 				DelayLoadDLLs="wpcap.dll"
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
@@ -1532,6 +1532,74 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="libs"
+				>
+				<File
+					RelativePath=".\glib-2.20.1\glib-2.20.1.7z"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release FastBuild|Win32"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release FastBuild|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							CommandLine="un7z_and_touch.bat glib-2.20.1\glib-2.20.1.7z .libs\glib*"
+							AdditionalDependencies="unrar.exe;unrar_and_touch.bat;7z.exe;un7z_and_touch.bat"
+							Outputs=".libs\glib-vc8.tag"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/desmume/src/windows/glib-2.20.1/glib-2.20.1.7z b/desmume/src/windows/glib-2.20.1/glib-2.20.1.7z
new file mode 100644
index 000000000..4e429003b
Binary files /dev/null and b/desmume/src/windows/glib-2.20.1/glib-2.20.1.7z differ
diff --git a/desmume/src/windows/glib-2.20.1/glib-vc8-Win32.lib b/desmume/src/windows/glib-2.20.1/glib-vc8-Win32.lib
deleted file mode 100644
index 51acf2ec3..000000000
Binary files a/desmume/src/windows/glib-2.20.1/glib-vc8-Win32.lib and /dev/null differ
diff --git a/desmume/src/windows/glib-2.20.1/glib-vc8-x64.lib b/desmume/src/windows/glib-2.20.1/glib-vc8-x64.lib
deleted file mode 100644
index 6ca5d54cf..000000000
Binary files a/desmume/src/windows/glib-2.20.1/glib-vc8-x64.lib and /dev/null differ
diff --git a/desmume/src/windows/touch.exe b/desmume/src/windows/touch.exe
new file mode 100644
index 000000000..0666a1f62
Binary files /dev/null and b/desmume/src/windows/touch.exe differ
diff --git a/desmume/src/windows/un7z_and_touch.bat b/desmume/src/windows/un7z_and_touch.bat
new file mode 100644
index 000000000..11920212d
--- /dev/null
+++ b/desmume/src/windows/un7z_and_touch.bat
@@ -0,0 +1,2 @@
+7z x -bd -y -o.libs %1
+touch %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file