diff --git a/project/vc2010_mfc/SubWCRev.exe b/project/vc2010_mfc/SubWCRev.exe new file mode 100644 index 00000000..30adb793 Binary files /dev/null and b/project/vc2010_mfc/SubWCRev.exe differ diff --git a/project/vc2010_mfc/VBA2010.sln b/project/vc2010_mfc/VBA2010.sln new file mode 100644 index 00000000..a3fe6d52 --- /dev/null +++ b/project/vc2010_mfc/VBA2010.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance", "VBA2010.vcxproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File_Extractor", "..\..\..\dependencies\File_Extractor-0.4.3\File_Extractor2010.vcxproj", "{7AEC599C-7C82-4F00-AA60-411E0A359CB0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + Template|Win32 = Template|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.ActiveCfg = Debug|Win32 + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.Build.0 = Debug|Win32 + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.ActiveCfg = Release|Win32 + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.Build.0 = Release|Win32 + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Template|Win32.ActiveCfg = Template|Win32 + {6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Template|Win32.Build.0 = Template|Win32 + {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32 + {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 + {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Template|Win32.ActiveCfg = Release|Win32 + {7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Template|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/project/vc2010_mfc/VBA2010.suo b/project/vc2010_mfc/VBA2010.suo new file mode 100644 index 00000000..f2eb1873 Binary files /dev/null and b/project/vc2010_mfc/VBA2010.suo differ diff --git a/project/vc2010_mfc/VBA2010.vcxproj b/project/vc2010_mfc/VBA2010.vcxproj new file mode 100644 index 00000000..478d2b5e --- /dev/null +++ b/project/vc2010_mfc/VBA2010.vcxproj @@ -0,0 +1,705 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Template + Win32 + + + + VisualBoyAdvance + {6D4C5EC8-933F-4C05-A1BF-498E658576DF} + VBA + MFCProj + + + + Application + Static + false + NotSet + false + $(IntDir)$(ProjectName)_BuildLog.htm + + + Application + Static + NotSet + $(IntDir)$(ProjectName)_BuildLog.htm + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)_temp\ + true + false + true + false + $(ProjectDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)_temp\ + true + false + false + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;d:\Projects\dependencies\zlib\;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Include\;d:\Projects\dependencies\libpng\;c:\Program Files (x86)\OpenAL 1.1 SDK\include\; + $(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);d:\Projects\Dev-Cpp\bin\; + $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Lib\x86\;c:\Program Files (x86)\OpenAL 1.1 SDK\libs\;d:\Projects\dependencies\libs\; + $(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);d:\Projects\Dev-Cpp\bin\; + $(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);d:\Projects\Dev-Cpp\bin\; + $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Lib\x86\;c:\Program Files (x86)\OpenAL 1.1 SDK\libs\;d:\Projects\dependencies\libs\; + $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Lib\x86\;c:\Program Files (x86)\OpenAL 1.1 SDK\libs\;d:\Projects\dependencies\libs\; + $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;d:\Projects\dependencies\zlib\;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Include\;d:\Projects\dependencies\libpng\;c:\Program Files (x86)\OpenAL 1.1 SDK\include\; + $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;d:\Projects\dependencies\zlib\;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Include\;d:\Projects\dependencies\libpng\;c:\Program Files (x86)\OpenAL 1.1 SDK\include\; + + + + SubWCRev.exe ..\.. svnrev_template.h ..\..\src\svnrev.h + + + _DEBUG;%(PreprocessorDefinitions) + false + + + Disabled + ..\..\..\dependencies\File_Extractor-0.4.3\fex;..\..\..\dependencies\msvc;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;GBA_LOGGING;MMX;ASM;_CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions) + false + true + EnableFastChecks + false + MultiThreadedDebug + Default + false + false + NotSet + false + + + $(IntDir)$(ProjectName).pdb + Level3 + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + nafxcwd.lib;libcmtd.lib;zlibd.lib;libpngd.lib;%(AdditionalDependencies) + $(OutDir)VisualBoyAdvance-M.exe + + + %(AdditionalLibraryDirectories) + nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + false + false + + + MachineX86 + + + + + SubWCRev.exe ..\.. svnrev_template.h ..\..\src\svnrev.h + + + _DEBUG;%(PreprocessorDefinitions) + false + + + /D_ST_MODEL +/D_SECURE_SCL=0 +/Zc:forScope- +/MP %(AdditionalOptions) + Full + AnySuitable + Speed + true + ..\..\..\dependencies\File_Extractor-0.4.3\fex;..\..\..\dependencies\msvc;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NDEBUG;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions) + MultiThreaded + false + StreamingSIMDExtensions2 + Fast + + + $(IntDir)$(ProjectName).pdb + Level3 + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + %(AdditionalIncludeDirectories) + + + false + nafxcw.lib;libcmt.lib;zlib.lib;libpng.lib;%(AdditionalDependencies) + $(OutDir)VisualBoyAdvance-M.exe + + + true + %(AdditionalLibraryDirectories) + nafxcw.lib;libcmt.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + false + false + false + false + Windows + + + + + UseLinkTimeCodeGeneration + false + + + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + {7aec599c-7c82-4f00-aa60-411e0a359cb0} + false + + + + + + + + + + + + \ No newline at end of file diff --git a/project/vc2010_mfc/VBA2010.vcxproj.filters b/project/vc2010_mfc/VBA2010.vcxproj.filters new file mode 100644 index 00000000..78a7a725 --- /dev/null +++ b/project/vc2010_mfc/VBA2010.vcxproj.filters @@ -0,0 +1,823 @@ + + + + + {23ce12ea-204d-4bc0-a83f-47315f76a212} + + + {f336c3ae-261f-4873-b062-9e05d7afca09} + + + {1b3555ff-9bdf-457d-bc01-6e94a256278a} + + + {da309579-ba11-4082-93e3-4d29e387488a} + + + {c1844500-2572-4250-9be1-f4969fabc48e} + + + {5419645c-6723-460f-b8e0-5be4b634f584} + + + {2988ee4b-39c4-4fbe-af69-4daec52c6c63} + + + {a5da88a7-5785-46a5-b2a8-487225ac69c8} + + + {70f0fedd-e7dc-4911-a89e-d9ebe7a3f670} + + + {dc5878f6-fc7f-4ab8-a261-4232514170ef} + + + {18f82a90-19b8-4ee0-bf11-21ae39aaa799} + + + {3c8217d7-3e96-48f3-8039-a4df5b6186e5} + + + {90711076-20e5-4e32-8fb2-4d7255223277} + + + {c3dc4558-ae69-42d0-af12-1bd9e4ebbe18} + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Core\GB APU + + + Core\GB APU + + + Core\GB APU + + + Core\GB APU + + + Core\GB APU + + + Core\GB APU + + + Core\GB APU + + + Core\GB APU + + + Functionality + + + Functionality + + + Functionality + + + IO + + + Pixel Filter\HQ + + + Pixel Filter\HQ + + + Pixel Filter\HQ + + + Core\GBA + + + Functionality + + + Core\GBA + + + Functionality + + + Functionality + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Linking + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Functionality + + + Core\GBA + + + Functionality + + + Functionality + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + IO + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC\GB + + + MFC\GB + + + MFC\GB + + + MFC\GB + + + MFC\GB + + + MFC\GB + + + MFC\GB + + + MFC\GB + + + MFC\GB + + + MFC + + + IO + + + MFC + + + IO + + + MFC + + + IO + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + Linking + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + Resource + + + MFC + + + MFC + + + Pixel Filter + + + MFC + + + Main + + + MFC + + + Main + + + MFC + + + MFC + + + Main + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + + + Documentation + + + Documentation + + + Documentation + + + Pixel Filter\HQ\3x_4x_asm + + + Resource + + + Resource + + + + + Resource + + + + + Core\GB APU + + + Core\GB APU + + + Core\GB APU + + + Core\GB APU + + + Core\GB APU + + + Core\GB APU + + + Functionality + + + Functionality + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter\HQ + + + Pixel Filter\HQ\3x_4x_asm + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Pixel Filter + + + Core\GBA + + + Functionality + + + Core\GBA + + + Functionality + + + Functionality + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Linking + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GBA + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Core\GB + + + Functionality + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + IO + + + IO + + + MFC + + + IO + + + 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 + + + IO + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + Linking + + + IO + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + IO + + + IO + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + MFC + + + Pixel Filter + + + MFC + + + Main + + + MFC + + + MFC + + + MFC + + + Main + + + MFC + + + MFC + + + IO + + + MFC + + + 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/vc2010_mfc/VBA2010.vcxproj.user b/project/vc2010_mfc/VBA2010.vcxproj.user new file mode 100644 index 00000000..695b5c78 --- /dev/null +++ b/project/vc2010_mfc/VBA2010.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/project/vc2010_mfc/nasm.props b/project/vc2010_mfc/nasm.props new file mode 100644 index 00000000..9b814fd2 --- /dev/null +++ b/project/vc2010_mfc/nasm.props @@ -0,0 +1,22 @@ + + + + Midl + CustomBuild + + + + False + False + False + $(IntDir)%(FileName).obj + 0 + 8 + 1 + nasm.exe [AllOptions] [AdditionalOptions] -- [inputs] + %(ObjectFileName) + Assembling... + + + \ No newline at end of file diff --git a/project/vc2010_mfc/nasm.rules b/project/vc2010_mfc/nasm.rules new file mode 100644 index 00000000..14b5e24d --- /dev/null +++ b/project/vc2010_mfc/nasm.rules @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/vc2010_mfc/nasm.targets b/project/vc2010_mfc/nasm.targets new file mode 100644 index 00000000..65ea62ed --- /dev/null +++ b/project/vc2010_mfc/nasm.targets @@ -0,0 +1,89 @@ + + + + + + _NASM + + + + $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml + + + + + + + + @(NASM, '|') + + + + + + + + + $(ComputeLinkInputsTargets); + ComputeNASMOutput; + + + $(ComputeLibInputsTargets); + ComputeNASMOutput; + + + + + + + + + + + + \ No newline at end of file diff --git a/project/vc2010_mfc/nasm.xml b/project/vc2010_mfc/nasm.xml new file mode 100644 index 00000000..aab12c8a --- /dev/null +++ b/project/vc2010_mfc/nasm.xml @@ -0,0 +1,250 @@ + + + + + + + + + + General + + + + + Command Line + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Execute Before + + + Specifies the targets for the build customization to run before. + + + + + + + + + + + Execute After + + + Specifies the targets for the build customization to run after. + + + + + + + + + + + + + + Additional Options + + + Additional Options + + + + + + + \ No newline at end of file diff --git a/project/vc2010_mfc/svnrev_template.h b/project/vc2010_mfc/svnrev_template.h new file mode 100644 index 00000000..24d8c760 --- /dev/null +++ b/project/vc2010_mfc/svnrev_template.h @@ -0,0 +1,2 @@ +#define SVN_REV $WCREV$ +#define SVN_REV_STR "$WCREV$" diff --git a/src/gba/GBAGfx.h b/src/gba/GBAGfx.h index a3737aca..20013ee4 100644 --- a/src/gba/GBAGfx.h +++ b/src/gba/GBAGfx.h @@ -98,6 +98,7 @@ static inline void gfxClearArray(u32 *array) } } +#ifdef __GNUC__ union u8h { struct @@ -107,6 +108,18 @@ union u8h } __attribute__ ((packed)); u8 val; }; + #else + +union u8h +{ +#pragma pack(1) + struct + { + unsigned lo:4; + unsigned hi:4;}; + u8 val; +}; +#endif union TileEntry {