Merge branch 'master' of bitbucket.org:mrexodia/titanengine-update

This commit is contained in:
cypherpunk 2014-03-12 17:54:52 +01:00
commit f8c87fbdeb
2 changed files with 42 additions and 42 deletions

View File

@ -1384,9 +1384,9 @@ protected:
{ {
UE::StepOver((void*)traceCallBack); UE::StepOver((void*)traceCallBack);
} }
static void StepOut(fBreakPointCallback StepOutCallBack) static void StepOut(fBreakPointCallback StepOutCallBack, bool FinalStep)
{ {
UE::StepOut((void*)StepOutCallBack); UE::StepOut((void*)StepOutCallBack, FinalStep);
} }
static void SingleStep(DWORD StepCount, fBreakPointCallback StepCallBack) static void SingleStep(DWORD StepCount, fBreakPointCallback StepCallBack)
{ {

View File

@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Quelldateien"> <Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter> </Filter>
<Filter Include="Headerdateien"> <Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="stdafx.cpp"> <ClCompile Include="stdafx.cpp">
<Filter>Quelldateien</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="TitanUnitTest.cpp"> <ClCompile Include="TitanUnitTest.cpp">
<Filter>Quelldateien</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="stdafx.h"> <ClInclude Include="stdafx.h">
<Filter>Headerdateien</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="targetver.h"> <ClInclude Include="targetver.h">
<Filter>Headerdateien</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="TitanEngine.h"> <ClInclude Include="TitanEngine.h">
<Filter>Headerdateien</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="TitanEngine.hpp"> <ClInclude Include="TitanEngine.hpp">
<Filter>Headerdateien</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="TitanScript.h"> <ClInclude Include="TitanScript.h">
<Filter>Headerdateien</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="TitanScript.hpp"> <ClInclude Include="TitanScript.hpp">
<Filter>Headerdateien</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>