diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index 71805e3ae..24f3d3408 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -81,7 +81,7 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1024,70 +1288,6 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index 7556fc630..6bdb79581 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -78,7 +78,7 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2221,70 +2477,6 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj b/desmume/src/windows/DeSmuME_2010.vcxproj
index 95613d2e9..a811b58c9 100644
--- a/desmume/src/windows/DeSmuME_2010.vcxproj
+++ b/desmume/src/windows/DeSmuME_2010.vcxproj
@@ -138,7 +138,7 @@
true
- directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;File_Extractor_x86.lib;File_Extractor_x86.lib;%(AdditionalDependencies)
+ directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_debug.exe
.\zlib123;agg;.libs;.libs\win32
lua51.dll
@@ -178,7 +178,7 @@
true
- directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;File_Extractor_x86.lib;File_Extractor_x86.lib;%(AdditionalDependencies)
+ directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_release.exe
.\zlib123;agg;.libs;.libs\win32
lua51.dll
@@ -218,7 +218,7 @@
true
- directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;File_Extractor_x86.lib;File_Extractor_x86.lib;%(AdditionalDependencies)
+ directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_dev+.exe
.\zlib123;agg;.libs;.libs\win32
lua51.dll
@@ -261,7 +261,7 @@
true
- directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;File_Extractor_x64.lib;File_Extractor_x64.lib;%(AdditionalDependencies)
+ directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_x64_debug.exe
.\zlib123;agg;.libs\x64;.libs
wpcap.dll;lua51.dll
@@ -306,7 +306,7 @@
true
- directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;File_Extractor_x64.lib;File_Extractor_x64.lib;%(AdditionalDependencies)
+ directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_x64_release.exe
.\zlib123;agg;.libs\x64;.libs
lua51.dll
@@ -351,7 +351,7 @@
true
- directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;File_Extractor_x64.lib;File_Extractor_x64.lib;%(AdditionalDependencies)
+ directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_x64_dev+.exe
.\zlib123;agg;.libs\x64;.libs
wpcap.dll;lua51.dll
@@ -520,6 +520,99 @@
+
+
+
+
+
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -700,6 +793,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -826,28 +982,15 @@
7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
.libs\wx.tag;%(Outputs)
-
- call un7z_and_touch.bat File_Extractor\File_Extractor.7z .libs\glib*
-
- 7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
- .libs\File_Extractor-vc9.tag;%(Outputs)
- call un7z_and_touch.bat File_Extractor\File_Extractor.7z .libs\glib*
-
- 7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
- .libs\File_Extractor-vc9.tag;%(Outputs)
- call un7z_and_touch.bat File_Extractor\File_Extractor.7z .libs\glib*
-
- 7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
- .libs\File_Extractor-vc9.tag;%(Outputs)
- call un7z_and_touch.bat File_Extractor\File_Extractor.7z .libs\glib*
-
- 7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
- .libs\File_Extractor-vc9.tag;%(Outputs)
- call un7z_and_touch.bat File_Extractor\File_Extractor.7z .libs\glib*
-
- 7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
- .libs\File_Extractor-vc9.tag;%(Outputs)
-
+
+
+
+
+
+
+
+
+
diff --git a/desmume/src/windows/DeSmuME_2010.vcxproj.filters b/desmume/src/windows/DeSmuME_2010.vcxproj.filters
index 69807f3d9..98f79a928 100644
--- a/desmume/src/windows/DeSmuME_2010.vcxproj.filters
+++ b/desmume/src/windows/DeSmuME_2010.vcxproj.filters
@@ -55,6 +55,15 @@
{faa7804e-deb3-482f-b348-921cb7dacca7}
+
+ {d2287daf-de85-4c64-8eef-2198f501904a}
+
+
+ {fddf8c65-a8f4-41ed-ab58-cd268c3a12da}
+
+
+ {24398c49-4650-412e-b46f-4725ad4f5b11}
+
{82c38db3-d06d-44b5-a9a4-be3c002d0db0}
@@ -480,9 +489,204 @@
Core
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex
+
Windows
+
+ Windows\fex\unrar
+
Core\utils\AsmJit\core
@@ -987,6 +1191,195 @@
Core
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex
+
Windows
@@ -1130,6 +1523,33 @@
Core\filter
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\7z
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
+
+ Windows\fex\unrar
+
Core\utils\AsmJit
@@ -1152,8 +1572,5 @@
Windows\libs
-
- Windows\libs
-
\ No newline at end of file
diff --git a/desmume/src/windows/DeSmuME_2012.sln b/desmume/src/windows/DeSmuME_2012.sln
index 6d4852f3d..e435d71c3 100644
--- a/desmume/src/windows/DeSmuME_2012.sln
+++ b/desmume/src/windows/DeSmuME_2012.sln
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DeSmuME_VS2012", "DeSmuME_2012.vcxproj", "{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
EndProject
Global
diff --git a/desmume/src/windows/DeSmuME_2012.vcxproj b/desmume/src/windows/DeSmuME_2012.vcxproj
index 064d39a42..a67a3da1f 100644
--- a/desmume/src/windows/DeSmuME_2012.vcxproj
+++ b/desmume/src/windows/DeSmuME_2012.vcxproj
@@ -27,26 +27,33 @@
- DeSmuME_VS2010
+ DeSmuME_VS2012
{9F5F72A1-D3A5-4918-B460-E076B16D10A9}
DeSmuME
+ v110_xp
false
+ v110_xp
true
-
+
+ v110_xp
+
+ v110_xp
false
- v110
+ v110_xp
true
-
+
+ v110_xp
+
@@ -77,7 +84,7 @@
- <_ProjectFileVersion>10.0.30319.1
+ <_ProjectFileVersion>11.0.50727.1
$(SolutionDir)\__bins\
$(SolutionDir)\.VS2010\$(Configuration)\$(Platform)\
$(SolutionDir)\__bins\
@@ -139,7 +146,7 @@
true
- directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;File_Extractor_x86.lib;File_Extractor_x86.lib;%(AdditionalDependencies)
+ directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_debug.exe
.\zlib123;agg;.libs;.libs\win32
lua51.dll
@@ -148,6 +155,7 @@
false
+ false
DeSmuME_x86.manifest;%(AdditionalManifestFiles)
@@ -179,7 +187,7 @@
true
- directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;File_Extractor_x86.lib;File_Extractor_x86.lib;%(AdditionalDependencies)
+ directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_release.exe
.\zlib123;agg;.libs;.libs\win32
lua51.dll
@@ -188,6 +196,7 @@
false
+ false
DeSmuME_x86.manifest;%(AdditionalManifestFiles)
@@ -219,7 +228,7 @@
true
- directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;File_Extractor_x86.lib;File_Extractor_x86.lib;%(AdditionalDependencies)
+ directx-win32-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;comctl32.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_dev+.exe
.\zlib123;agg;.libs;.libs\win32
lua51.dll
@@ -230,6 +239,7 @@
false
+ false
DeSmuME_x86.manifest;%(AdditionalManifestFiles)
@@ -262,7 +272,7 @@
true
- directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;File_Extractor_x64.lib;File_Extractor_x64.lib;%(AdditionalDependencies)
+ directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_x64_debug.exe
.\zlib123;agg;.libs\x64;.libs
wpcap.dll;lua51.dll
@@ -307,7 +317,7 @@
true
- directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;File_Extractor_x64.lib;File_Extractor_x64.lib;%(AdditionalDependencies)
+ directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_x64_release.exe
.\zlib123;agg;.libs\x64;.libs
lua51.dll
@@ -352,7 +362,7 @@
true
- directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;File_Extractor_x64.lib;File_Extractor_x64.lib;%(AdditionalDependencies)
+ directx-x64-ddraw-dinput8-dsound-dxerr8-dxguid.lib;lua51.lib;glib-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;shell32.lib;comdlg32.lib;shlwapi.lib;%(AdditionalDependencies)
$(OutDir)$(ProjectName)_x64_dev+.exe
.\zlib123;agg;.libs\x64;.libs
wpcap.dll;lua51.dll
@@ -521,6 +531,99 @@
+
+
+
+
+
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+
+ true
+ true
+ true
+ true
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -701,6 +804,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -827,28 +993,15 @@
7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
.libs\wx.tag;%(Outputs)
-
- call un7z_and_touch.bat File_Extractor\File_Extractor.7z .libs\glib*
-
- 7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
- .libs\File_Extractor-vc9.tag;%(Outputs)
- call un7z_and_touch.bat File_Extractor\File_Extractor.7z .libs\glib*
-
- 7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
- .libs\File_Extractor-vc9.tag;%(Outputs)
- call un7z_and_touch.bat File_Extractor\File_Extractor.7z .libs\glib*
-
- 7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
- .libs\File_Extractor-vc9.tag;%(Outputs)
- call un7z_and_touch.bat File_Extractor\File_Extractor.7z .libs\glib*
-
- 7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
- .libs\File_Extractor-vc9.tag;%(Outputs)
- call un7z_and_touch.bat File_Extractor\File_Extractor.7z .libs\glib*
-
- 7z.exe;un7z_and_touch.bat;%(AdditionalInputs)
- .libs\File_Extractor-vc9.tag;%(Outputs)
-
+
+
+
+
+
+
+
+
+
diff --git a/desmume/src/windows/DeSmuME_2012.vcxproj.filters b/desmume/src/windows/DeSmuME_2012.vcxproj.filters
index 69807f3d9..46b7ee184 100644
--- a/desmume/src/windows/DeSmuME_2012.vcxproj.filters
+++ b/desmume/src/windows/DeSmuME_2012.vcxproj.filters
@@ -2,64 +2,73 @@
- {34192339-8456-4aa2-b100-d721ff246431}
+ {7c82633b-ee33-4cd0-b47d-487a417edeab}
- {1761f316-4c22-4742-8f37-77ea008d2623}
+ {8aa1dcea-23d0-456b-9be5-8338072c77cf}
- {cfb7bfbc-4470-4691-a3c2-b86c388e6a52}
+ {e6128d2d-eb64-460b-8bb2-4ee12e38466e}
- {1b0f72b3-27d4-4d86-b253-eda5a3ebab7b}
+ {abcc1413-bf8e-4d2e-9bc7-332ac9269fde}
- {80fa193a-2814-401d-8a51-47c8d876eb8b}
-
-
- {53ec9c3c-7653-46ff-83a8-9590482bcf8b}
-
-
- {a6e751df-3c94-41c0-96a1-5ca50d92b221}
-
-
- {e51fc8a7-4240-4b5c-8c2a-86c30fef95c9}
-
-
- {358afabc-ec55-4449-b901-ea3e999a26d8}
-
-
- {56813aa6-2261-4011-8938-105c0b4b3773}
-
-
- {78bb8fa0-5d56-4cf5-94b3-b020f4f4c290}
-
-
- {947281ba-49a1-4379-ab51-078980176832}
-
-
- {e95a5ba4-9d37-4a40-928f-6ee2d8a3a13f}
-
-
- {42b6ff9b-c9ff-4006-b2f7-f3e3268b8c31}
+ {d4f8903c-7f78-4416-883c-42ad17e5cb25}
- {c751e37c-54da-44e2-9be8-0399cb02467a}
+ {b7dff57f-b8e1-4d98-a6c5-3031e0763b76}
- {6d47beab-6087-48e1-953d-f5da134a023a}
-
-
- {0c7156df-b4ef-4cd2-af76-6a6c1e66145a}
+ {2b7b810e-c016-4e26-84b2-c36829d93f87}
- {faa7804e-deb3-482f-b348-921cb7dacca7}
+ {e7a10a39-f561-4884-b884-f2282fbf8905}
- {82c38db3-d06d-44b5-a9a4-be3c002d0db0}
+ {8051838e-4194-425a-b471-880788a7fb18}
- {0d620905-0dcf-47a4-bac2-91f307aa9994}
+ {d23031b8-70eb-4035-89ad-cba21cc6b570}
+
+
+ {485cef5d-6bf9-434c-81ee-b8c3d188e2e0}
+
+
+ {19289bbe-161a-4431-931b-ac9fa1ab6fde}
+
+
+ {46c55ff6-0bd2-4715-ba89-aead8b466220}
+
+
+ {d089f491-2c1b-4006-9f3d-d23ab756613f}
+
+
+ {841d24f1-7f40-48a3-bde6-d546d7903ade}
+
+
+ {798a6649-7ea2-4dde-a8bc-9e36cf4a4975}
+
+
+ {ec682647-9bb7-4315-99a4-4f9398db61ad}
+
+
+ {321e6567-acbd-4dc4-a5c6-6cd8fe445d53}
+
+
+ {4c97f223-843f-4975-b774-4d0c887cfd37}
+
+
+ {4d7483df-e22e-4e77-9ae8-8446c04d335d}
+
+
+ {04ea2049-7954-4d44-a631-6562f02e467e}
+
+
+ {40f6aa8b-2cce-48bf-b89d-0cad473f16e2}
+
+
+ {191da306-49b9-43b4-a4d9-d91dd3a18db8}
@@ -72,6 +81,9 @@
Core
+
+ Core
+
Core
@@ -141,6 +153,9 @@
Core
+
+ Core
+
Core
@@ -177,6 +192,18 @@
Core
+
+ Core\addons
+
+
+ Core\addons
+
+
+ Core\addons
+
+
+ Core\addons
+
Core\addons
@@ -186,9 +213,18 @@
Core\addons
+
+ Core\addons
+
Core\addons
+
+ Core\addons
+
+
+ Core\addons
+
Core\addons
@@ -198,6 +234,15 @@
Core\utils
+
+ Core\utils
+
+
+ Core\utils
+
+
+ Core\utils
+
Core\utils
@@ -207,6 +252,9 @@
Core\utils
+
+ Core\utils
+
Core\utils
@@ -219,183 +267,6 @@
Core\utils\decrypt
-
- Core\metaspu
-
-
- Core\metaspu
-
-
- Core\metaspu
-
-
- Core\metaspu\win32
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\wxdlg
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Core\addons
-
-
- Core\utils
-
-
- Core\addons
-
-
- Core\addons
-
-
- Core\addons
-
-
- Core\addons
-
-
- Core\utils
-
-
- Core\utils\libfat
-
Core\utils\libfat
@@ -426,20 +297,8 @@
Core\utils\libfat
-
- Core
-
-
- Core\addons
-
-
- Core\utils
-
-
- Core\utils
-
-
- Core\addons
+
+ Core\utils\libfat
Core\utils\tinyxml
@@ -453,36 +312,6 @@
Core\utils\tinyxml
-
- Core\filter
-
-
- Core\filter
-
-
- Core\filter
-
-
- Core\filter
-
-
- Core\filter
-
-
- Core\filter
-
-
- Core\filter
-
-
- Windows
-
-
- Core
-
-
- Windows
-
Core\utils\AsmJit\core
@@ -570,6 +399,369 @@
Core\utils\AsmJit\x86
+
+ Core\metaspu
+
+
+ Core\metaspu
+
+
+ Core\metaspu
+
+
+ Core\metaspu\win32
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\wxdlg
+
+
+ Core\filter
+
+
+ Core\filter
+
+
+ Core\filter
+
+
+ Core\filter
+
+
+ Core\filter
+
+
+ Core\filter
+
+
+ Core\filter
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\7-Zip
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\File_Extractor\unrar
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
Core
@@ -581,6 +773,9 @@
Core
+
+ Core
+
Core
@@ -635,6 +830,12 @@
Core
+
+ Core
+
+
+ Core
+
Core
@@ -719,6 +920,12 @@
Core\utils
+
+ Core\utils
+
+
+ Core\utils
+
Core\utils
@@ -731,6 +938,9 @@
Core\utils
+
+ Core\utils
+
Core\utils\decrypt
@@ -740,166 +950,6 @@
Core\utils\decrypt
-
- Core\metaspu
-
-
- Core\metaspu
-
-
- Core\metaspu\win32
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\metaspu\SoundTouch
-
-
- Core\wxdlg
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows
-
-
- Windows\userconfig
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
- Windows\tools
-
-
-
-
-
-
- Core\utils
-
-
- Core\utils\libfat
-
Core\utils\libfat
@@ -945,14 +995,8 @@
Core\utils\libfat
-
- Core\utils
-
-
- Core\utils
-
-
- Core\utils
+
+ Core\utils\libfat
Core\utils\tinyxml
@@ -960,36 +1004,6 @@
Core\utils\tinyxml
-
- Core\filter
-
-
- Core\filter
-
-
- Core\filter
-
-
- Core\filter
-
-
- Core\filter
-
-
- Windows
-
-
- Core
-
-
- Core
-
-
- Core
-
-
- Windows
-
Core\utils\AsmJit
@@ -1107,6 +1121,174 @@
Core\utils\AsmJit\x86
+
+ Core\metaspu
+
+
+ Core\metaspu
+
+
+ Core\metaspu\win32
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\metaspu\SoundTouch
+
+
+ Core\wxdlg
+
+
+ Core\filter
+
+
+ Core\filter
+
+
+ Core\filter
+
+
+ Core\filter
+
+
+ Core\filter
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows
+
+
+ Windows\userconfig
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
+
+ Windows\tools
+
Core
@@ -1121,18 +1303,30 @@
Core
-
- Windows\resources
-
-
- Windows\resources
-
Core\filter
-
+
+
+
Core\utils\AsmJit
-
+
+
+
+
+ Windows\resources
+
+
+ Windows\resources
+
+
+
+
+
+
+
+
+
@@ -1146,14 +1340,14 @@
Windows\libs
+
+ Windows\libs
+
Windows\libs
Windows\libs
-
- Windows\libs
-
\ No newline at end of file
diff --git a/desmume/src/windows/File_Extractor/File_Extractor.7z b/desmume/src/windows/File_Extractor/File_Extractor.7z
deleted file mode 100644
index d3c33d56a..000000000
Binary files a/desmume/src/windows/File_Extractor/File_Extractor.7z and /dev/null differ
diff --git a/desmume/src/windows/File_Extractor/File_Extractor.sln b/desmume/src/windows/File_Extractor/File_Extractor.sln
deleted file mode 100644
index 28e7b8a9a..000000000
--- a/desmume/src/windows/File_Extractor/File_Extractor.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "File_Extractor.vcproj", "{50B8E904-93DB-4571-8AE2-42DE3AA3813A}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {50B8E904-93DB-4571-8AE2-42DE3AA3813A}.Debug|Win32.ActiveCfg = Debug|Win32
- {50B8E904-93DB-4571-8AE2-42DE3AA3813A}.Debug|Win32.Build.0 = Debug|Win32
- {50B8E904-93DB-4571-8AE2-42DE3AA3813A}.Debug|x64.ActiveCfg = Debug|x64
- {50B8E904-93DB-4571-8AE2-42DE3AA3813A}.Debug|x64.Build.0 = Debug|x64
- {50B8E904-93DB-4571-8AE2-42DE3AA3813A}.Release|Win32.ActiveCfg = Release|Win32
- {50B8E904-93DB-4571-8AE2-42DE3AA3813A}.Release|Win32.Build.0 = Release|Win32
- {50B8E904-93DB-4571-8AE2-42DE3AA3813A}.Release|x64.ActiveCfg = Release|x64
- {50B8E904-93DB-4571-8AE2-42DE3AA3813A}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/desmume/src/windows/File_Extractor/File_Extractor.vcproj b/desmume/src/windows/File_Extractor/File_Extractor.vcproj
deleted file mode 100644
index 3a35c64bf..000000000
--- a/desmume/src/windows/File_Extractor/File_Extractor.vcproj
+++ /dev/null
@@ -1,832 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-