mirror of
https://github.com/Azimer/Apollo64.git
synced 2024-05-17 19:41:06 -04:00
Some fixes to get the old source to compile in VS2019.
This commit is contained in:
Azimer
parent
7510f2ab94
commit
8b0ca066a4
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -67,3 +67,7 @@ out/
|
|||
# Visual Studio folders
|
||||
.vs/
|
||||
.vscode/
|
||||
/source/Debug
|
||||
/source/Apollo.vcxproj.user
|
||||
/source/RCa10348
|
||||
/source/UpgradeLog.htm
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Apollo64 - Cross-platform Nintendo 64 emulator
|
||||
# Copyright (C) 2017 - Azimer - http://www.apollo64.com/
|
||||
# Copyright (C) 2017-2022 - Azimer - http://www.apollo64.com/
|
||||
#
|
||||
# This program is distributed under the GNU General Public License v3.
|
||||
# See the LICENSE document supplied with this source code for details.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<<<<<<< HEAD
|
||||
# Apollo64 - N64 Emulator
|
||||
|
||||
[Homepage](https://www.apollo64.com/)
|
||||
|
|
|
|||
|
|
@ -1,24 +1,27 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 7.00
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Apollo", "Apollo.vcproj", "{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}"
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.31911.196
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Apollo", "Apollo.vcxproj", "{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfiguration) = preSolution
|
||||
ConfigName.0 = Debug
|
||||
ConfigName.1 = NoOpt
|
||||
ConfigName.2 = Release
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|x86 = Debug|x86
|
||||
NoOpt|x86 = NoOpt|x86
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectDependencies) = postSolution
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Debug|x86.Build.0 = Debug|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.NoOpt|x86.ActiveCfg = Release|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.NoOpt|x86.Build.0 = Release|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Release|x86.ActiveCfg = Debug|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Release|x86.Build.0 = Debug|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfiguration) = postSolution
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Debug.ActiveCfg = Debug|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Debug.Build.0 = Debug|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.NoOpt.ActiveCfg = Release|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.NoOpt.Build.0 = Release|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Release.ActiveCfg = Debug|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Release.Build.0 = Debug|Win32
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityAddIns) = postSolution
|
||||
SolutionGuid = {22BD2264-B2B6-47D9-A5D4-AAA8594503E7}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
271
source/Apollo.vcxproj
Normal file
271
source/Apollo.vcxproj
Normal file
|
|
@ -0,0 +1,271 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="NoOpt|Win32">
|
||||
<Configuration>NoOpt</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<SccProjectName />
|
||||
<SccLocalPath>Desktop</SccLocalPath>
|
||||
<ProjectGuid>{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}</ProjectGuid>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoOpt|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='NoOpt|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<_ProjectFileVersion>16.0.31829.152</_ProjectFileVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>.\Release\</OutDir>
|
||||
<IntDir>.\Release\</IntDir>
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='NoOpt|Win32'">
|
||||
<OutDir>.\Release\</OutDir>
|
||||
<IntDir>.\Release\</IntDir>
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>.\Debug\</OutDir>
|
||||
<IntDir>.\Debug\</IntDir>
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<FunctionLevelLinking>false</FunctionLevelLinking>
|
||||
<PrecompiledHeader />
|
||||
<PrecompiledHeaderOutputFile>.\Release/Apollo.pch</PrecompiledHeaderOutputFile>
|
||||
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
|
||||
<AssemblerListingLocation>.\Release/</AssemblerListingLocation>
|
||||
<ObjectFileName>.\Release/</ObjectFileName>
|
||||
<ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalDependencies>comctl32.lib;winmm.lib;zlib113.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>d:\emu\n64\pj643\Apollo.exe</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<ProgramDatabaseFile>.\Release/Apollo.pdb</ProgramDatabaseFile>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
</Link>
|
||||
<Midl>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<TargetEnvironment>Win32</TargetEnvironment>
|
||||
<TypeLibraryName>.\Release/Apollo.tlb</TypeLibraryName>
|
||||
</Midl>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='NoOpt|Win32'">
|
||||
<ClCompile>
|
||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling />
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<FunctionLevelLinking>false</FunctionLevelLinking>
|
||||
<PrecompiledHeader />
|
||||
<PrecompiledHeaderOutputFile>.\Release/Apollo.pch</PrecompiledHeaderOutputFile>
|
||||
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
|
||||
<AssemblerListingLocation>.\Release/</AssemblerListingLocation>
|
||||
<ObjectFileName>.\Release/</ObjectFileName>
|
||||
<ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalDependencies>comctl32.lib;winmm.lib;zlib113.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>d:\emu\n64\pj643\Apollo.exe</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<ProgramDatabaseFile>.\Release/Apollo.pdb</ProgramDatabaseFile>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
</Link>
|
||||
<Midl>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<TargetEnvironment>Win32</TargetEnvironment>
|
||||
<TypeLibraryName>.\Release/Apollo.tlb</TypeLibraryName>
|
||||
</Midl>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<PrecompiledHeader />
|
||||
<PrecompiledHeaderOutputFile>.\Debug/Apollo.pch</PrecompiledHeaderOutputFile>
|
||||
<AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
|
||||
<ObjectFileName>.\Debug/</ObjectFileName>
|
||||
<ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalDependencies>libcmt.lib;dxguid.lib;ddraw.lib;comctl32.lib;winmm.lib;zlib113.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>.\Debug/Apollo.pdb</ProgramDatabaseFile>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
<IgnoreSpecificDefaultLibraries>libc.lib</IgnoreSpecificDefaultLibraries>
|
||||
</Link>
|
||||
<Midl>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<TargetEnvironment>Win32</TargetEnvironment>
|
||||
<TypeLibraryName>.\Debug/Apollo.tlb</TypeLibraryName>
|
||||
</Midl>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Culture>0x0409</Culture>
|
||||
</ResourceCompile>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="Audio.cpp" />
|
||||
<ClCompile Include="console.cpp" />
|
||||
<ClCompile Include="Controllers.cpp" />
|
||||
<ClCompile Include="DynaOps.cpp" />
|
||||
<ClCompile Include="EmuMain.cpp" />
|
||||
<ClCompile Include="EventScheduler.cpp" />
|
||||
<ClCompile Include="FPU Machine.cpp" />
|
||||
<ClCompile Include="Fpu Machine2.cpp" />
|
||||
<ClCompile Include="jpgdct.cpp" />
|
||||
<ClCompile Include="MMU Machine.cpp" />
|
||||
<ClCompile Include="Plugins.cpp" />
|
||||
<ClCompile Include="r4300i Compiler.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='NoOpt|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="R4K Debugger.cpp" />
|
||||
<ClCompile Include="R4K Dynarec.cpp" />
|
||||
<ClCompile Include="R4K Machine.cpp" />
|
||||
<ClCompile Include="R4K Memory.cpp" />
|
||||
<ClCompile Include="rcp.cpp" />
|
||||
<ClCompile Include="RspDump.cpp" />
|
||||
<ClCompile Include="RSP\debug.c">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RSP\dump_rsp.c">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RSP\rsp.c">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="SaveChips.cpp" />
|
||||
<ClCompile Include="Settings.cpp" />
|
||||
<ClCompile Include="TLB.cpp" />
|
||||
<ClCompile Include="unzip.c" />
|
||||
<ClCompile Include="Video.cpp" />
|
||||
<ClCompile Include="WinMain.cpp" />
|
||||
<ClCompile Include="zip.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\Program Files\Microsoft Visual Studio\Vc98\Include\Basetsd.h" />
|
||||
<ClInclude Include="audiodll.h" />
|
||||
<ClInclude Include="console.h" />
|
||||
<ClInclude Include="CpuMain.h" />
|
||||
<ClInclude Include="DynaCodes.h" />
|
||||
<ClInclude Include="EmuMain.H" />
|
||||
<ClInclude Include="inputdll.h" />
|
||||
<ClInclude Include="pif2.h" />
|
||||
<ClInclude Include="plugin.h" />
|
||||
<ClInclude Include="resource.h" />
|
||||
<ClInclude Include="RSP\debug.h" />
|
||||
<ClInclude Include="RSP\dump_rsp.h" />
|
||||
<ClInclude Include="RSP\rsp.h" />
|
||||
<ClInclude Include="RSP\rsp_helper.h" />
|
||||
<ClInclude Include="RSP\rsp_mnemonic.h" />
|
||||
<ClInclude Include="RSP\rsp_registers.h" />
|
||||
<ClInclude Include="unzip.h" />
|
||||
<ClInclude Include="videodll.h" />
|
||||
<ClInclude Include="WinMain.h" />
|
||||
<ClInclude Include="zconf.h" />
|
||||
<ClInclude Include="zlib.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\..\dynalog.txt" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="rscript.rc" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Image Include="apollo.ico" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
219
source/Apollo.vcxproj.filters
Normal file
219
source/Apollo.vcxproj.filters
Normal file
|
|
@ -0,0 +1,219 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Source Files">
|
||||
<UniqueIdentifier>{274774f7-f0af-4ea1-844d-e035ea8594c0}</UniqueIdentifier>
|
||||
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\Gui">
|
||||
<UniqueIdentifier>{06004149-c0ee-4717-ba2b-586b4e5fc84d}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\Gui\Zip Support">
|
||||
<UniqueIdentifier>{7ee93e75-d154-4845-a66d-2728f972fa5a}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\Emu">
|
||||
<UniqueIdentifier>{43469f97-82ce-4396-aa97-c39e01013a50}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\Emu\RCP">
|
||||
<UniqueIdentifier>{b0ea6915-95ed-406c-bb84-dd846326b0a9}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\Emu\RCP\rsp">
|
||||
<UniqueIdentifier>{698ef48b-3c15-41ba-aa4c-329a0a78c728}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\Emu\r4300">
|
||||
<UniqueIdentifier>{e669d600-16df-4f0f-973f-487d3a3b037e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\Emu\r4300\interpretive">
|
||||
<UniqueIdentifier>{34ccf31f-5bb2-4303-9fa8-2efb5341f806}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\Emu\r4300\dynarec">
|
||||
<UniqueIdentifier>{9bc9574e-4405-4c73-a40c-4e7734351092}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Source Files\Plugin Overhead">
|
||||
<UniqueIdentifier>{2123f163-2a71-4e7f-9705-71a783a3870e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Header Files">
|
||||
<UniqueIdentifier>{92411bb2-0121-4a34-9c09-d8ccd5889a17}</UniqueIdentifier>
|
||||
<Extensions>h;hpp;hxx;hm;inl</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Header Files\GuiH">
|
||||
<UniqueIdentifier>{0385808d-0e8f-454e-aad9-995ddd32ed60}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Header Files\EmuH">
|
||||
<UniqueIdentifier>{0acfe8b5-0bf3-4ad6-86f5-4ea92f3ac22e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Resource Files">
|
||||
<UniqueIdentifier>{4be0b55b-4738-4bd1-8cf2-1a464988389e}</UniqueIdentifier>
|
||||
<Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Resource Files\icons">
|
||||
<UniqueIdentifier>{553b0311-43bd-4f72-84e5-8b5ada07d3d1}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="R4K Debugger.cpp">
|
||||
<Filter>Source Files\Gui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Settings.cpp">
|
||||
<Filter>Source Files\Gui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="WinMain.cpp">
|
||||
<Filter>Source Files\Gui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="console.cpp">
|
||||
<Filter>Source Files\Gui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="unzip.c">
|
||||
<Filter>Source Files\Gui\Zip Support</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="zip.cpp">
|
||||
<Filter>Source Files\Gui\Zip Support</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="EmuMain.cpp">
|
||||
<Filter>Source Files\Emu</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="SaveChips.cpp">
|
||||
<Filter>Source Files\Emu</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RspDump.cpp">
|
||||
<Filter>Source Files\Emu\RCP</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="jpgdct.cpp">
|
||||
<Filter>Source Files\Emu\RCP</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="rcp.cpp">
|
||||
<Filter>Source Files\Emu\RCP</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RSP\debug.c">
|
||||
<Filter>Source Files\Emu\RCP\rsp</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RSP\dump_rsp.c">
|
||||
<Filter>Source Files\Emu\RCP\rsp</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="RSP\rsp.c">
|
||||
<Filter>Source Files\Emu\RCP\rsp</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="EventScheduler.cpp">
|
||||
<Filter>Source Files\Emu\r4300</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="R4K Memory.cpp">
|
||||
<Filter>Source Files\Emu\r4300</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="TLB.cpp">
|
||||
<Filter>Source Files\Emu\r4300</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="r4300i Compiler.cpp">
|
||||
<Filter>Source Files\Emu\r4300</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="FPU Machine.cpp">
|
||||
<Filter>Source Files\Emu\r4300\interpretive</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Fpu Machine2.cpp">
|
||||
<Filter>Source Files\Emu\r4300\interpretive</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="MMU Machine.cpp">
|
||||
<Filter>Source Files\Emu\r4300\interpretive</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="R4K Machine.cpp">
|
||||
<Filter>Source Files\Emu\r4300\interpretive</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="DynaOps.cpp">
|
||||
<Filter>Source Files\Emu\r4300\dynarec</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="R4K Dynarec.cpp">
|
||||
<Filter>Source Files\Emu\r4300\dynarec</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Audio.cpp">
|
||||
<Filter>Source Files\Plugin Overhead</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Controllers.cpp">
|
||||
<Filter>Source Files\Plugin Overhead</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Plugins.cpp">
|
||||
<Filter>Source Files\Plugin Overhead</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Video.cpp">
|
||||
<Filter>Source Files\Plugin Overhead</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="unzip.h">
|
||||
<Filter>Source Files\Gui\Zip Support</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="zconf.h">
|
||||
<Filter>Source Files\Gui\Zip Support</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="zlib.h">
|
||||
<Filter>Source Files\Gui\Zip Support</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RSP\debug.h">
|
||||
<Filter>Source Files\Emu\RCP\rsp</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RSP\dump_rsp.h">
|
||||
<Filter>Source Files\Emu\RCP\rsp</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RSP\rsp.h">
|
||||
<Filter>Source Files\Emu\RCP\rsp</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RSP\rsp_helper.h">
|
||||
<Filter>Source Files\Emu\RCP\rsp</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RSP\rsp_mnemonic.h">
|
||||
<Filter>Source Files\Emu\RCP\rsp</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="RSP\rsp_registers.h">
|
||||
<Filter>Source Files\Emu\RCP\rsp</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="DynaCodes.h">
|
||||
<Filter>Source Files\Emu\r4300\dynarec</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="audiodll.h">
|
||||
<Filter>Source Files\Plugin Overhead</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="inputdll.h">
|
||||
<Filter>Source Files\Plugin Overhead</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="pif2.h">
|
||||
<Filter>Source Files\Plugin Overhead</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="plugin.h">
|
||||
<Filter>Source Files\Plugin Overhead</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="videodll.h">
|
||||
<Filter>Source Files\Plugin Overhead</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\Program Files\Microsoft Visual Studio\Vc98\Include\Basetsd.h">
|
||||
<Filter>Header Files\GuiH</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="WinMain.h">
|
||||
<Filter>Header Files\GuiH</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="console.h">
|
||||
<Filter>Header Files\GuiH</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="resource.h">
|
||||
<Filter>Header Files\GuiH</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CpuMain.h">
|
||||
<Filter>Header Files\EmuH</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="EmuMain.H">
|
||||
<Filter>Header Files\EmuH</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\..\dynalog.txt">
|
||||
<Filter>Source Files\Emu\r4300\dynarec</Filter>
|
||||
</Text>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="rscript.rc">
|
||||
<Filter>Resource Files</Filter>
|
||||
</ResourceCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Image Include="apollo.ico">
|
||||
<Filter>Resource Files\icons</Filter>
|
||||
</Image>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
24
source/Backup/Apollo.sln
Normal file
24
source/Backup/Apollo.sln
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 7.00
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Apollo", "Apollo.vcproj", "{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfiguration) = preSolution
|
||||
ConfigName.0 = Debug
|
||||
ConfigName.1 = NoOpt
|
||||
ConfigName.2 = Release
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectDependencies) = postSolution
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfiguration) = postSolution
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Debug.ActiveCfg = Debug|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Debug.Build.0 = Debug|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.NoOpt.ActiveCfg = Release|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.NoOpt.Build.0 = Release|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Release.ActiveCfg = Debug|Win32
|
||||
{999EEF9E-0EE7-4FF2-A7B8-1DE89BDF5175}.Release.Build.0 = Debug|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityAddIns) = postSolution
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -199,7 +199,7 @@ A40004E8 r4300 00000015
|
|||
A40009D0 r4300 00000024
|
||||
A400098C r4300 00000028
|
||||
A40003F8 r4300 0000002F*/
|
||||
bool FindHLEFunc(u32 addy, char *func);
|
||||
//bool FindHLEFunc(u32 addy, char *func);
|
||||
|
||||
void OpcodeLookup (DWORD addy, char *out) {
|
||||
char func[100];
|
||||
|
|
@ -216,11 +216,11 @@ void OpcodeLookup (DWORD addy, char *out) {
|
|||
case 0x00: SPECIALLookup (out); break;
|
||||
case 0x01: REGIMMLookup (out, addy); break;
|
||||
case 0x02: sprintf (out, "J %08X", ((addy+4) & 0xf0000000) + (((((u32 *)&dop)[0] << 2) & 0x0fffffff))); break;
|
||||
case 0x03: if (FindHLEFunc(((addy+4) & 0xf0000000) + (((((u32 *)&dop)[0] << 2) & 0x0fffffff)), func) == false)
|
||||
case 0x03: //if (FindHLEFunc(((addy+4) & 0xf0000000) + (((((u32 *)&dop)[0] << 2) & 0x0fffffff)), func) == false)
|
||||
sprintf (out, "JAL %08X", ((addy+4) & 0xf0000000) + (((((u32 *)&dop)[0] << 2) & 0x0fffffff)));
|
||||
else
|
||||
sprintf (out, "JAL %s(%08X)", func, ((addy+4) & 0xf0000000) + (((((u32 *)&dop)[0] << 2) & 0x0fffffff)));
|
||||
break;
|
||||
//else
|
||||
// sprintf (out, "JAL %s(%08X)", func, ((addy+4) & 0xf0000000) + (((((u32 *)&dop)[0] << 2) & 0x0fffffff)));
|
||||
//break;
|
||||
case 0x04: if (dop.rt) sprintf (out, "BEQ %s, %s, 0x%08X", r4kreg[dop.rs], r4kreg[dop.rt], addy+4+(((s16 *)&dop)[0]<<2));
|
||||
else if (dop.rs) sprintf (out, "BEQZ %s, 0x%08X", r4kreg[dop.rs], addy+4+(((s16 *)&dop)[0]<<2));
|
||||
else sprintf (out, "B 0x%08X", addy+4+(((s16 *)&dop)[0]<<2)); break;
|
||||
|
|
|
|||
|
|
@ -240,8 +240,9 @@ u32 *R4KDyna_OptimizeBlock (u32 DynaPC) {
|
|||
return (u32 *)(rdram + (TLBLUT[DynaPC>>12] & 0x1fffffff) + (DynaPC & 0xfff));
|
||||
}
|
||||
void R4KDyna_Link () { // This is only called for link ahead ops
|
||||
for (u32 x = 0; x < LinkCnt; x++) {
|
||||
for (u32 t = 0; t < LinkLocs; t++) {
|
||||
u32 x, t;
|
||||
for (x = 0; x < LinkCnt; x++) {
|
||||
for (t = 0; t < LinkLocs; t++) {
|
||||
if (LinkTable[x].target == JumpTable[t].target) {
|
||||
//int n = (int)JumpTable[t].mem - ((int)LinkTable[x].mem + 1);
|
||||
SetBranch32b (LinkTable[x].mem, JumpTable[t].mem);
|
||||
|
|
@ -413,6 +414,7 @@ void R4KDyna_Execute (void) {
|
|||
u32 *CodeBlock;
|
||||
u32 lastPC;
|
||||
u8 *startPtr;
|
||||
int x;
|
||||
DynaLog ("Entering Dynarec Loop");
|
||||
|
||||
u32 dwRDRAMStartLoc;
|
||||
|
|
@ -448,7 +450,7 @@ void R4KDyna_Execute (void) {
|
|||
// 0x1b1 is the bad block
|
||||
#define BSTOP 0x731
|
||||
lastPC = pc;
|
||||
for (int x = 0; x < blockCount; x++) {
|
||||
for (x = 0; x < blockCount; x++) {
|
||||
if (pc == BlockInfo[x].target) {
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ extern DWORD fsize; // Needed for some rom hacks
|
|||
int inDelay=0; // In a delay slot
|
||||
|
||||
void OpcodeLookup (DWORD, char *); // Used for Debugging, Defined in R4KDebugger
|
||||
void DynaReset (); // Reset the dynarec...
|
||||
//void DynaReset (); // Reset the dynarec...
|
||||
|
||||
void doInstr(void) {
|
||||
inDelay = 1;
|
||||
|
|
@ -211,7 +211,7 @@ void ResetCPU (void) {
|
|||
SendMessage(hwndStatus, SB_SETTEXT, 0, (LPARAM)(LPSTR) Buffer);
|
||||
ClearEventList (); // Clears the Interrupt Processing...
|
||||
TLBLUT.ResetTLB(); // Clear TLB Table
|
||||
DynaReset ();
|
||||
//DynaReset ();
|
||||
|
||||
switch (RomHeader.Country_Code) {
|
||||
// NTSC
|
||||
|
|
|
|||
|
|
@ -428,10 +428,10 @@ void ToggleCPU (void);
|
|||
//void InvokeOpTester ();
|
||||
//InitializeDebugger();
|
||||
//InvokeOpTester ();
|
||||
if (cpuIsPaused == false) {
|
||||
ToggleCPU ();
|
||||
}
|
||||
OpenDebuggerWindow (GhInst, hWnd);
|
||||
//if (cpuIsPaused == false) {
|
||||
// ToggleCPU ();
|
||||
//}
|
||||
//OpenDebuggerWindow (GhInst, hWnd);
|
||||
break;
|
||||
case ID_CPU_COMPRESS: {
|
||||
if (GET_MENU(ID_CPU_COMPRESS) == MF_CHECKED) {
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -2,6 +2,10 @@
|
|||
Purpose of this file is to simulate the fopen/fclose/fread/fseek stdio functions
|
||||
for use with compressed N64 rom images.
|
||||
*/
|
||||
|
||||
// Disable SAFESEH to use the old library
|
||||
#pragma comment(lib, "ZLIB.LIB")
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "unzip.h"
|
||||
|
|
|
|||
11
todo.txt
11
todo.txt
|
|
@ -1,3 +1,14 @@
|
|||
New todo for Apollo64
|
||||
|
||||
*** Visual Studio 2019 ***
|
||||
- Create Emulation Loop to call existing CPU Core without attached devices
|
||||
- Revamp attached devices to emulate a basic non-functional output to get passed the basics for demos
|
||||
- Build up interface to allow an attached graphical display to show basic emulation (ie. N64Stars)
|
||||
*** Cmake ***
|
||||
- Revamp CPU Core and Emulation loop to fit new design -- at this point we go to cmake projects
|
||||
|
||||
|
||||
|
||||
08/09/03
|
||||
--------
|
||||
-I need to ask Dominator how to do some good HLE function detection... There are too
|
||||
|
|
|
|||
Loading…
Reference in a new issue