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