Deukhoofd
/
PokemonScriptTester
1
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

Use PkmnLib Debugger instead/
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2021-10-23 14:42:29 +02:00
parent 7043b12f34
commit af81c92165
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -44,4 +44,3 @@ set(PRE_CONFIGURE_FILE "git.h.in")
set(POST_CONFIGURE_FILE "src/git.h") set(POST_CONFIGURE_FILE "src/git.h")
include(git_watcher.cmake) include(git_watcher.cmake)
add_dependencies(PokemonScriptTester check_git) add_dependencies(PokemonScriptTester check_git)
target_include_directories(PokemonScriptTester PRIVATE extern/AngelscriptDebugger/extern/asio-1.18.2/include)

7
CMakeLists.txt.in
View File

@ -44,9 +44,10 @@ function(include_pkmnlib)
${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include/PkmnLib/extern) ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include/PkmnLib/extern)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include include_directories(${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include
${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/include ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/src/pkmnlib/extern/AngelscriptDebuggerServer/extern/asio-1.18.2/include
${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/Angelscript/src/AngelscriptProj/angelscript/include ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/include
${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/bin/Arbutils/include) ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/Angelscript/src/AngelscriptProj/angelscript/include
${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/bin/CreatureLib/bin/Arbutils/include)
endfunction() endfunction()

4
src/Tester/TestRunner.hpp
View File

@ -3,7 +3,6 @@
#include <PkmnLib/ScriptResolving/AngelScript/AngelScriptMetadata.hpp> #include <PkmnLib/ScriptResolving/AngelScript/AngelScriptMetadata.hpp>
#include <PkmnLib/ScriptResolving/AngelScript/ContextPool.hpp> #include <PkmnLib/ScriptResolving/AngelScript/ContextPool.hpp>
#include "../../extern/AngelscriptDebugger/src/AngelscriptDebugger.hpp"
#include "../../extern/termcolor.hpp" #include "../../extern/termcolor.hpp"
#include "Test.hpp" #include "Test.hpp"
@ -36,7 +35,8 @@ public:
i32 RunAll(bool waitForDebugger) { i32 RunAll(bool waitForDebugger) {
auto ctx = _scriptResolver->GetContextPool()->RequestContext(); auto ctx = _scriptResolver->GetContextPool()->RequestContext();
ctx->SetUserData(_scriptResolver->GetUserdata()); ctx->SetUserData(_scriptResolver->GetUserdata());
auto debugger = AngelscriptDebugger(); _scriptResolver->SetDebugger(new AngelscriptDebugger());
auto& debugger = *_scriptResolver->GetDebugger().GetValue();
debugger.Run(8684); debugger.Run(8684);
debugger.RegisterContext(ctx); debugger.RegisterContext(ctx);
if (waitForDebugger) { if (waitForDebugger) {