diff --git a/fex/File_Extractor2008.vcproj b/fex/File_Extractor2008.vcproj
deleted file mode 100644
index b981776e..00000000
--- a/fex/File_Extractor2008.vcproj
+++ /dev/null
@@ -1,395 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fex/File_Extractor2010.vcxproj b/fex/File_Extractor2010.vcxproj
index a6b30b46..bf81ccce 100644
--- a/fex/File_Extractor2010.vcxproj
+++ b/fex/File_Extractor2010.vcxproj
@@ -42,6 +42,14 @@
+
+ $(SolutionDir)$(Platform)\$(Configuration)\Build\
+ $(ProjectDir)$(Platform)\$(Configuration)\$(ProjectFileName)\
+
+
+ $(SolutionDir)$(Platform)\$(Configuration)\Build\
+ $(ProjectDir)$(Platform)\$(Configuration)\$(ProjectFileName)\
+
diff --git a/fex/File_Extractor2013.vcxproj b/fex/File_Extractor2013.vcxproj
index c46706c4..dec95369 100644
--- a/fex/File_Extractor2013.vcxproj
+++ b/fex/File_Extractor2013.vcxproj
@@ -44,6 +44,14 @@
+
+ $(SolutionDir)$(Platform)\$(Configuration)\Build\
+ $(ProjectDir)$(Platform)\$(Configuration)\$(ProjectFileName)\
+
+
+ $(SolutionDir)$(Platform)\$(Configuration)\Build\
+ $(ProjectDir)$(Platform)\$(Configuration)\$(ProjectFileName)\
+
diff --git a/project/vs2010_mfc/VBA-M-MFC.vcxproj b/project/vs2010_mfc/VBA-M-MFC.vcxproj
new file mode 100644
index 00000000..b46d2b17
--- /dev/null
+++ b/project/vs2010_mfc/VBA-M-MFC.vcxproj
@@ -0,0 +1,587 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ VisualBoyAdvance-M
+ {B16AEF99-BFAB-4F85-BFE0-732524926C60}
+ VBA
+ MFCProj
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+ AllRules.ruleset
+
+
+ AllRules.ruleset
+
+
+ %programfiles%\OpenAL 1.1 SDK\libs\Win32;$(DXSDK_DIR)\lib\x86;$(LibraryPath)
+ %programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
+ %programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
+ %programfiles%\OpenAL 1.1 SDK\libs\Win32;$(DXSDK_DIR)\lib\x86;$(LibraryPath)
+ $(ProjectDir)$(Platform)\$(Configuration)\Binary\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\
+ $(ProjectDir)$(Platform)\$(Configuration)\Binary\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\
+
+
+
+
+ "..\..\..\dependencies\SubWCRev\SubWCRev.bat"
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ false
+
+
+ Disabled
+ ..\..\src;..\..\fex;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)
+ NO_OAL;WIN32;_WINDOWS;_DEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)
+ false
+ true
+ EnableFastChecks
+ false
+ MultiThreadedDebug
+ false
+ NotSet
+
+
+ Level3
+ EditAndContinue
+ true
+
+
+
+
+
+ Windows
+ false
+ false
+
+
+ nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies)
+ nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)
+ false
+ true
+ $(OutDir)$(TargetName)$(TargetExt)
+ $(IntDir)$(TargetName).pdb
+ $(IntDir)$(TargetName).pgd
+
+
+ $(IntDir)$(ProjectName)_BuildLog.htm
+
+
+
+
+
+
+ "..\..\..\dependencies\SubWCRev\SubWCRev.bat"
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ false
+
+
+ AnySuitable
+ Speed
+ ..\..\src;..\..\fex;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)
+ NO_OAL;WIN32;_WINDOWS;NDEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)
+ MultiThreaded
+ StreamingSIMDExtensions
+ Fast
+
+
+ true
+ true
+ true
+ true
+ Level3
+ true
+ true
+
+
+
+ nafxcw.lib;libcmt.lib;%(AdditionalDependencies)
+
+
+ Windows
+ true
+ true
+
+
+ false
+ nafxcw.lib;libcmt.lib;
+ $(OutDir)$(TargetName)$(TargetExt)
+ $(IntDir)$(TargetName).pdb
+ $(IntDir)$(TargetName).pgd
+
+
+ 1
+
+
+
+ $(IntDir)$(ProjectName)_BuildLog.htm
+
+
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CompileAsC
+ CompileAsC
+
+
+
+
+
+
+ Create
+ Create
+
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+
+
+ __DJGPP__
+ true
+ 1
+ __DJGPP__
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+
+
+ {6d4c5ec8-933f-4c05-a1bf-498e658576df}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/vs2010_mfc/VBA-M-MFC.vcxproj.filters b/project/vs2010_mfc/VBA-M-MFC.vcxproj.filters
new file mode 100644
index 00000000..f8dc21a7
--- /dev/null
+++ b/project/vs2010_mfc/VBA-M-MFC.vcxproj.filters
@@ -0,0 +1,556 @@
+
+
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx
+
+
+ {6a743a87-48d3-4e7a-ab79-7fb51e1ce173}
+
+
+ {b20dd5ab-a733-4ee9-a294-13ce221a09ba}
+
+
+ {443f5282-9e21-46cb-b187-746986699f99}
+
+
+ {5ab58341-15e1-499c-9fee-7695e1a98161}
+
+
+ {6ed60031-33a3-41aa-88e4-dc543b658179}
+
+
+ {8b031169-88b8-4924-a1ee-ff59ff441b42}
+
+
+ {ddc4ba22-6aa2-4862-9c26-25d43a7ccdb7}
+
+
+ {6a6d7a7e-ba3c-4ae8-86ed-189be12fb532}
+
+
+
+
+ Resource
+
+
+ Pixel Filter
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ Main
+
+
+ Main
+
+
+ Main
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ Pixel Filter\xBRZ
+
+
+ Pixel Filter\xBRZ
+
+
+ MFC
+
+
+ Main
+
+
+
+
+ Resource
+
+
+ Resource
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+
+
+ Resource
+
+
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\xBRZ
+
+
+ Pixel Filter\xBRZ
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ Main
+
+
+ Main
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC
+
+
+
+
+ Pixel Filter
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+
\ No newline at end of file
diff --git a/project/vs2010_mfc/VBA-M-SDL.vcxproj b/project/vs2010_mfc/VBA-M-SDL.vcxproj
new file mode 100644
index 00000000..f6dbd8df
--- /dev/null
+++ b/project/vs2010_mfc/VBA-M-SDL.vcxproj
@@ -0,0 +1,253 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ VisualBoyAdvance-M-SDL
+ {E269FC02-8378-49CB-91F2-A092ACDD0123}
+ VBA
+ MFCProj
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+ AllRules.ruleset
+
+
+ AllRules.ruleset
+
+
+ %programfiles%\OpenAL 1.1 SDK\libs\Win32;$(DXSDK_DIR)\lib\x86;$(LibraryPath)
+ %programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
+ %programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
+ %programfiles%\OpenAL 1.1 SDK\libs\Win32;$(DXSDK_DIR)\lib\x86;$(LibraryPath)
+ $(ProjectDir)$(Platform)\$(Configuration)\Binary\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\
+ $(ProjectDir)$(Platform)\$(Configuration)\Binary\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\
+
+
+
+
+ "..\..\..\dependencies\SubWCRev\SubWCRev.bat"
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ false
+
+
+ Disabled
+ ..\..\src;..\..\fex;..\..\..\dependencies\sdl\include;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)
+ WIN32;_WINDOWS;_DEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)
+ false
+ true
+ EnableFastChecks
+ false
+ MultiThreadedDebug
+ false
+ NotSet
+
+
+ Level3
+ EditAndContinue
+ true
+
+
+
+
+
+ Console
+ false
+ false
+
+
+ libcmtd.lib;%(AdditionalDependencies)
+ libcmtd.lib;%(IgnoreSpecificDefaultLibraries)
+ false
+ true
+ $(OutDir)$(TargetName)$(TargetExt)
+ $(IntDir)$(TargetName).pgd
+
+
+ $(IntDir)$(ProjectName)_BuildLog.htm
+
+
+
+
+
+ "..\..\..\dependencies\SubWCRev\SubWCRev.bat"
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ false
+
+
+ AnySuitable
+ Speed
+ ..\..\src;..\..\fex;..\..\..\dependencies\sdl\include;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)
+ NO_OAL;WIN32;_WINDOWS;NDEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)
+ StreamingSIMDExtensions
+ Fast
+
+
+ true
+ true
+ true
+ true
+ Level3
+ true
+ true
+ MultiThreaded
+
+
+
+
+
+ libcmt.lib;%(IgnoreSpecificDefaultLibraries)
+ Console
+ true
+ true
+
+
+ false
+ $(OutDir)$(TargetName)$(TargetExt)
+ $(IntDir)$(TargetName).pdb
+ %(AdditionalDependencies)
+
+
+ 1
+
+
+
+ $(IntDir)$(ProjectName)_BuildLog.htm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ __DJGPP__
+ true
+ 1
+ __DJGPP__
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+
+
+ {da956fd3-e142-46f2-9dd5-c78bebb56b7a}
+
+
+ {81ce8daf-ebb2-4761-8e45-b71abcca8c68}
+
+
+ {6d4c5ec8-933f-4c05-a1bf-498e658576df}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/vs2010_mfc/VBA-M-SDL.vcxproj.filters b/project/vs2010_mfc/VBA-M-SDL.vcxproj.filters
new file mode 100644
index 00000000..6bd3725c
--- /dev/null
+++ b/project/vs2010_mfc/VBA-M-SDL.vcxproj.filters
@@ -0,0 +1,133 @@
+
+
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx
+
+
+ {6a743a87-48d3-4e7a-ab79-7fb51e1ce173}
+
+
+ {b20dd5ab-a733-4ee9-a294-13ce221a09ba}
+
+
+ {443f5282-9e21-46cb-b187-746986699f99}
+
+
+ {5ab58341-15e1-499c-9fee-7695e1a98161}
+
+
+ {8b031169-88b8-4924-a1ee-ff59ff441b42}
+
+
+
+
+ Resource
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\xBRZ
+
+
+ Pixel Filter\xBRZ
+
+
+ Main
+
+
+
+
+ Resource
+
+
+ Resource
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+
+
+ Resource
+
+
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\xBRZ
+
+
+ Pixel Filter\xBRZ
+
+
+ Main
+
+
+ Main
+
+
+ Main
+
+
+ Main
+
+
+ Main
+
+
+ Main
+
+
+
+
+ Pixel Filter
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+
\ No newline at end of file
diff --git a/project/vs2010_mfc/VBA2010.sln b/project/vs2010_mfc/VBA2010.sln
index 59df2772..4d187124 100644
--- a/project/vs2010_mfc/VBA2010.sln
+++ b/project/vs2010_mfc/VBA2010.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{8B814174-883E-43D0-969E-3A17D8EDE080}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance-M", "VBA2010.vcxproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VBA-M", "VBA2010.vcxproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\dependencies\zlib\project\vs2010\zlib.vcxproj", "{3E03C179-8251-46E4-81F4-466F114BAC63}"
EndProject
@@ -12,6 +12,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\..\dependen
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\..\fex\File_Extractor2010.vcxproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "..\..\..\dependencies\sdl\vs2010\SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "..\..\..\dependencies\sdl\vs2010\SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance-M", "VBA-M-MFC.vcxproj", "{B16AEF99-BFAB-4F85-BFE0-732524926C60}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance-M-SDL", "VBA-M-SDL.vcxproj", "{E269FC02-8378-49CB-91F2-A092ACDD0123}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -38,6 +46,22 @@ Global
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
+ {B16AEF99-BFAB-4F85-BFE0-732524926C60}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B16AEF99-BFAB-4F85-BFE0-732524926C60}.Debug|Win32.Build.0 = Debug|Win32
+ {B16AEF99-BFAB-4F85-BFE0-732524926C60}.Release|Win32.ActiveCfg = Release|Win32
+ {B16AEF99-BFAB-4F85-BFE0-732524926C60}.Release|Win32.Build.0 = Release|Win32
+ {E269FC02-8378-49CB-91F2-A092ACDD0123}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E269FC02-8378-49CB-91F2-A092ACDD0123}.Debug|Win32.Build.0 = Debug|Win32
+ {E269FC02-8378-49CB-91F2-A092ACDD0123}.Release|Win32.ActiveCfg = Release|Win32
+ {E269FC02-8378-49CB-91F2-A092ACDD0123}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -47,5 +71,7 @@ Global
{823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {8B814174-883E-43D0-969E-3A17D8EDE080}
{0008960E-E0DD-41A6-8265-00B31DDB4C21} = {8B814174-883E-43D0-969E-3A17D8EDE080}
{7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {8B814174-883E-43D0-969E-3A17D8EDE080}
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {8B814174-883E-43D0-969E-3A17D8EDE080}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {8B814174-883E-43D0-969E-3A17D8EDE080}
EndGlobalSection
EndGlobal
diff --git a/project/vs2010_mfc/VBA2010.vcxproj b/project/vs2010_mfc/VBA2010.vcxproj
index 81af54c5..4edcb816 100644
--- a/project/vs2010_mfc/VBA2010.vcxproj
+++ b/project/vs2010_mfc/VBA2010.vcxproj
@@ -11,7 +11,7 @@
- VisualBoyAdvance-M
+ VBA-M
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}
VBA
MFCProj
@@ -19,8 +19,11 @@
true
+ StaticLibrary
+
+
+ StaticLibrary
-
@@ -47,10 +50,10 @@
%programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
%programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
%programfiles%\OpenAL 1.1 SDK\libs\Win32;$(DXSDK_DIR)\lib\x86;$(LibraryPath)
- $(ProjectDir)$(Platform)\$(Configuration)\
- $(ProjectDir)$(Platform)\$(Configuration)_temp\
- $(ProjectDir)$(Platform)\$(Configuration)\
- $(ProjectDir)$(Platform)\$(Configuration)_temp\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\
@@ -147,7 +150,6 @@
-
@@ -166,12 +168,12 @@
-
-
+
+
@@ -181,13 +183,6 @@
-
-
-
-
-
-
-
@@ -197,87 +192,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -320,343 +241,16 @@
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CompileAsC
- CompileAsC
-
-
-
-
-
_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
-
-
- Create
- Create
-
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
-
-
- __DJGPP__
- true
- 1
- __DJGPP__
-
-
- 1
- ../../src/filters/hq/asm/
- true
- true
- 1
- ../../src/filters/hq/asm/
- true
-
-
- 1
- ../../src/filters/hq/asm/
- true
- true
- 1
- ../../src/filters/hq/asm/
- true
-
-
- 1
- ../../src/filters/hq/asm/
- true
- true
- 1
- ../../src/filters/hq/asm/
- true
-
-
- 1
- ../../src/filters/hq/asm/
- true
- true
- 1
- ../../src/filters/hq/asm/
- true
-
diff --git a/project/vs2010_mfc/VBA2010.vcxproj.filters b/project/vs2010_mfc/VBA2010.vcxproj.filters
index 52b54744..ee53175a 100644
--- a/project/vs2010_mfc/VBA2010.vcxproj.filters
+++ b/project/vs2010_mfc/VBA2010.vcxproj.filters
@@ -1,10 +1,6 @@
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx
-
{f0c26c7f-e258-4a13-9c2d-a22ab5905334}
@@ -20,41 +16,14 @@
{d6df8b89-50c6-42d7-ab82-20ed668b2db2}
-
- {6a743a87-48d3-4e7a-ab79-7fb51e1ce173}
-
-
- {b20dd5ab-a733-4ee9-a294-13ce221a09ba}
-
-
- {443f5282-9e21-46cb-b187-746986699f99}
-
-
- {5ab58341-15e1-499c-9fee-7695e1a98161}
-
{b9123fa0-e9e8-444a-a69c-82a2d3bee747}
-
- {6ed60031-33a3-41aa-88e4-dc543b658179}
-
{ba70870a-3810-4e40-b6ab-49e438da80f9}
-
- {8b031169-88b8-4924-a1ee-ff59ff441b42}
-
-
- {ddc4ba22-6aa2-4862-9c26-25d43a7ccdb7}
-
-
- {6a6d7a7e-ba3c-4ae8-86ed-189be12fb532}
-
-
- Resource
-
Core\GB
@@ -109,9 +78,6 @@
Core\GBA
-
- Core\GBA
-
Core\GBA
@@ -127,6 +93,9 @@
Core\GBA
+
+ Core\GBA
+
Core\GBA
@@ -154,21 +123,6 @@
Core\GBA
-
- Core\GBA
-
-
- Pixel Filter
-
-
- Pixel Filter\HQ
-
-
- Pixel Filter\HQ
-
-
- Pixel Filter\HQ
-
Functionality
@@ -196,230 +150,14 @@
Functionality
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
Linking
Linking
-
- Linking
-
-
- Main
-
-
- Main
-
-
- Main
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- Pixel Filter\xBRZ
-
-
- Pixel Filter\xBRZ
-
-
- Resource
-
-
- Resource
-
Documentation
@@ -429,14 +167,6 @@
Documentation
-
- Pixel Filter\HQ\3x_4x_asm
-
-
-
-
- Resource
-
@@ -559,42 +289,6 @@
Core\GBA
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter\HQ
-
-
- Pixel Filter\HQ\3x_4x_asm
-
-
- Pixel Filter\xBRZ
-
-
- Pixel Filter\xBRZ
-
Functionality
@@ -613,250 +307,11 @@
Functionality
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
Linking
Linking
-
- Linking
-
-
- Main
-
-
- Main
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
-
-
- Pixel Filter
-
-
- Pixel Filter\HQ\3x_4x_asm
-
-
- Pixel Filter\HQ\3x_4x_asm
-
-
- Pixel Filter\HQ\3x_4x_asm
-
-
- Pixel Filter\HQ\3x_4x_asm
-
\ No newline at end of file
diff --git a/project/vs2013_mfc/VBA-M-MFC.vcxproj b/project/vs2013_mfc/VBA-M-MFC.vcxproj
new file mode 100644
index 00000000..a2339158
--- /dev/null
+++ b/project/vs2013_mfc/VBA-M-MFC.vcxproj
@@ -0,0 +1,594 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ VisualBoyAdvance-M
+ {B16AEF99-BFAB-4F85-BFE0-732524926C60}
+ VBA
+ MFCProj
+
+
+
+ true
+ v120
+ Static
+ MultiByte
+
+
+ v120
+ Static
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+ AllRules.ruleset
+
+
+ AllRules.ruleset
+
+
+ %programfiles%\OpenAL 1.1 SDK\libs\Win32;$(DXSDK_DIR)\lib\x86;$(LibraryPath)
+ %programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
+ %programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
+ %programfiles%\OpenAL 1.1 SDK\libs\Win32;$(DXSDK_DIR)\lib\x86;$(LibraryPath)
+ $(ProjectDir)$(Platform)\$(Configuration)\Binary\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\
+ $(ProjectDir)$(Platform)\$(Configuration)\Binary\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\
+
+
+
+
+ "..\..\..\dependencies\SubWCRev\SubWCRev.bat"
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ false
+
+
+ Disabled
+ ..\..\src;..\..\fex;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)
+ NO_OAL;WIN32;_WINDOWS;_DEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)
+ false
+ true
+ EnableFastChecks
+ false
+ MultiThreadedDebug
+ false
+ NotSet
+
+
+ Level3
+ EditAndContinue
+ true
+
+
+
+
+
+ Windows
+ false
+ false
+
+
+ nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies)
+ nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)
+ false
+ true
+ $(OutDir)$(TargetName)$(TargetExt)
+ $(IntDir)$(TargetName).pdb
+ $(IntDir)$(TargetName).pgd
+
+
+ $(IntDir)$(ProjectName)_BuildLog.htm
+
+
+
+
+
+
+ "..\..\..\dependencies\SubWCRev\SubWCRev.bat"
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ false
+
+
+ AnySuitable
+ Speed
+ ..\..\src;..\..\fex;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)
+ NO_OAL;WIN32;_WINDOWS;NDEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)
+ MultiThreaded
+ StreamingSIMDExtensions
+ Fast
+
+
+ true
+ true
+ true
+ true
+ Level3
+ true
+ true
+
+
+
+ nafxcw.lib;libcmt.lib;%(AdditionalDependencies)
+
+
+ Windows
+ true
+ true
+
+
+ false
+ nafxcw.lib;libcmt.lib;
+ $(OutDir)$(TargetName)$(TargetExt)
+ $(IntDir)$(TargetName).pdb
+ $(IntDir)$(TargetName).pgd
+
+
+ 1
+
+
+
+ $(IntDir)$(ProjectName)_BuildLog.htm
+
+
+ false
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CompileAsC
+ CompileAsC
+
+
+
+
+
+
+ Create
+ Create
+
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+ Use
+ Use
+
+
+
+
+ __DJGPP__
+ true
+ 1
+ __DJGPP__
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+
+
+ {6d4c5ec8-933f-4c05-a1bf-498e658576df}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/vs2013_mfc/VBA-M-MFC.vcxproj.filters b/project/vs2013_mfc/VBA-M-MFC.vcxproj.filters
new file mode 100644
index 00000000..f8dc21a7
--- /dev/null
+++ b/project/vs2013_mfc/VBA-M-MFC.vcxproj.filters
@@ -0,0 +1,556 @@
+
+
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx
+
+
+ {6a743a87-48d3-4e7a-ab79-7fb51e1ce173}
+
+
+ {b20dd5ab-a733-4ee9-a294-13ce221a09ba}
+
+
+ {443f5282-9e21-46cb-b187-746986699f99}
+
+
+ {5ab58341-15e1-499c-9fee-7695e1a98161}
+
+
+ {6ed60031-33a3-41aa-88e4-dc543b658179}
+
+
+ {8b031169-88b8-4924-a1ee-ff59ff441b42}
+
+
+ {ddc4ba22-6aa2-4862-9c26-25d43a7ccdb7}
+
+
+ {6a6d7a7e-ba3c-4ae8-86ed-189be12fb532}
+
+
+
+
+ Resource
+
+
+ Pixel Filter
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ Main
+
+
+ Main
+
+
+ Main
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ Pixel Filter\xBRZ
+
+
+ Pixel Filter\xBRZ
+
+
+ MFC
+
+
+ Main
+
+
+
+
+ Resource
+
+
+ Resource
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+
+
+ Resource
+
+
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\xBRZ
+
+
+ Pixel Filter\xBRZ
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ IO
+
+
+ Main
+
+
+ Main
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC\GB
+
+
+ MFC
+
+
+
+
+ Pixel Filter
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+
\ No newline at end of file
diff --git a/project/vs2013_mfc/VBA-M-SDL.vcxproj b/project/vs2013_mfc/VBA-M-SDL.vcxproj
new file mode 100644
index 00000000..030bf955
--- /dev/null
+++ b/project/vs2013_mfc/VBA-M-SDL.vcxproj
@@ -0,0 +1,260 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ VisualBoyAdvance-M-SDL
+ {E269FC02-8378-49CB-91F2-A092ACDD0123}
+ VBA
+ MFCProj
+
+
+
+ true
+ v120
+ false
+ NotSet
+
+
+ v120
+ false
+ NotSet
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+
+ AllRules.ruleset
+
+
+ AllRules.ruleset
+
+
+ %programfiles%\OpenAL 1.1 SDK\libs\Win32;$(DXSDK_DIR)\lib\x86;$(LibraryPath)
+ %programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
+ %programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
+ %programfiles%\OpenAL 1.1 SDK\libs\Win32;$(DXSDK_DIR)\lib\x86;$(LibraryPath)
+ $(ProjectDir)$(Platform)\$(Configuration)\Binary\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\
+ $(ProjectDir)$(Platform)\$(Configuration)\Binary\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\$(ProjectName)\
+
+
+
+
+ "..\..\..\dependencies\SubWCRev\SubWCRev.bat"
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ false
+
+
+ Disabled
+ ..\..\src;..\..\fex;..\..\..\dependencies\sdl\include;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)
+ WIN32;_WINDOWS;_DEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)
+ false
+ true
+ EnableFastChecks
+ false
+ MultiThreadedDebug
+ false
+ NotSet
+
+
+ Level3
+ EditAndContinue
+ true
+
+
+
+
+
+ Console
+ false
+ false
+
+
+ libcmtd.lib;%(AdditionalDependencies)
+ libcmtd.lib;%(IgnoreSpecificDefaultLibraries)
+ false
+ true
+ $(OutDir)$(TargetName)$(TargetExt)
+ $(IntDir)$(TargetName).pgd
+
+
+ $(IntDir)$(ProjectName)_BuildLog.htm
+
+
+
+
+
+ "..\..\..\dependencies\SubWCRev\SubWCRev.bat"
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ false
+
+
+ AnySuitable
+ Speed
+ ..\..\src;..\..\fex;..\..\..\dependencies\sdl\include;..\..\..\dependencies\libpng;..\..\..\dependencies\msvc;..\..\..\dependencies\SFML\include;..\..\..\dependencies\SubWCRev;..\..\..\dependencies\zlib;%(AdditionalIncludeDirectories)
+ NO_OAL;WIN32;_WINDOWS;NDEBUG;SFML_SYSTEM_EXPORTS;SFML_NETWORK_EXPORTS;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)
+ StreamingSIMDExtensions
+ Fast
+
+
+ true
+ true
+ true
+ true
+ Level3
+ true
+ true
+ MultiThreaded
+
+
+
+
+
+ libcmt.lib;%(IgnoreSpecificDefaultLibraries)
+ Console
+ true
+ true
+
+
+ false
+ $(OutDir)$(TargetName)$(TargetExt)
+ $(IntDir)$(TargetName).pdb
+ %(AdditionalDependencies)
+
+
+ 1
+
+
+
+ $(IntDir)$(ProjectName)_BuildLog.htm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ __DJGPP__
+ true
+ 1
+ __DJGPP__
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+ 1
+ ../../src/filters/hq/asm/
+ true
+ true
+ 1
+ ../../src/filters/hq/asm/
+ true
+
+
+
+
+ {da956fd3-e142-46f2-9dd5-c78bebb56b7a}
+
+
+ {81ce8daf-ebb2-4761-8e45-b71abcca8c68}
+
+
+ {6d4c5ec8-933f-4c05-a1bf-498e658576df}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/project/vs2013_mfc/VBA-M-SDL.vcxproj.filters b/project/vs2013_mfc/VBA-M-SDL.vcxproj.filters
new file mode 100644
index 00000000..6bd3725c
--- /dev/null
+++ b/project/vs2013_mfc/VBA-M-SDL.vcxproj.filters
@@ -0,0 +1,133 @@
+
+
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx
+
+
+ {6a743a87-48d3-4e7a-ab79-7fb51e1ce173}
+
+
+ {b20dd5ab-a733-4ee9-a294-13ce221a09ba}
+
+
+ {443f5282-9e21-46cb-b187-746986699f99}
+
+
+ {5ab58341-15e1-499c-9fee-7695e1a98161}
+
+
+ {8b031169-88b8-4924-a1ee-ff59ff441b42}
+
+
+
+
+ Resource
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\xBRZ
+
+
+ Pixel Filter\xBRZ
+
+
+ Main
+
+
+
+
+ Resource
+
+
+ Resource
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+
+
+ Resource
+
+
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter
+
+
+ Pixel Filter\HQ
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\xBRZ
+
+
+ Pixel Filter\xBRZ
+
+
+ Main
+
+
+ Main
+
+
+ Main
+
+
+ Main
+
+
+ Main
+
+
+ Main
+
+
+
+
+ Pixel Filter
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+ Pixel Filter\HQ\3x_4x_asm
+
+
+
\ No newline at end of file
diff --git a/project/vs2013_mfc/VBA2013.sln b/project/vs2013_mfc/VBA2013.sln
index eb0b9a94..d9d11567 100644
--- a/project/vs2013_mfc/VBA2013.sln
+++ b/project/vs2013_mfc/VBA2013.sln
@@ -4,7 +4,7 @@ VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{8B814174-883E-43D0-969E-3A17D8EDE080}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance-M", "VBA2013.vcxproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VBA-M", "VBA2013.vcxproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\dependencies\zlib\project\vs2013\zlib.vcxproj", "{3E03C179-8251-46E4-81F4-466F114BAC63}"
EndProject
@@ -14,6 +14,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\..\dependen
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\..\fex\File_Extractor2013.vcxproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance-M-SDL", "VBA-M-SDL.vcxproj", "{E269FC02-8378-49CB-91F2-A092ACDD0123}"
+ ProjectSection(ProjectDependencies) = postProject
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {6D4C5EC8-933F-4C05-A1BF-498E658576DF} = {6D4C5EC8-933F-4C05-A1BF-498E658576DF}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance-M", "VBA-M-MFC.vcxproj", "{B16AEF99-BFAB-4F85-BFE0-732524926C60}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6D4C5EC8-933F-4C05-A1BF-498E658576DF} = {6D4C5EC8-933F-4C05-A1BF-498E658576DF}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "..\..\..\dependencies\sdl\vs2013\SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "..\..\..\dependencies\sdl\vs2013\SDLmain\SDLmain.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -40,6 +56,22 @@ Global
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32
+ {E269FC02-8378-49CB-91F2-A092ACDD0123}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E269FC02-8378-49CB-91F2-A092ACDD0123}.Debug|Win32.Build.0 = Debug|Win32
+ {E269FC02-8378-49CB-91F2-A092ACDD0123}.Release|Win32.ActiveCfg = Release|Win32
+ {E269FC02-8378-49CB-91F2-A092ACDD0123}.Release|Win32.Build.0 = Release|Win32
+ {B16AEF99-BFAB-4F85-BFE0-732524926C60}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B16AEF99-BFAB-4F85-BFE0-732524926C60}.Debug|Win32.Build.0 = Debug|Win32
+ {B16AEF99-BFAB-4F85-BFE0-732524926C60}.Release|Win32.ActiveCfg = Release|Win32
+ {B16AEF99-BFAB-4F85-BFE0-732524926C60}.Release|Win32.Build.0 = Release|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -49,5 +81,7 @@ Global
{823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {8B814174-883E-43D0-969E-3A17D8EDE080}
{0008960E-E0DD-41A6-8265-00B31DDB4C21} = {8B814174-883E-43D0-969E-3A17D8EDE080}
{7AEC599C-7C82-4F00-AA60-411E0A359CB0} = {8B814174-883E-43D0-969E-3A17D8EDE080}
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {8B814174-883E-43D0-969E-3A17D8EDE080}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} = {8B814174-883E-43D0-969E-3A17D8EDE080}
EndGlobalSection
EndGlobal
diff --git a/project/vs2013_mfc/VBA2013.vcxproj b/project/vs2013_mfc/VBA2013.vcxproj
index 7d6b7876..ccb9b645 100644
--- a/project/vs2013_mfc/VBA2013.vcxproj
+++ b/project/vs2013_mfc/VBA2013.vcxproj
@@ -11,7 +11,7 @@
- VisualBoyAdvance-M
+ VBA-M
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}
VBA
MFCProj
@@ -20,13 +20,15 @@
true
v120
- Static
+ false
MultiByte
+ StaticLibrary
v120
Static
MultiByte
+ StaticLibrary
@@ -54,10 +56,10 @@
%programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
%programfiles%\OpenAL 1.1 SDK\include;$(DXSDK_DIR)\Include;$(IncludePath)
%programfiles%\OpenAL 1.1 SDK\libs\Win32;$(DXSDK_DIR)\lib\x86;$(LibraryPath)
- $(ProjectDir)$(Platform)\$(Configuration)\
- $(ProjectDir)$(Platform)\$(Configuration)_temp\
- $(ProjectDir)$(Platform)\$(Configuration)\
- $(ProjectDir)$(Platform)\$(Configuration)_temp\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\
+ $(ProjectDir)$(Platform)\$(Configuration)\Build\
@@ -154,7 +156,6 @@
-
@@ -188,13 +189,6 @@
-
-
-
-
-
-
-
@@ -204,87 +198,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -327,343 +247,16 @@
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CompileAsC
- CompileAsC
-
-
-
-
-
_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
-
-
- Create
- Create
-
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
- Use
- Use
-
-
-
-
- __DJGPP__
- true
- 1
- __DJGPP__
-
-
- 1
- ../../src/filters/hq/asm/
- true
- true
- 1
- ../../src/filters/hq/asm/
- true
-
-
- 1
- ../../src/filters/hq/asm/
- true
- true
- 1
- ../../src/filters/hq/asm/
- true
-
-
- 1
- ../../src/filters/hq/asm/
- true
- true
- 1
- ../../src/filters/hq/asm/
- true
-
-
- 1
- ../../src/filters/hq/asm/
- true
- true
- 1
- ../../src/filters/hq/asm/
- true
-
diff --git a/project/vs2013_mfc/VBA2013.vcxproj.filters b/project/vs2013_mfc/VBA2013.vcxproj.filters
index 9c9dab05..ee53175a 100644
--- a/project/vs2013_mfc/VBA2013.vcxproj.filters
+++ b/project/vs2013_mfc/VBA2013.vcxproj.filters
@@ -1,10 +1,6 @@
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx
-
{f0c26c7f-e258-4a13-9c2d-a22ab5905334}
@@ -20,41 +16,14 @@
{d6df8b89-50c6-42d7-ab82-20ed668b2db2}
-
- {6a743a87-48d3-4e7a-ab79-7fb51e1ce173}
-
-
- {b20dd5ab-a733-4ee9-a294-13ce221a09ba}
-
-
- {443f5282-9e21-46cb-b187-746986699f99}
-
-
- {5ab58341-15e1-499c-9fee-7695e1a98161}
-
{b9123fa0-e9e8-444a-a69c-82a2d3bee747}
-
- {6ed60031-33a3-41aa-88e4-dc543b658179}
-
{ba70870a-3810-4e40-b6ab-49e438da80f9}
-
- {8b031169-88b8-4924-a1ee-ff59ff441b42}
-
-
- {ddc4ba22-6aa2-4862-9c26-25d43a7ccdb7}
-
-
- {6a6d7a7e-ba3c-4ae8-86ed-189be12fb532}
-
-
- Resource
-
Core\GB
@@ -154,21 +123,6 @@
Core\GBA
-
- Core\GBA
-
-
- Pixel Filter
-
-
- Pixel Filter\HQ
-
-
- Pixel Filter\HQ
-
-
- Pixel Filter\HQ
-
Functionality
@@ -196,230 +150,14 @@
Functionality
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
Linking
Linking
-
- Linking
-
-
- Main
-
-
- Main
-
-
- Main
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- Pixel Filter\xBRZ
-
-
- Pixel Filter\xBRZ
-
-
- Resource
-
-
- Resource
-
Documentation
@@ -429,14 +167,6 @@
Documentation
-
- Pixel Filter\HQ\3x_4x_asm
-
-
-
-
- Resource
-
@@ -559,42 +289,6 @@
Core\GBA
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter
-
-
- Pixel Filter\HQ
-
-
- Pixel Filter\HQ\3x_4x_asm
-
-
- Pixel Filter\xBRZ
-
-
- Pixel Filter\xBRZ
-
Functionality
@@ -613,250 +307,11 @@
Functionality
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
-
- IO
-
Linking
Linking
-
- Linking
-
-
- Main
-
-
- Main
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
- MFC\GB
-
-
-
-
- Pixel Filter
-
-
- Pixel Filter\HQ\3x_4x_asm
-
-
- Pixel Filter\HQ\3x_4x_asm
-
-
- Pixel Filter\HQ\3x_4x_asm
-
-
- Pixel Filter\HQ\3x_4x_asm
-
\ No newline at end of file
diff --git a/src/System.h b/src/System.h
index d5122811..36800816 100644
--- a/src/System.h
+++ b/src/System.h
@@ -5,6 +5,8 @@
#include
#endif
+#define winlog log
+
class SoundDriver;
struct EmulatedSystem {
@@ -78,11 +80,6 @@ extern void Sm60FPS_Init();
extern bool Sm60FPS_CanSkipFrame();
extern void Sm60FPS_Sleep();
extern void DbgMsg(const char *msg, ...);
-#ifdef SDL
-#define winlog log
-#else
-extern void winlog(const char *,...);
-#endif
extern void (*dbgOutput)(const char *s, u32 addr);
extern void (*dbgSignal)(int sig,int number);
extern u16 systemColorMap16[0x10000];
diff --git a/src/Util.h b/src/Util.h
index 424bd5ae..863b64e8 100644
--- a/src/Util.h
+++ b/src/Util.h
@@ -45,7 +45,7 @@ void utilReadDataMem(const uint8_t *& data, variable_desc *);
gzFile utilGzOpen(const char *file, const char *mode);
gzFile utilMemGzOpen(char *memory, int available, const char *mode);
int utilGzWrite(gzFile file, const voidp buffer, unsigned int len);
-int utilGzRead(gzFile file, void buffer, unsigned int len);
+int utilGzRead(gzFile file, voidp buffer, unsigned int len);
int utilGzClose(gzFile file);
z_off_t utilGzSeek(gzFile file, z_off_t offset, int whence);
long utilGzMemTell(gzFile file);
diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp
index dc9d9cbe..7e7d8b08 100644
--- a/src/sdl/SDL.cpp
+++ b/src/sdl/SDL.cpp
@@ -16,6 +16,12 @@
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//OpenGL library
+#if (defined _MSC_VER)
+#pragma comment( lib, "OpenGL32" )
+#include
+#endif
+
#include
#include
#include
@@ -34,6 +40,7 @@
#include
#include "../AutoBuild.h"
+#include "../svnrev.h"
#include
@@ -61,6 +68,7 @@
#else // _WIN32
# include
# define GETCWD _getcwd
+# define snprintf sprintf
#endif // _WIN32
#ifndef __GNUC__
@@ -1250,7 +1258,7 @@ void change_rewind(int howmuch)
rewindCounter = 0;
{
char rewindMsgBuffer[50];
- snprintf(rewindMsgBuffer, 50, "Rewind to %1d [%d]", rewindPos+1, rewindSerials[rewindPos]);
+ sprintf(rewindMsgBuffer, "Rewind to %1d [%d]", rewindPos+1, rewindSerials[rewindPos]);
rewindMsgBuffer[49] = 0;
systemConsoleMessage(rewindMsgBuffer);
}
@@ -1854,7 +1862,7 @@ void handleRewinds()
)
) {
char rewMsgBuf[100];
- snprintf(rewMsgBuf, 100, "Remembered rewind %1d (of %1d), serial %d.", curSavePos+1, rewindCount, rewindSerial);
+ sprintf(rewMsgBuf, "Remembered rewind %1d (of %1d), serial %d.", curSavePos+1, rewindCount, rewindSerial);
rewMsgBuf[99] = 0;
systemConsoleMessage(rewMsgBuf);
rewindSerials[curSavePos] = rewindSerial;
@@ -1873,7 +1881,7 @@ void handleRewinds()
int main(int argc, char **argv)
{
- fprintf(stdout, "VBA-M version %s [SDL]\n", VERSION);
+ fprintf(stdout, "VBA-M version %s [SDL]\n", SVN_REV_STR);
arg0 = argv[0];
@@ -2719,7 +2727,7 @@ int systemGetSensorZ()
u8 systemGetSensorDarkness()
{
- //return sensorDarkness;
+ return 0;
}
SoundDriver * systemSoundInit()
@@ -2750,4 +2758,4 @@ void log(const char *defaultMsg, ...)
va_start(valist, defaultMsg);
vfprintf(out, defaultMsg, valist);
va_end(valist);
-}
+}
\ No newline at end of file
diff --git a/src/sdl/filters.cpp b/src/sdl/filters.cpp
index a00cb12d..878376d5 100644
--- a/src/sdl/filters.cpp
+++ b/src/sdl/filters.cpp
@@ -16,6 +16,10 @@
// along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#if (defined _MSC_VER)
+#define C_CORE
+#endif
+
#include "filters.h"
//
diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp
index b2f697e1..33a00c46 100644
--- a/src/win32/VBA.cpp
+++ b/src/win32/VBA.cpp
@@ -898,23 +898,6 @@ void VBA::updateMenuBar()
m_pMainWnd->SetMenu(&m_menu);
}
-void winlog(const char *msg, ...)
-{
- CString buffer;
- va_list valist;
-
- va_start(valist, msg);
- buffer.FormatV(msg, valist);
-
- if(theApp.winout == NULL) {
- theApp.winout = fopen("vba-trace.log","w");
- }
-
- fputs(buffer, theApp.winout);
-
- va_end(valist);
-}
-
void log(const char *msg, ...)
{
CString buffer;