Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
Specific breakpoints for M68000 exceptions.
Fixes for the Linux platform.
Stability & improvements for the debugger mode.
  • Loading branch information
djipi committed May 27, 2021
2 parents f051fda + 82c1bdc commit 0e699c1
Show file tree
Hide file tree
Showing 97 changed files with 3,506 additions and 1,172 deletions.
62 changes: 31 additions & 31 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
Assets/
debug/
eeproms/
obj/
release/
Screenshots/
software/
src/*~
src/*/*.bak
src/m68000/obj/*.a
src/m68000/obj/*.exe
src/m68000/obj/*.d
src/m68000/obj/*.o
/Assets/
/debug/
/eeproms/
/obj/
/release/
/Screenshots/
/software/
/src/*~
/src/*/*.bak
/src/m68000/obj/*.a
/src/m68000/obj/*.exe
/src/m68000/obj/*.d
/src/m68000/obj/*.o
*.bak
makefile-qt
makefile-qt*.*
object_script.virtualjaguar*.*
.qmake.stash
virtualjaguar.WinMerge
Win-VS2017/m68000/m68000.vcxproj.user
Win-VS2017/jaguarcore/jaguarcore.vcxproj.user
Win-VS2017/x64/Archives/
Win-VS2017/*/x64/
Win-VS2017/*/ReadMe.txt
Win-VS2017/.vs/
Win-VS2017/obj/
Win-VS2017/Win32/
Win-VS2017/x64/
Win-VS2017/virtualjaguar.VC.db
Win-VS2017/virtualjaguar.VC.VC.opendb
Win-VS2017/virtualjaguar.sdf
Win-VS2017/virtualjaguar.vcxproj.user
Win-VS2017/GeneratedFiles/
Win-VS2017/GeneratedFiles/qrc_virtualjaguar.cpp
Win-VS2017/My Inspector Results - virtualjaguar
Win-VS2015/
Win-VS2019/
/Win-VS2015/
/Win-VS2017/m68000/m68000.vcxproj.user
/Win-VS2017/jaguarcore/jaguarcore.vcxproj.user
/Win-VS2017/x64/Archives/
/Win-VS2017/*/x64/
/Win-VS2017/*/ReadMe.txt
/Win-VS2017/.vs/
/Win-VS2017/obj/
/Win-VS2017/Win32/
/Win-VS2017/x64/
/Win-VS2017/virtualjaguar.VC.db
/Win-VS2017/virtualjaguar.VC.VC.opendb
/Win-VS2017/virtualjaguar.sdf
/Win-VS2017/virtualjaguar.vcxproj.user
/Win-VS2017/GeneratedFiles/
/Win-VS2017/GeneratedFiles/qrc_virtualjaguar.cpp
/Win-VS2017/My Inspector Results - virtualjaguar
/Win-VS2019/
16 changes: 10 additions & 6 deletions Win-VS2017/jaguarcore/jaguarcore.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down Expand Up @@ -59,8 +59,8 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\Qt\Qt5.9.1\5.9.1\msvc2017_64\include;C:\Qt\Qt5.9.1\5.9.1\msvc2017_64\include\QtGui;C:\Qt\Qt5.9.1\5.9.1\msvc2017_64\include\QtCore;C:\Qt\Qt5.9.1\5.9.1\msvc2017_64\include\QtWidgets;C:\SDK\SDL\SDL-1.2.15\include;C:\SDK\Elf\libelf-0.8.13-VS2015\include;C:\SDK\DWARF\libdwarf-VS2015\include;C:\SDK\zlib\zlib-1.2.8-VS2015\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>$(QTDIR)\include;C:\SDK\SDL\SDL-1.2.15\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>$(IntDir)asm\</AssemblerListingLocation>
<ObjectFileName>$(IntDir)obj\</ObjectFileName>
<MinimalRebuild>false</MinimalRebuild>
Expand All @@ -81,12 +81,13 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_LIB;_RELEASE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\Qt\Qt5.9.1\5.9.1\msvc2017_64\include;C:\Qt\Qt5.9.1\5.9.1\msvc2017_64\include\QtCore;C:\Qt\Qt5.9.1\5.9.1\msvc2017_64\include\QtGui;C:\Qt\Qt5.9.1\5.9.1\msvc2017_64\include\QtWidgets;C:\SDK\SDL\SDL-1.2.15\include;C:\SDK\zlib\zlib-1.2.8-VS2015\include;C:\SDK\Elf\libelf-0.8.13-VS2015\include;C:\SDK\DWARF\libdwarf-VS2015\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(QTDIR)\include;C:\SDK\SDL\SDL-1.2.15\include</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MinimalRebuild>false</MinimalRebuild>
<AssemblerListingLocation>$(IntDir)asm\</AssemblerListingLocation>
<ObjectFileName>$(IntDir)obj\</ObjectFileName>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Expand Down Expand Up @@ -153,7 +154,10 @@
<ClCompile Include="..\..\src\joystick.cpp" />
<ClCompile Include="..\..\src\memory.cpp" />
<ClCompile Include="..\..\src\memtrack.cpp" />
<ClCompile Include="..\..\src\mmu.cpp" />
<ClCompile Include="..\..\src\mmu.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\modelsBIOS.cpp" />
<ClCompile Include="..\..\src\op.cpp" />
<ClCompile Include="..\..\src\state.cpp" />
Expand Down
4 changes: 2 additions & 2 deletions Win-VS2017/m68000/m68000.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Static</UseOfMfc>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down
Loading

0 comments on commit 0e699c1

Please sign in to comment.